let-them-talk 5.3.0 → 5.4.1

package/office/index.js

@@ -6,6 +6,8 @@ import { initScene } from './scene.js';
 import { buildEnvironment, updateTVScreen } from './environment.js';
 import { updateAgent } from './animation.js';
 import { syncAgents, processMessages, walkTo, navigateTo, showBubble } from './agents.js';
+import { tickGallery, updateGalleryScreens } from './gallery.js';
+import { updateRobotAnimation } from './robot-character.js';
 // Side-effect: registers window.officeGetAppearance
 import './appearance.js';
 import { spawnPlayer, despawnPlayer, isPlayerMode, updatePlayer, savePlayerAppearance, getPlayerAppearance, getPlayer, invalidateColliders } from './player.js';
@@ -29,6 +31,11 @@ function getCityMods() {
 function isDriving() { return _cityMods && _cityMods.vehicle && _cityMods.vehicle.isDriving(); }
 function isConnected() { return false; }
 
+function scopedOfficeApiUrl(path, options) {
+  if (typeof window.scopedApiUrl === 'function') return window.scopedApiUrl(path, null, options);
+  return path;
+}
+
 // Expose createCharacter + resolveAppearance for the character designer (Phase 3)
 export { createCharacter } from './character.js';
 export { resolveAppearance } from './appearance.js';
@@ -316,7 +323,7 @@ function executeCommand(agentName, action) {
       showInputOverlay('Send message to ' + agentName + ':', 'Type your message...', function(msg) {
         if (msg && msg.trim()) {
           showBubble(agent, 'Message incoming...');
-          fetch('/api/inject' + (window.activeProject ? '?project=' + encodeURIComponent(window.activeProject) : ''), {
+          fetch(scopedOfficeApiUrl('/api/inject'), {
             method: 'POST',
             headers: { 'Content-Type': 'application/json', 'X-LTT-Request': '1' },
             body: JSON.stringify({ to: agentName, content: msg.trim() })
@@ -329,7 +336,7 @@ function executeCommand(agentName, action) {
       showInputOverlay('New task for ' + agentName + ':', 'Task title...', function(title) {
         if (title && title.trim()) {
           showBubble(agent, 'New task assigned!');
-          fetch('/api/tasks' + (window.activeProject ? '?project=' + encodeURIComponent(window.activeProject) : ''), {
+          fetch(scopedOfficeApiUrl('/api/tasks'), {
             method: 'POST',
             headers: { 'Content-Type': 'application/json', 'X-LTT-Request': '1' },
             body: JSON.stringify({ title: title.trim(), assignee: agentName, status: 'pending' })
@@ -350,7 +357,7 @@ function executeCommand(agentName, action) {
 
     case 'nudge':
       showBubble(agent, 'Hey! Wake up!');
-      fetch('/api/inject' + (window.activeProject ? '?project=' + encodeURIComponent(window.activeProject) : ''), {
+      fetch(scopedOfficeApiUrl('/api/inject'), {
         method: 'POST',
         headers: { 'Content-Type': 'application/json', 'X-LTT-Request': '1' },
         body: JSON.stringify({ to: agentName, content: 'Hey ' + agentName + ', the user is waiting for you. Please check for new messages and continue your work.' })
@@ -398,9 +405,15 @@ function animate() {
   var time = S.clock.getElapsedTime();
 
   for (var name in S.agents3d) {
-    updateAgent(S.agents3d[name], dt, time);
+    var ag = S.agents3d[name];
+    if (!ag) continue;
+    updateAgent(ag, dt, time);
+    if (ag.isApiAgent && S.agents3d[name]) updateRobotAnimation(ag, dt, time);
   }
 
+  // Gallery slideshow tick
+  if (S.currentEnv === 'campus') tickGallery(dt);
+
   // Player avatar mode — skip when driving (vehicle takes over)
   if (isPlayerMode() && S.controls && S.controls.keys && !isDriving()) {
     updatePlayer(dt, time, S.controls.keys);
@@ -757,6 +770,13 @@ window.office3dStart = function() {
       syncAgents();
       processMessages();
       updateTVScreen(S.clock.getElapsedTime());
+      // Fetch media for gallery screens
+      if (S.galleryScreens) {
+        var pq = window.currentProjectPath ? '?project=' + encodeURIComponent(window.currentProjectPath) : '';
+        fetch('/api/media' + pq).then(function(r) { return r.json(); }).then(function(media) {
+          if (Array.isArray(media) && media.length > 0) updateGalleryScreens(media);
+        }).catch(function() {});
+      }
     }
   }, 2000);
 };
@@ -800,9 +820,19 @@ window.office3dSetEnvironment = function(env) {
   // Load city modules on demand
   if (env === 'city') getCityMods();
   if (S.scene) {
-    // Remove all existing agents so they get recreated with proper desk assignments
+    // Remove all existing agents — including CSS2D label DOM elements
     for (var name in S.agents3d) {
       var agent = S.agents3d[name];
+      // Remove CSS2D label DOM elements explicitly
+      if (agent.parts.labelDiv && agent.parts.labelDiv.parentElement) agent.parts.labelDiv.remove();
+      if (agent.parts.bubbleDiv && agent.parts.bubbleDiv.parentElement) agent.parts.bubbleDiv.remove();
+      if (agent.parts.taskDiv && agent.parts.taskDiv.parentElement) agent.parts.taskDiv.remove();
+      // Remove all CSS2DObject DOM nodes from the group tree
+      agent.parts.group.traverse(function(child) {
+        if (child.isCSS2DObject && child.element && child.element.parentElement) {
+          child.element.remove();
+        }
+      });
       S.scene.remove(agent.parts.group);
       agent.parts.group.traverse(function(child) {
         if (child.geometry) child.geometry.dispose();
@@ -813,6 +843,8 @@ window.office3dSetEnvironment = function(env) {
       });
     }
     S.agents3d = {};
+    // Also release any claimed gallery seats
+    window._gallerySeatsReset = true;
     S._tvScreen = null;
     S._roofGroup = null;
     S._managerDoor = null;
@@ -821,6 +853,7 @@ window.office3dSetEnvironment = function(env) {
     S._managerOfficePos = null;
     S._campusDeskPositions = null;
     S.lastProcessedMsg = 0;
+    window._lastProcessedMsg = 0;
     invalidateColliders();
     buildEnvironment();
     // syncAgents will recreate all agents with correct desk assignments
@@ -885,49 +918,123 @@ if (window.activeView === 'office') {
   window.office3dStart();
 }
 
-// ===================== INTERACTIVE IFRAME MONITOR (Phase 2) =====================
-var activeIframe = null;
+// ===================== INTERACTIVE MONITOR — Dashboard + ComfyUI tabs =====================
+var _monitorOverlay = null;
+var _monitorActiveTab = 'dashboard';
 
 window.onPlayerSit = function(deskIdx) {
-  if (activeIframe) return;
-  var container = document.getElementById('office-3d-container') || document.getElementById('office-area');
+  if (_monitorOverlay) return;
+
+  // Release pointer lock so mouse works in iframe
+  if (document.pointerLockElement) document.exitPointerLock();
+
+  // Use office-area as parent (it has proper positioning)
+  var container = document.getElementById('office-area');
+  if (!container) container = document.getElementById('office-3d-container');
   if (!container) return;
 
-  // Create iframe overlay positioned over the 3D canvas
+  // Overlay
   var overlay = document.createElement('div');
-  overlay.id = 'office-iframe-overlay';
-  overlay.style.cssText = 'position:absolute;top:5%;left:10%;width:80%;height:85%;z-index:200;background:#000;border-radius:8px;box-shadow:0 0 40px rgba(88,166,255,0.3);overflow:hidden;display:flex;flex-direction:column';
+  overlay.id = 'office-monitor-overlay';
+  overlay.style.cssText = 'position:fixed;top:3%;left:5%;width:90%;height:92%;z-index:99999;background:#0a0c14;border-radius:10px;box-shadow:0 0 60px rgba(88,166,255,0.3),0 0 0 1px #30363d;overflow:hidden;display:flex;flex-direction:column;';
 
-  // Header bar (mimics monitor bezel)
+  // Header bar with tabs + close
   var header = document.createElement('div');
-  header.style.cssText = 'background:#1a1f36;padding:6px 12px;display:flex;align-items:center;justify-content:space-between;flex-shrink:0';
-  header.innerHTML = '<div style="display:flex;gap:6px"><span style="width:10px;height:10px;border-radius:50%;background:#ff5f57"></span><span style="width:10px;height:10px;border-radius:50%;background:#ffbd2e"></span><span style="width:10px;height:10px;border-radius:50%;background:#28c840"></span></div><span style="color:#8892b0;font-size:11px;font-family:monospace">Let Them Talk Dashboard</span><button id="office-leave-btn" style="background:#ff5f57;color:#fff;border:none;border-radius:4px;padding:3px 12px;font-size:11px;font-weight:bold;cursor:pointer;font-family:monospace">LEAVE</button>';
-  header.querySelector('#office-leave-btn').addEventListener('click', function() {
-    if (typeof window.onPlayerStand === 'function') window.onPlayerStand();
-    // Also trigger player stand-up in player.js
-    if (typeof window.playerForceStand === 'function') window.playerForceStand();
-  });
+  header.style.cssText = 'background:#141824;padding:0 12px;display:flex;align-items:center;justify-content:space-between;flex-shrink:0;height:36px;border-bottom:1px solid #30363d;';
+
+  // Tab buttons
+  var tabsHtml = '<div style="display:flex;gap:0;">';
+  tabsHtml += '<button id="mon-tab-dashboard" style="padding:8px 16px;font-size:11px;font-family:monospace;border:none;cursor:pointer;border-bottom:2px solid #58a6ff;background:transparent;color:#58a6ff;">Dashboard</button>';
+  tabsHtml += '<button id="mon-tab-comfyui" style="padding:8px 16px;font-size:11px;font-family:monospace;border:none;cursor:pointer;border-bottom:2px solid transparent;background:transparent;color:#8892b0;">ComfyUI</button>';
+  tabsHtml += '</div>';
+
+  var closeHtml = '<button id="mon-close-btn" style="background:#ff5f57;color:#fff;border:none;border-radius:4px;padding:3px 14px;font-size:11px;font-weight:bold;cursor:pointer;font-family:monospace;">ESC to Leave</button>';
+
+  header.innerHTML = tabsHtml + closeHtml;
   overlay.appendChild(header);
 
-  // Dashboard iframe
-  var iframe = document.createElement('iframe');
-  iframe.src = window.location.origin || 'http://localhost:3000';
-  iframe.style.cssText = 'flex:1;border:none;width:100%;background:#0d1117';
-  iframe.allow = 'clipboard-read; clipboard-write';
-  overlay.appendChild(iframe);
+  // Iframe container
+  var iframeWrap = document.createElement('div');
+  iframeWrap.style.cssText = 'flex:1;position:relative;';
+
+  // Dashboard iframe. clipboard-write only — the iframe needs to copy agent
+  // prompts into the user's clipboard, it never needs to read from it.
+  var dashIframe = document.createElement('iframe');
+  dashIframe.id = 'mon-iframe-dashboard';
+  dashIframe.src = window.location.origin || 'http://localhost:3000';
+  dashIframe.style.cssText = 'position:absolute;top:0;left:0;width:100%;height:100%;border:none;background:#0d1117;';
+  dashIframe.allow = 'clipboard-write';
+  iframeWrap.appendChild(dashIframe);
+
+  // ComfyUI iframe (hidden initially). Same write-only clipboard scope.
+  var comfyIframe = document.createElement('iframe');
+  comfyIframe.id = 'mon-iframe-comfyui';
+  comfyIframe.style.cssText = 'position:absolute;top:0;left:0;width:100%;height:100%;border:none;background:#1a1a2e;display:none;';
+  comfyIframe.allow = 'clipboard-write';
+  // Don't load ComfyUI until tab is clicked (saves resources)
+  iframeWrap.appendChild(comfyIframe);
+
+  overlay.appendChild(iframeWrap);
+  document.body.appendChild(overlay);
+  _monitorOverlay = overlay;
+  _monitorActiveTab = 'dashboard';
+
+  // Tab switching
+  function switchTab(tab) {
+    _monitorActiveTab = tab;
+    var dIframe = document.getElementById('mon-iframe-dashboard');
+    var cIframe = document.getElementById('mon-iframe-comfyui');
+    var dTab = document.getElementById('mon-tab-dashboard');
+    var cTab = document.getElementById('mon-tab-comfyui');
+
+    if (tab === 'dashboard') {
+      if (dIframe) dIframe.style.display = 'block';
+      if (cIframe) cIframe.style.display = 'none';
+      if (dTab) { dTab.style.color = '#58a6ff'; dTab.style.borderBottomColor = '#58a6ff'; }
+      if (cTab) { cTab.style.color = '#8892b0'; cTab.style.borderBottomColor = 'transparent'; }
+    } else {
+      if (dIframe) dIframe.style.display = 'none';
+      if (cIframe) {
+        cIframe.style.display = 'block';
+        // Lazy-load ComfyUI on first switch. URL is configurable via
+        // window.COMFYUI_URL (set it from the dashboard or page) so users
+        // on non-default ports or remote ComfyUI hosts can override.
+        if (!cIframe.src || cIframe.src === 'about:blank' || cIframe.src === '') {
+          cIframe.src = (typeof window !== 'undefined' && window.COMFYUI_URL) || 'http://127.0.0.1:8188';
+        }
+      }
+      if (dTab) { dTab.style.color = '#8892b0'; dTab.style.borderBottomColor = 'transparent'; }
+      if (cTab) { cTab.style.color = '#ff6b35'; cTab.style.borderBottomColor = '#ff6b35'; }
+    }
+  }
 
-  container.style.position = 'relative';
-  container.appendChild(overlay);
-  activeIframe = overlay;
+  overlay.querySelector('#mon-tab-dashboard').addEventListener('click', function() { switchTab('dashboard'); });
+  overlay.querySelector('#mon-tab-comfyui').addEventListener('click', function() { switchTab('comfyui'); });
+
+  // Close button
+  overlay.querySelector('#mon-close-btn').addEventListener('click', function() {
+    if (typeof window.playerForceStand === 'function') window.playerForceStand();
+    window.onPlayerStand();
+  });
+
+  // ESC key closes overlay
+  overlay._escHandler = function(e) {
+    if (e.code === 'Escape' && _monitorOverlay) {
+      if (typeof window.playerForceStand === 'function') window.playerForceStand();
+      window.onPlayerStand();
+    }
+  };
+  document.addEventListener('keydown', overlay._escHandler);
 
-  // Focus iframe for keyboard input
-  iframe.addEventListener('load', function() { iframe.focus(); });
+  // Focus dashboard iframe
+  dashIframe.addEventListener('load', function() { dashIframe.focus(); });
 };
 
 window.onPlayerStand = function() {
-  if (activeIframe) {
-    activeIframe.remove();
-    activeIframe = null;
+  if (_monitorOverlay) {
+    if (_monitorOverlay._escHandler) document.removeEventListener('keydown', _monitorOverlay._escHandler);
+    _monitorOverlay.remove();
+    _monitorOverlay = null;
   }
 };
 

package/office/navigation.js

@@ -5,163 +5,184 @@ import { S } from './state.js';
 // Agents walk along connected waypoints to avoid walls/objects
 // ============================================================
 
-// Manager office geometry reference:
-// Office group at (12, 5), size 8x7, walls at:
-//   Front (door): z = 5 - 3.5 = 1.5   (door at center x=12)
-//   Back:         z = 5 + 3.5 = 8.5
-//   Left:         x = 12 - 4  = 8
-//   Right:        x = 12 + 4  = 16
-// Glass partition at z = -7 (between workspace and rec)
-// Glass partition at x = -8 (between designer and main)
+// Campus geometry reference (90W x 60D):
+// Outer walls: X = ±45, Z = ±30
+// Workspace: 5x4 desk grid at X=[-8,-4,0,4,8], Z=[6,10,14,18]
+// Manager office at (30, 10), size 10x10:
+//   Left wall:  X = 25,  Right wall: X = 35
+//   Front wall: Z = 5 (door at center X=30)
+//   Back wall:  Z = 15
+//   Path must approach from south (Z<5) and enter through door
+// Main corridor: Z=0, runs full campus width (-2 to +2)
+// Cross corridors: X=±20, connect north-south (3 units wide)
+// Lobby/Entrance: Z=22-30, front wall gap at center
+// Designer Studio: center (-28, 0), 12x10
+// Bar & Café: center (-28, -18), 12x10
+// Rec Center: center (0, -18), 12x10
+// Gym: center (22, -18), 12x10
+// Staircase: X=35, Z=-14 to -22, connects to mezzanine (Z=-18 to -30)
+// Gallery Wing: inside campus at (-36, 10), 14x12, open east side at X=-29
 
 var CAMPUS_WAYPOINTS = [
-  // === LOBBY / ENTRANCE ===
-  { id: 'spawn',         x: 0,     z: 14 },
-  { id: 'lobby',         x: 0,     z: 10 },
-  { id: 'lobby_left',    x: -6,    z: 10 },
-  { id: 'lobby_right',   x: 6,     z: 10 },
-
-  // === MAIN CORRIDOR (runs along z=6, above workspace) ===
-  { id: 'corr_L',        x: -8,    z: 7 },
-  { id: 'corr_CL',       x: -3,    z: 7 },
-  { id: 'corr_C',        x: 0,     z: 7 },
-  { id: 'corr_CR',       x: 3,     z: 7 },
-  { id: 'corr_R',        x: 7,     z: 7 },
-
-  // === WORKSPACE ZONE (center area, between glass partitions) ===
-  { id: 'work_N',        x: 0,     z: 4 },    // north end
-  { id: 'work_NW',       x: -5,    z: 4 },
-  { id: 'work_NE',       x: 5,     z: 4 },
-  { id: 'work_W',        x: -5,    z: 0 },
-  { id: 'work_C',        x: 0,     z: 0 },
-  { id: 'work_E',        x: 5,     z: 0 },
-  { id: 'work_SW',       x: -5,    z: -3 },
-  { id: 'work_S',        x: 0,     z: -5 },
-  { id: 'work_SE',       x: 5,     z: -3 },
-
-  // === DESIGNER WING (left of glass partition x=-8) ===
-  { id: 'design_gate',   x: -8,    z: 3 },   // gap in partition
-  { id: 'design_N',      x: -12,   z: 3 },
-  { id: 'design_C',      x: -12.5, z: 0 },
-  { id: 'design_S',      x: -12,   z: -3 },
-
-  // === MANAGER OFFICE (right side, enclosed glass room) ===
-  // Office walls: left x=8, right x=16, front z=1.5, back z=8.5
-  // Door at front wall center (x=12, z=1.5)
-  // Path must go AROUND the left-front corner, then to door from outside
-  { id: 'mgr_hallway',   x: 7,     z: 3 },    // south of corridor, OUTSIDE left wall (x<8)
-  { id: 'mgr_corner',    x: 7,     z: 0 },    // past the front-left corner (x<8, z<1.5)
-  { id: 'mgr_outside',   x: 12,    z: 0 },    // in front of door, OUTSIDE front wall (z<1.5)
-  { id: 'mgr_doorstep',  x: 12,    z: 1.5 },  // at the door threshold (triggers door open)
-  { id: 'mgr_entry',     x: 12,    z: 3 },    // just inside the door
-  { id: 'mgr_center',    x: 12,    z: 5 },    // middle of office
-  { id: 'mgr_desk',      x: 12,    z: 7 },    // at the desk/chair
-
-  // === BACK ZONE CORRIDOR (runs along z=-7 to z=-8, south of glass partition) ===
-  { id: 'back_gate',     x: 0,     z: -6.5 },  // gap in glass partition
-  { id: 'back_L',        x: -8,    z: -8 },
-  { id: 'back_C',        x: 0,     z: -8 },
-  { id: 'back_R',        x: 8,     z: -8 },
-
-  // === BAR (back left) ===
-  { id: 'bar_entry',     x: -10,   z: -10 },
-  { id: 'bar_center',    x: -14,   z: -12 },
-
-  // === REC CENTER (back center) ===
-  { id: 'rec_entry',     x: 0,     z: -10 },
-  { id: 'rec_center',    x: 0,     z: -12 },
-
-  // === GYM (back right) ===
-  { id: 'gym_entry',     x: 10,    z: -10 },
-  { id: 'gym_center',    x: 14,    z: -12 },
-
-  // === MEZZANINE / STAIRS ===
-  { id: 'stairs_bot',    x: 20,    z: -5 },
-  { id: 'stairs_top',    x: 20,    z: -8 },
-  { id: 'mezz_C',        x: 0,     z: -13 },
-
-  // === REST / DRESSING (right wing, for old office compat) ===
-  { id: 'rest_entry',    x: 7.5,   z: -5.5 },
-  { id: 'dress_entry',   x: 7.5,   z: -1.5 },
+  // === LOBBY / ENTRANCE (Z=22-30, front wall gap at center) ===
+  { id: 'spawn',         x: 0,     z: 28 },   // entrance area (between door and reception)
+  { id: 'lobby',         x: 0,     z: 24 },   // inside lobby center
+  { id: 'lobby_left',    x: -10,   z: 24 },   // lobby left side
+  { id: 'lobby_right',   x: 10,    z: 24 },   // lobby right side
+
+  // === WORKSPACE (5x4 desk grid, X=[-8,-4,0,4,8], Z=[6,10,14,18]) ===
+  { id: 'work_N',        x: 0,     z: 18 },   // northernmost row center
+  { id: 'work_NW',       x: -8,    z: 18 },   // north-west desk
+  { id: 'work_NE',       x: 8,     z: 18 },   // north-east desk
+  { id: 'work_W',        x: -8,    z: 14 },   // west mid desk
+  { id: 'work_C',        x: 0,     z: 14 },   // center desk
+  { id: 'work_E',        x: 8,     z: 14 },   // east mid desk
+  { id: 'work_SW',       x: -8,    z: 10 },   // south-west desk
+  { id: 'work_S',        x: 0,     z: 10 },   // south row center
+  { id: 'work_SE',       x: 8,     z: 10 },   // south-east desk
+
+  // === MAIN CORRIDOR (Z=0, runs full width) ===
+  { id: 'corr_L',        x: -20,   z: 0 },    // left end (at cross corridor)
+  { id: 'corr_CL',       x: -8,    z: 0 },    // center-left
+  { id: 'corr_C',        x: 0,     z: 0 },    // center
+  { id: 'corr_CR',       x: 8,     z: 0 },    // center-right
+  { id: 'corr_R',        x: 20,    z: 0 },    // right end (at cross corridor)
+  { id: 'corr_RR',       x: 30,    z: 0 },    // far right (toward manager approach)
+
+  // === CROSS CORRIDORS (X=±20, connect north-south) ===
+  { id: 'cross_NL',      x: -20,   z: 12 },   // north-left cross corridor
+  { id: 'cross_SL',      x: -20,   z: -12 },  // south-left cross corridor
+  { id: 'cross_NR',      x: 20,    z: 12 },   // north-right cross corridor
+  { id: 'cross_SR',      x: 20,    z: -12 },  // south-right cross corridor
+
+  // === MANAGER OFFICE (center at (30,10), walls: left X=25, right X=35, front Z=5, back Z=15) ===
+  // Door at front wall center (X=30, Z=5). Path approaches from south (Z<5).
+  { id: 'mgr_hallway',   x: 30,    z: 3 },    // south of office, in main corridor area
+  { id: 'mgr_outside',   x: 30,    z: 4 },    // directly outside front wall
+  { id: 'mgr_doorstep',  x: 30,    z: 5,  triggerDoor: 'open' },  // at door threshold
+  { id: 'mgr_entry',     x: 30,    z: 7 },    // just inside the door
+  { id: 'mgr_desk',      x: 30,    z: 12 },   // at the manager desk
+
+  // === DESIGNER STUDIO (center (-28, 0), 12x10) ===
+  { id: 'design_entry',  x: -22,   z: 0 },    // entry from cross corridor
+  { id: 'design_center', x: -28,   z: 0 },    // studio center
+
+  // === BAR & CAFÉ (center (-28, -18), 12x10) ===
+  { id: 'bar_entry',     x: -22,   z: -14 },  // entry from south cross corridor
+  { id: 'bar_center',    x: -28,   z: -18 },  // bar center
+
+  // === REC CENTER (center (0, -18), 12x10) ===
+  { id: 'rec_entry',     x: 0,     z: -14 },  // entry from south corridor
+  { id: 'rec_center',    x: 0,     z: -18 },  // rec center
+
+  // === GYM (center (22, -18), 12x10) ===
+  { id: 'gym_entry',     x: 14,    z: -14 },  // entry from south cross corridor
+  { id: 'gym_center',    x: 22,    z: -18 },  // gym center
+
+  // === STAIRCASE (X=35, Z=-14 to -22) ===
+  { id: 'stairs_bot',    x: 35,    z: -14 },  // bottom of stairs
+  { id: 'stairs_top',    x: 35,    z: -20 },  // top of stairs (mezzanine level)
+
+  // === MEZZANINE (Z=-18 to -30) ===
+  { id: 'mezz_C',        x: 0,     z: -24 },  // mezzanine center
+
+  // === GALLERY WING (inside campus, center at -36, 10, entry from east at X=-29) ===
+  { id: 'gallery_entry', x: -28,   z: 10 },   // just outside east glass entrance
+  { id: 'gallery_center',x: -36,   z: 10 },   // gallery center
 ];
 
 var CAMPUS_CONNECTIONS = [
-  // Lobby connections
-  ['spawn', 'lobby'],
-  ['lobby', 'lobby_left'],
-  ['lobby', 'lobby_right'],
-  ['lobby', 'corr_C'],
-  ['lobby_left', 'corr_L'],
-  ['lobby_right', 'corr_R'],
-
-  // Main corridor (horizontal)
-  ['corr_L', 'corr_CL'],
-  ['corr_CL', 'corr_C'],
-  ['corr_C', 'corr_CR'],
-  ['corr_CR', 'corr_R'],
-
-  // Corridor → workspace
-  ['corr_C', 'work_N'],
-  ['corr_CL', 'work_NW'],
-  ['corr_CR', 'work_NE'],
-
-  // Workspace grid
-  ['work_N', 'work_NW'],
-  ['work_N', 'work_NE'],
-  ['work_N', 'work_C'],
-  ['work_NW', 'work_W'],
-  ['work_NE', 'work_E'],
-  ['work_W', 'work_C'],
-  ['work_C', 'work_E'],
-  ['work_W', 'work_SW'],
-  ['work_C', 'work_S'],
-  ['work_E', 'work_SE'],
-  ['work_SW', 'work_S'],
-  ['work_S', 'work_SE'],
-
-  // Designer wing (through gap in glass partition)
-  ['work_NW', 'design_gate'],
-  ['corr_L', 'design_gate'],
-  ['design_gate', 'design_N'],
-  ['design_N', 'design_C'],
-  ['design_C', 'design_S'],
-
-  // Manager office — path goes AROUND the corner then through door
-  // corr_R(7,7) → mgr_hallway(7,3) → mgr_corner(7,0) → mgr_outside(12,0) → door → inside
-  ['corr_R', 'mgr_hallway'],           // walk south, outside left wall (x=7 < wall x=8)
-  ['mgr_hallway', 'mgr_corner'],       // walk further south past front-left corner (z=0 < wall z=1.5)
-  ['mgr_corner', 'mgr_outside'],       // walk east to front of door (z=0, safely below front wall z=1.5)
-  ['mgr_outside', 'mgr_doorstep'],     // step to door threshold (triggers open)
-  ['mgr_doorstep', 'mgr_entry'],       // walk through open door into office
-  ['mgr_entry', 'mgr_center'],         // walk deeper inside
-  ['mgr_center', 'mgr_desk'],          // walk to desk
-
-  // Workspace → back zone (through gap in glass partition at z=-7)
-  ['work_S', 'back_gate'],
-  ['back_gate', 'back_C'],
-
-  // Back corridor
-  ['back_L', 'back_C'],
-  ['back_C', 'back_R'],
-  ['work_SW', 'back_L'],
-  ['work_SE', 'back_R'],
-
-  // Back zones
-  ['back_L', 'bar_entry'],
-  ['bar_entry', 'bar_center'],
-  ['back_C', 'rec_entry'],
-  ['rec_entry', 'rec_center'],
-  ['back_R', 'gym_entry'],
-  ['gym_entry', 'gym_center'],
-
-  // Stairs / mezzanine
-  ['back_R', 'stairs_bot'],
-  ['stairs_bot', 'stairs_top'],
-  ['stairs_top', 'mezz_C'],
-
-  // Rest/dressing (legacy)
-  ['work_SE', 'rest_entry'],
-  ['work_E', 'dress_entry'],
+  // === LOBBY ===
+  ['spawn',        'lobby'],
+  ['lobby',        'lobby_left'],
+  ['lobby',        'lobby_right'],
+  ['lobby',        'work_N'],         // lobby → northernmost workspace row
+  ['lobby_left',   'work_NW'],
+  ['lobby_right',  'work_NE'],
+
+  // === WORKSPACE GRID (rows N→S, Z: 18→10) ===
+  // North row (Z=18)
+  ['work_N',       'work_NW'],
+  ['work_N',       'work_NE'],
+  // Mid row (Z=14) — connected to north
+  ['work_NW',      'work_W'],
+  ['work_N',       'work_C'],
+  ['work_NE',      'work_E'],
+  // Horizontal mid
+  ['work_W',       'work_C'],
+  ['work_C',       'work_E'],
+  // South row (Z=10) — connected to mid
+  ['work_W',       'work_SW'],
+  ['work_C',       'work_S'],
+  ['work_E',       'work_SE'],
+  // Horizontal south
+  ['work_SW',      'work_S'],
+  ['work_S',       'work_SE'],
+
+  // === WORKSPACE → MAIN CORRIDOR (Z=0) ===
+  ['work_SW',      'corr_CL'],        // south-west desk down to corridor
+  ['work_S',       'corr_C'],         // south center down to corridor
+  ['work_SE',      'corr_CR'],        // south-east desk down to corridor
+
+  // === MAIN CORRIDOR (horizontal, Z=0) ===
+  ['corr_L',       'corr_CL'],
+  ['corr_CL',      'corr_C'],
+  ['corr_C',       'corr_CR'],
+  ['corr_CR',      'corr_R'],
+  ['corr_R',       'corr_RR'],        // extend east toward manager side
+
+  // === CROSS CORRIDORS (X=±20, north-south) ===
+  // Left cross corridor (X=-20): lobby-side north → main corridor → south zone
+  ['cross_NL',     'work_NW'],        // north end connects to workspace
+  ['cross_NL',     'corr_L'],         // meets main corridor
+  ['corr_L',       'cross_SL'],       // south through left cross corridor
+  ['cross_SL',     'cross_NL'],       // bidirectional shortcut label
+  // Right cross corridor (X=20): lobby-side north → main corridor → south zone
+  ['cross_NR',     'work_NE'],        // north end connects to workspace
+  ['cross_NR',     'corr_R'],         // meets main corridor
+  ['corr_R',       'cross_SR'],       // south through right cross corridor
+  ['cross_SR',     'cross_NR'],       // bidirectional shortcut label
+
+  // === MANAGER OFFICE ===
+  // Approach: corr_RR(30,0) → mgr_hallway(30,3) → mgr_outside(30,4) → door → inside
+  ['corr_RR',      'mgr_hallway'],    // walk north along X=30 toward office
+  ['mgr_hallway',  'mgr_outside'],    // step closer to front wall
+  ['mgr_outside',  'mgr_doorstep'],   // step to door threshold (triggers door open)
+  ['mgr_doorstep', 'mgr_entry'],      // walk through open door
+  ['mgr_entry',    'mgr_desk'],       // walk to manager desk
+
+  // === DESIGNER STUDIO (center -28, 0) — enter from left cross corridor ===
+  ['corr_L',       'design_entry'],   // branch off main corridor at X=-20 level
+  ['design_entry', 'design_center'],  // walk into studio
+
+  // === SOUTH ZONES — accessed via cross corridors reaching south ===
+  // Left south: cross_SL(-20,-12) → bar_entry(-22,-14) → bar_center(-28,-18)
+  ['cross_SL',     'bar_entry'],
+  ['bar_entry',    'bar_center'],
+
+  // Center south: corr_C(0,0) drops to rec via south cross node
+  ['corr_C',       'rec_entry'],      // direct south from main corridor center
+  ['rec_entry',    'rec_center'],
+
+  // Right south: cross_SR(20,-12) → gym_entry(14,-14) → gym_center(22,-18)
+  ['cross_SR',     'gym_entry'],
+  ['gym_entry',    'gym_center'],
+
+  // Cross-south interconnect (bar ↔ rec ↔ gym at Z≈-14)
+  ['bar_entry',    'rec_entry'],
+  ['rec_entry',    'gym_entry'],
+
+  // === STAIRCASE & MEZZANINE ===
+  // Stairs bot at (35,-14): reachable from cross_SR and gym side
+  ['cross_SR',     'stairs_bot'],
+  ['gym_center',   'stairs_bot'],
+  ['stairs_bot',   'stairs_top'],
+  ['stairs_top',   'mezz_C'],
+
+  // === GALLERY WING (inside campus, upper-left area) ===
+  ['cross_NL',     'gallery_entry'],   // north from left cross corridor
+  ['design_entry', 'gallery_entry'],   // from designer studio area
+  ['gallery_entry','gallery_center'],  // enter gallery
 ];
 
 // === BUILD GRAPH ===