clay-server 5.1.0-beta.1 → 5.1.0-beta.2

package/lib/public/index.html

@@ -56,6 +56,7 @@
   <!-- === Top Bar (full width, forms reverse-ㄱ with icon strip) === -->
   <div id="top-bar">
     <div class="top-bar-left-pills">
+      <a class="top-bar-brand-link" href="https://github.com/chadbyte/clay" target="_blank" rel="noopener noreferrer" aria-label="Clay Studio repository"><span class="top-bar-brand-wordmark" aria-hidden="true"></span></a>
       <button id="pwa-install-pill" class="top-bar-install-btn hidden" title="Open as app"><i data-lucide="download"></i> Open as app</button>
       <div id="update-pill-wrap" class="top-bar-update hidden">
         <button id="update-pill" class="top-bar-update-btn"><i data-lucide="arrow-up-circle"></i> <span id="update-version"></span> is available. Update now</button>
@@ -81,114 +82,40 @@
 
   <!-- === Icon Strip === -->
   <div id="icon-strip">
-    <div class="icon-strip-home" title="Clay Studio">
-      <span class="icon-strip-pill"></span>
-      <img class="icon-strip-logo" src="clay-studio-symbol.png" width="38" height="38" alt="Clay Studio">
-      <span class="icon-strip-home-badge" id="icon-strip-home-badge"></span>
-    </div>
+    <button type="button" class="icon-strip-home icon-strip-brand" aria-label="Open Clay" disabled>
+      <img class="icon-strip-logo" src="clay-studio-symbol.png" width="38" height="38" alt="">
+    </button>
     <div class="icon-strip-separator"></div>
     <button type="button" class="icon-strip-hint" id="icon-strip-hint-project" data-switcher-mode="project" aria-label="Switch project"></button>
+    <div class="icon-strip-filter" id="icon-strip-filter">
+      <button type="button" class="icon-strip-filter-knob" id="icon-strip-filter-knob" data-mode="all" aria-label="Showing all. Activate to show projects only">
+        <span class="icon-strip-filter-face" aria-hidden="true">
+          <span class="icon-strip-filter-pointer"></span>
+          <span class="icon-strip-filter-category" data-filter-icon="all"><i data-lucide="layout-grid"></i></span>
+          <span class="icon-strip-filter-category" data-filter-icon="projects"><i data-lucide="folder"></i></span>
+          <span class="icon-strip-filter-category" data-filter-icon="mates"><i data-lucide="users"></i></span>
+        </span>
+        <span class="icon-strip-filter-label" id="icon-strip-filter-label">All</span>
+      </button>
+    </div>
     <div class="icon-strip-projects" id="icon-strip-projects">
       <div class="skeleton-icon-strip-item"></div>
       <div class="skeleton-icon-strip-item"></div>
     </div>
-    <button class="icon-strip-add" id="icon-strip-add" title="Add project"><i data-lucide="plus"></i></button>
+    <button class="icon-strip-add" id="icon-strip-add" type="button" title="Add" aria-label="Add a Mate or project" aria-haspopup="dialog"><i data-lucide="plus"></i></button>
     <div class="icon-strip-mate-section" id="icon-strip-mate-section">
       <button type="button" class="icon-strip-hint hidden" id="icon-strip-hint-mate" data-switcher-mode="mate" aria-label="Switch mate"></button>
       <div class="icon-strip-users hidden" id="icon-strip-users"></div>
     </div>
-    <div class="icon-strip-me" id="icon-strip-me"></div>
   </div>
 
   <!-- === Main Area (sidebar + resize-handle + main-column) === -->
   <div id="main-area">
     <section id="projects-hub" class="hidden" aria-label="Projects"></section>
-    <div id="home-hub" class="hidden">
-      <div class="home-hub-inner">
-        <button id="home-sidebar-backdrop" class="home-sidebar-backdrop" type="button" aria-label="Close Home navigation"></button>
-        <aside id="home-sidebar" class="home-sidebar" aria-label="Home navigation">
-          <div class="home-sidebar-brand-row">
-            <div class="home-sidebar-brand"><img src="/clay-studio-symbol.png" alt=""><span class="home-sidebar-brand-wordmark">Clay Studio</span></div>
-            <div class="home-sidebar-brand-actions">
-              <button id="home-sidebar-all" class="home-sidebar-icon-btn" type="button" title="Search chats" aria-label="Search chats"><i data-lucide="search"></i></button>
-              <button id="home-sidebar-collapse" class="home-sidebar-icon-btn" type="button" title="Collapse sidebar" aria-label="Collapse Home sidebar"><i data-lucide="panel-left-close"></i></button>
-            </div>
-          </div>
-          <nav class="home-sidebar-primary-actions" aria-label="Home actions">
-            <button id="home-nav-projects" class="home-sidebar-action" type="button" title="Projects" aria-label="Projects"><span class="home-sidebar-action-icon" aria-hidden="true"><i data-lucide="folder"></i></span><span>Projects</span></button>
-            <button id="home-sidebar-new" class="home-sidebar-action home-sidebar-new" type="button" title="New Chat" aria-label="Start a new chat with the current Mate" disabled><span class="home-sidebar-action-icon" aria-hidden="true"><i data-lucide="message-square-plus"></i></span><span>New Chat</span></button>
-            <button id="home-sidebar-debate" class="home-sidebar-action" type="button" title="Browse debates" aria-label="Browse debates" aria-pressed="false"><span class="home-sidebar-action-icon" aria-hidden="true"><i data-lucide="messages-square"></i></span><span>Debates</span></button>
-            <button id="home-tools-btn" class="home-sidebar-action" type="button" title="Capsules" aria-label="Capsules" aria-expanded="false" aria-controls="home-tool-workbench"><span class="home-sidebar-action-icon" aria-hidden="true"><i data-lucide="box"></i></span><span id="home-tools-label">Capsules</span><span id="home-tools-activity" class="home-tools-activity" aria-hidden="true"></span></button>
-          </nav>
-          <section class="home-sidebar-section home-sidebar-mate-section" aria-labelledby="home-sidebar-mate-label">
-            <button id="home-sidebar-mate-label" class="home-sidebar-label home-sidebar-mate-toggle" type="button" aria-expanded="true" aria-controls="home-mate-list"><span>Mates</span><i data-lucide="chevron-down" aria-hidden="true"></i></button>
-            <div id="home-mate-list" class="home-mate-list" role="list" aria-label="Mates"></div>
-          </section>
-          <section class="home-sidebar-section home-sidebar-recents" aria-labelledby="home-sidebar-recent-label">
-            <div class="home-sidebar-recents-heading">
-              <div id="home-sidebar-recent-label" class="home-sidebar-label">Chats</div>
-              <div class="home-chat-scope" role="group" aria-label="Chat scope">
-                <button class="home-chat-scope-option" type="button" data-home-chat-scope="current" aria-pressed="false" aria-controls="home-sidebar-recent-list">Current</button>
-                <button class="home-chat-scope-option" type="button" data-home-chat-scope="all" aria-pressed="true" aria-controls="home-sidebar-recent-list">All</button>
-              </div>
-            </div>
-            <div id="home-sidebar-recent-list" class="home-sidebar-recent-list"></div>
-          </section>
-        </aside>
-        <div id="home-workspace" class="home-workspace">
-          <button id="home-sidebar-expand" class="home-sidebar-expand" type="button" title="Show sidebar" aria-label="Show Home sidebar" aria-describedby="home-sidebar-expand-brand-label"><i data-lucide="panel-left-open"></i><span id="home-sidebar-expand-brand-label" class="home-sidebar-brand-wordmark home-sidebar-expand-wordmark">Clay Studio</span></button>
-          <button id="home-close-control" class="home-close-control" type="button" title="Return to project" aria-label="Return to project"><i data-lucide="folder" aria-hidden="true"></i><span>Project</span></button>
-          <section id="home-project-empty" class="home-project-empty" aria-labelledby="home-project-empty-title" hidden>
-            <div class="home-project-empty-content">
-              <span class="home-project-empty-icon" aria-hidden="true"><i data-lucide="folder-plus"></i></span>
-              <p class="home-project-empty-eyebrow">PROJECT WORKSPACE</p>
-              <h1 id="home-project-empty-title" tabindex="-1">Start a new project</h1>
-              <p id="home-project-empty-status" class="home-project-empty-status" role="status">Create an empty project, then continue in its workspace.</p>
-              <button id="home-project-empty-create" type="button">Start a new project</button>
-            </div>
-          </section>
-          <div id="home-conversation-region" class="home-conversation-region">
-            <div id="home-mate-chat" class="home-mate-chat">
-              <div class="home-mate-chat-stage">
-                <section id="home-debates-archive" class="home-debates-archive" aria-labelledby="home-debates-title" hidden>
-                  <header class="home-debates-header">
-                    <div>
-                      <p class="home-debates-eyebrow">Home archive</p>
-                      <h1 id="home-debates-title" tabindex="-1">Debates</h1>
-                      <p id="home-debates-summary" class="home-debates-summary" role="status" aria-live="polite">Loading debates…</p>
-                    </div>
-                    <button id="home-debates-new" class="home-debates-new" type="button"><i data-lucide="messages-square" aria-hidden="true"></i><span>New debate</span></button>
-                  </header>
-                  <form id="home-debates-topic-form" class="home-debates-topic-form" hidden>
-                    <label for="home-debates-topic">What should the debate be about?</label>
-                    <textarea id="home-debates-topic" rows="2" maxlength="1000" required placeholder="Enter a question or topic"></textarea>
-                    <div class="home-debates-topic-actions">
-                      <p id="home-debates-topic-status" role="status" aria-live="polite">Press Ctrl or Command + Enter to start.</p>
-                      <button id="home-debates-topic-cancel" type="button">Cancel</button>
-                      <button id="home-debates-topic-submit" type="submit">Start debate</button>
-                    </div>
-                  </form>
-                  <div id="home-debates-list" class="home-debates-list" aria-label="Debate archive"></div>
-                </section>
-                <div class="home-mate-chat-messages" id="home-mate-chat-messages"></div>
-                <button id="home-chat-new-activity" class="home-chat-new-activity" type="button" hidden><i data-lucide="arrow-down" aria-hidden="true"></i><span>New activity</span></button>
-                <div id="home-mate-chat-composer-frame" class="home-mate-chat-composer-frame">
-                  <div id="home-mate-chat-composer" class="home-mate-chat-composer">
-                    <textarea id="home-mate-chat-input" rows="1" placeholder="Message"></textarea>
-                    <button id="home-stt-btn" type="button" aria-label="Start voice input"><i data-lucide="mic"></i></button>
-                    <button id="home-mate-chat-send" aria-label="Send message"><i data-lucide="arrow-up"></i></button>
-                  </div>
-                  <div id="home-mate-chat-session-model" class="home-mate-chat-session-model" role="status" aria-live="polite" title="Model for this conversation: Loading model…">
-                    <i data-lucide="cpu" aria-hidden="true"></i><span>Conversation model</span><span aria-hidden="true">·</span><span id="home-mate-chat-session-model-value">Loading model…</span><button id="home-mate-chat-session-model-choose" class="hidden" type="button">Choose model</button>
-                  </div>
-                  <div id="home-debate-controls-slot" class="home-debate-controls-slot" hidden></div>
-                </div>
-                <div id="home-mate-chat-suggestions" class="home-mate-chat-suggestions"></div>
-              </div>
-            </div>
-          </div>
-          <div id="home-dock-backdrop" class="home-dock-backdrop"></div>
-          <div id="home-dock-divider" class="home-dock-divider" role="separator" aria-label="Resize Capsules Workbench" aria-orientation="vertical" tabindex="0"></div>
+    <!-- Retained inert Capsule host markup. Capsules and their stored data are
+         preserved for a future placement without keeping the Home board live. -->
+    <template id="retained-capsule-host-template">
+    <section id="retained-capsule-host" aria-label="Retained Capsules Workbench">
           <section id="home-tool-workbench" class="home-tool-workbench" aria-label="Capsules Workbench">
             <div class="home-dock-header">
               <button id="home-dock-return" class="home-dock-return" type="button"><i data-lucide="arrow-left"></i><span>Return to conversation</span></button>
@@ -201,15 +128,14 @@
             </div>
             <div class="home-dock-content" id="home-dock-content"></div>
           </section>
-        </div>
-      </div>
-    </div>
+    </section>
+    </template>
 
     <div id="sidebar-column">
       <div class="title-bar-sidebar">
         <button class="title-bar-project-dropdown" id="title-bar-project-dropdown">
           <span class="title-bar-project-icon" id="title-bar-project-icon" aria-hidden="true"></span>
-          <span class="title-bar-project-name" id="title-bar-project-name"></span>
+          <span class="title-bar-project-label"><span class="title-bar-project-name" id="title-bar-project-name"></span><span class="title-bar-project-default" id="title-bar-project-default"></span></span>
           <i data-lucide="chevron-down" class="title-bar-chevron"></i>
         </button>
         <span id="sidebar-presence" class="sidebar-presence"></span>
@@ -655,7 +581,6 @@
   <div id="mobile-tab-bar">
     <button class="mobile-tab" data-tab="chat" id="mob-tab-chat"><i data-lucide="message-square"></i><span class="mobile-tab-label">Chat</span></button>
     <button class="mobile-tab" data-tab="search" id="mob-tab-search"><i data-lucide="search"></i><span class="mobile-tab-label">Search</span></button>
-    <button class="mobile-tab-home" id="mobile-home-btn"><img src="/clay-studio-symbol.png" alt="Clay Studio home" class="mobile-home-icon"></button>
     <button class="mobile-tab" data-tab="tools" id="mob-tab-tools"><i data-lucide="wrench"></i><span class="mobile-tab-label">Tools</span></button>
     <button class="mobile-tab" data-tab="settings" id="mob-tab-settings"><i data-lucide="settings"></i><span class="mobile-tab-label">Settings</span></button>
   </div>
@@ -941,13 +866,16 @@
 
   <!-- === User Island === -->
   <div id="user-island">
-    <div class="user-island-profile">
+    <button class="user-island-profile" id="user-account-trigger" type="button" aria-label="Open account menu" aria-controls="account-popover" aria-expanded="false">
       <div class="user-island-avatar"><span class="user-island-avatar-letter">?</span></div>
       <div class="user-island-info">
         <span class="user-island-name"></span>
         <span class="user-island-cta hidden">Personalize your name</span>
       </div>
-    </div>
+    </button>
+    <button id="cursor-share-toggle" class="cursor-share-toggle" type="button" aria-pressed="false" aria-label="Cursor sharing unavailable" disabled>
+      <i data-lucide="mouse-pointer-2" class="cursor-share-icon" aria-hidden="true"></i>
+    </button>
     <div class="user-island-actions">
       <button id="user-settings-btn" title="User settings"><i data-lucide="settings"></i></button>
     </div>
@@ -1161,7 +1089,7 @@
             <label class="settings-toggle-row">
               <div>
                 <span class="settings-label">Mate DMs in projects</span>
-                <div class="settings-hint">Show Mate DM shortcuts in project workspaces. Home, Debates, mentions, and Mate memory stay available.</div>
+                <div class="settings-hint">Show Mate DM shortcuts in project workspaces. Debates, mentions, and Mate memory stay available.</div>
               </div>
               <input type="checkbox" id="us-mates-enabled">
               <span class="toggle-track"><span class="toggle-thumb"></span></span>
@@ -2274,6 +2202,10 @@
 <script src="https://cdn.jsdelivr.net/npm/@xterm/addon-fit@0/lib/addon-fit.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/@xterm/addon-web-links@0/lib/addon-web-links.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/@xterm/addon-webgl@0/lib/addon-webgl.min.js"></script>
+<script src="vendor/codemirror/codemirror.js"></script>
+<script src="vendor/codemirror/markdown.js"></script>
+<script src="vendor/codemirror/continuelist.js"></script>
+<script src="vendor/codemirror/show-hint.js"></script>
   <script type="module" src="app.js?v=20260913-scheduled-tasks4"></script>
 <div id="pwa-install-modal" class="pwa-modal hidden">
   <div class="pwa-modal-backdrop"></div>

package/lib/public/modules/account-island.js

@@ -0,0 +1,230 @@
+import { store } from './store.js';
+import { mountDefaultAi, unmountDefaultAi } from './default-ai.js';
+import { openUserSettings } from './user-settings.js';
+import { getProfile, updateProfileName, regenerateProfileAvatar, showAvatarPositioner, uploadAvatarBlob } from './profile.js';
+import { requestCursorSharingState, setCursorSharing } from './app-cursors.js';
+import { registerTooltip } from './tooltip.js';
+
+var popover = null;
+var trigger = null;
+var lastFocus = null;
+
+function accountName() { return document.body.dataset.myDisplayName || 'Clay user'; }
+
+function close(returnFocus) {
+  if (!popover) return;
+  var aiSection = popover.querySelector('#account-ai-section');
+  if (aiSection) unmountDefaultAi(aiSection);
+  popover.remove();
+  popover = null;
+  trigger.setAttribute('aria-expanded', 'false');
+  trigger.setAttribute('aria-label', 'Open account menu for ' + accountName());
+  document.removeEventListener('pointerdown', onOutside);
+  document.removeEventListener('focusin', onFocusOutside);
+  document.removeEventListener('keydown', onKeydown);
+  window.removeEventListener('resize', position);
+  store.set({ defaultAiInlineEditing: false });
+  if (returnFocus && lastFocus && document.contains(lastFocus)) lastFocus.focus({ preventScroll: true });
+  lastFocus = null;
+}
+
+function isAvatarPositionerTarget(target) { return target && target.closest && target.closest('.avatar-positioner-overlay'); }
+function onOutside(event) { if (!popover || popover.contains(event.target) || trigger.contains(event.target) || isAvatarPositionerTarget(event.target)) return; close(false); }
+function onFocusOutside(event) { if (!popover || popover.contains(event.target) || trigger.contains(event.target) || isAvatarPositionerTarget(event.target)) return; close(false); }
+function onKeydown(event) {
+  if (event.key !== 'Escape') return;
+  if (isAvatarPositionerTarget(event.target) || document.querySelector('.avatar-positioner-overlay')) return;
+  event.preventDefault();
+  event.stopPropagation();
+  close(true);
+}
+
+function position() {
+  if (!popover || !trigger) return;
+  var rect = trigger.getBoundingClientRect();
+  var width = Math.min(280, window.innerWidth - 24);
+  var left = Math.max(12, Math.min(window.innerWidth - width - 12, rect.left));
+  popover.style.width = width + 'px';
+  popover.style.left = left + 'px';
+  popover.style.top = Math.max(12, rect.top - popover.offsetHeight - 8) + 'px';
+}
+
+function renderNameResting(restoreFocus) {
+  var section = popover && popover.querySelector('.account-identity-copy');
+  if (!section) return;
+  section.innerHTML = '<button type="button" id="account-name-edit" class="account-name-display"><span></span><i data-lucide="pencil" aria-hidden="true"></i></button><small>Personal account</small>';
+  section.querySelector('span').textContent = accountName();
+  section.querySelector('#account-name-edit').addEventListener('click', startNameEdit);
+  if (window.lucide) window.lucide.createIcons({ nodes: [section] });
+  if (restoreFocus) section.querySelector('#account-name-edit').focus();
+}
+
+function startNameEdit() {
+  var section = popover && popover.querySelector('.account-identity-copy');
+  if (!section) return;
+  var input = document.createElement('input');
+  input.id = 'account-profile-name';
+  input.setAttribute('aria-label', 'Display name');
+  input.className = 'account-name-input';
+  input.type = 'text';
+  input.maxLength = 50;
+  input.autocomplete = 'name';
+  input.value = getProfile().name || '';
+  section.innerHTML = '';
+  section.appendChild(input);
+  var hint = document.createElement('small');
+  hint.textContent = 'Enter to save · Escape to cancel';
+  section.appendChild(hint);
+  input.addEventListener('keydown', function(event) {
+    if (event.key === 'Enter') {
+      event.preventDefault();
+      updateProfileName(input.value);
+      renderNameResting(true);
+    } else if (event.key === 'Escape') {
+      event.preventDefault();
+      renderNameResting(true);
+    }
+    event.stopPropagation();
+  });
+  input.focus();
+  input.select();
+}
+
+function toggleAvatarEditor() {
+  var editor = popover && popover.querySelector('#account-avatar-editor');
+  if (!editor) return;
+  editor.hidden = !editor.hidden;
+  if (!editor.hidden) editor.querySelector('#account-avatar-upload').focus();
+  position();
+}
+
+function bindAvatarEditor() {
+  var avatar = popover.querySelector('#account-avatar-edit');
+  var editor = popover.querySelector('#account-avatar-editor');
+  var upload = editor.querySelector('#account-avatar-upload');
+  var file = editor.querySelector('#account-avatar-file');
+  var generate = editor.querySelector('#account-avatar-generate');
+  avatar.addEventListener('click', function(event) { event.stopPropagation(); toggleAvatarEditor(); });
+  editor.addEventListener('click', function(event) { event.stopPropagation(); });
+  upload.addEventListener('click', function() { file.click(); });
+  file.addEventListener('change', function() {
+    var selected = file.files && file.files[0];
+    if (!selected) return;
+    var image = new Image();
+    var objectUrl = URL.createObjectURL(selected);
+    image.onload = function() {
+      showAvatarPositioner(image, objectUrl, function(blob) {
+        URL.revokeObjectURL(objectUrl);
+        uploadAvatarBlob(blob).then(function() { editor.hidden = true; }).catch(function() { editor.dataset.error = 'true'; });
+      });
+    };
+    image.src = objectUrl;
+  });
+  generate.addEventListener('click', function() { regenerateProfileAvatar(); editor.hidden = true; });
+}
+
+function render() {
+  popover = document.createElement('div');
+  popover.id = 'account-popover';
+  popover.className = 'account-popover';
+  popover.setAttribute('role', 'dialog');
+  popover.setAttribute('aria-label', 'Account');
+  var profile = getProfile();
+  var identity = document.createElement('div');
+  identity.className = 'account-menu-identity';
+  identity.innerHTML = '<button type="button" id="account-avatar-edit" class="account-avatar-edit" aria-label="Edit avatar"><img src="' + (document.body.dataset.myAvatarUrl || '') + '" alt=""></button><div class="account-identity-copy"></div><button type="button" class="account-settings-button" aria-label="User Settings" title="User Settings"><i data-lucide="settings" aria-hidden="true"></i></button>';
+  identity.querySelector('#account-avatar-edit img').alt = profile.name || 'Clay user';
+  var editor = document.createElement('div');
+  editor.id = 'account-avatar-editor';
+  editor.className = 'account-avatar-editor';
+  editor.hidden = true;
+  editor.innerHTML = '<button type="button" id="account-avatar-upload">Upload photo</button><button type="button" id="account-avatar-generate">Generate avatar</button><input id="account-avatar-file" type="file" accept="image/*">';
+  popover.appendChild(identity);
+  popover.appendChild(editor);
+  var aiSection = document.createElement('section');
+  aiSection.id = 'account-ai-section';
+  aiSection.className = 'account-inline-section account-ai-section';
+  aiSection.setAttribute('aria-label', 'Default AI');
+  popover.appendChild(aiSection);
+  mountDefaultAi(aiSection);
+  identity.querySelector('.account-settings-button').addEventListener('click', onSettings);
+  document.body.appendChild(popover);
+  renderNameResting();
+  bindAvatarEditor();
+  updateCursorAction();
+  if (window.lucide) window.lucide.createIcons({ nodes: [popover] });
+  position();
+}
+
+function updateCursorAction() {
+  var button = document.getElementById('cursor-share-toggle');
+  if (!button) return;
+  var hydrated = store.get('cursorSharingHydrated') === true;
+  var enabled = hydrated && store.get('cursorSharingEnabled') === true;
+  var pending = store.get('cursorSharingPending') !== null && store.get('cursorSharingPending') !== undefined;
+  var connected = store.get('connected') !== false;
+  var error = store.get('cursorSharingError');
+  var canRetry = !!error && !hydrated && connected;
+  var showOff = hydrated && !enabled && !pending && !error && connected;
+  button.hidden = store.get('isMultiUserMode') !== true;
+  button.removeAttribute('role');
+  button.removeAttribute('aria-checked');
+  button.setAttribute('aria-pressed', enabled ? 'true' : 'false');
+  button.classList.toggle('on', enabled);
+  button.classList.toggle('off', showOff);
+  button.classList.toggle('pending', pending);
+  button.disabled = pending || !connected || (!hydrated && !canRetry);
+  var stateLabel = pending ? 'waiting' : !connected ? 'offline' : error ? (canRetry ? 'error; activate to retry' : 'error') : !hydrated ? 'unavailable' : enabled ? 'on' : 'off';
+  button.setAttribute('aria-label', 'Cursor sharing ' + stateLabel);
+  var tooltipText = pending ? 'Cursor sharing is waiting for confirmation.' : !connected ? 'Cursor sharing is offline.' : error ? (canRetry ? 'Cursor sharing is unavailable. Click to retry.' : 'Cursor sharing is unavailable.') : !hydrated ? 'Cursor sharing is unavailable.' : enabled ? 'Your cursor is visible to others. Click to stop sharing.' : 'Cursor sharing is off. Click to share your cursor.';
+  registerTooltip(button, tooltipText);
+}
+
+function onSettings(event) { event.stopPropagation(); close(false); openUserSettings(); }
+function onCursorAction(event) {
+  event.stopPropagation();
+  if (event.currentTarget.disabled) return;
+  if (store.get('cursorSharingError') && store.get('cursorSharingHydrated') !== true) {
+    requestCursorSharingState();
+    return;
+  }
+  setCursorSharing(!(store.get('cursorSharingEnabled') === true));
+}
+function focusAi() { var control = popover && popover.querySelector('#account-ai-section select'); if (control) control.focus({ preventScroll: true }); }
+function onOpenDefaultAi() { if (!popover) open(); store.set({ defaultAiInlineEditing: true }); focusAi(); }
+
+function open() {
+  if (popover) { close(true); return; }
+  lastFocus = document.activeElement;
+  render();
+  trigger.setAttribute('aria-expanded', 'true');
+  trigger.setAttribute('aria-label', 'Close account menu for ' + accountName());
+  document.addEventListener('pointerdown', onOutside);
+  document.addEventListener('focusin', onFocusOutside);
+  document.addEventListener('keydown', onKeydown);
+  window.addEventListener('resize', position);
+}
+
+export function initAccountIsland() {
+  trigger = document.getElementById('user-account-trigger');
+  if (!trigger) return;
+  trigger.addEventListener('click', open);
+  document.addEventListener('clay:open-account-default-ai', onOpenDefaultAi);
+  var cursorToggle = document.getElementById('cursor-share-toggle');
+  if (cursorToggle) cursorToggle.addEventListener('click', onCursorAction);
+  updateCursorAction();
+  trigger.setAttribute('aria-label', 'Open account menu for ' + accountName());
+  store.subscribe(function(state, previous) {
+    if (state.myUserId !== previous.myUserId || state.connected === false) close(false);
+    updateCursorAction();
+    if (popover) position();
+  });
+  document.addEventListener('clay:profile-updated', function() {
+    if (!popover) return;
+    var identityName = popover.querySelector('.account-name-display span');
+    if (identityName) identityName.textContent = accountName();
+    var avatar = popover.querySelector('#account-avatar-edit img');
+    if (avatar) avatar.src = document.body.dataset.myAvatarUrl || avatar.src;
+  });
+  window.addEventListener('resize', position);
+}

package/lib/public/modules/app-cursors.js

@@ -199,50 +199,26 @@ function findClosestTurn(clientY) {
 
 // Cursor sharing toggle button in user island (multi-user only)
 export function initCursorToggle() {
-  if (!store.get('isMultiUserMode')) return;
-  var actionsEl = document.querySelector(".user-island-actions");
-  if (!actionsEl) return;
-  if (document.getElementById("cursor-share-toggle")) return;
-
-  var btn = document.createElement("button");
-  btn.id = "cursor-share-toggle";
-  btn.className = "cursor-share-btn";
-  btn.innerHTML = '<i data-lucide="mouse-pointer-2"></i>';
-  var settingsBtn = document.getElementById("user-settings-btn");
-  if (settingsBtn) {
-    actionsEl.insertBefore(btn, settingsBtn);
-  } else {
-    actionsEl.appendChild(btn);
-  }
-
-  function updateToggleStyle() {
-    if (store.get("cursorSharingHydrated") && store.get("cursorSharingEnabled")) {
-      btn.classList.remove("off");
-      btn.classList.add("on");
-      registerTooltip(btn, "Cursor sharing on");
-    } else {
-      btn.classList.remove("on");
-      btn.classList.add("off");
-      registerTooltip(btn, "Cursor sharing off");
-    }
-  }
-
-  store.subscribe(function (state, prev) {
-    if (state.cursorSharingEnabled !== prev.cursorSharingEnabled || state.cursorSharingHydrated !== prev.cursorSharingHydrated) {
-      updateToggleStyle();
-    }
-  });
+  // The labeled rail control is owned by account-island.js.
+  return;
+}
 
-  updateToggleStyle();
-  lucide.createIcons({ nodes: [btn] });
+export function setCursorSharing(enabled) {
+  if (!store.get('cursorSharingHydrated') || store.get('cursorSharingPending') !== null && store.get('cursorSharingPending') !== undefined) return false;
+  if (enabled === true && store.get('isMultiUserMode') !== true) return false;
+  var ws = getWs();
+  if (!ws || ws.readyState !== 1) return false;
+  store.set({ cursorSharingPending: enabled });
+  ws.send(JSON.stringify({ type: 'cursor_sharing_set', enabled: enabled === true, requestId: 'cursor-sharing-' + Date.now() }));
+  return true;
+}
 
-  btn.addEventListener("click", function () {
-    if (!store.get("cursorSharingHydrated")) return;
-    var next = !store.get("cursorSharingEnabled");
-    var ws = getWs();
-    if (!ws || ws.readyState !== 1) return;
-    ws.send(JSON.stringify({ type: "cursor_sharing_set", enabled: next, requestId: "cursor-sharing-" + Date.now() }));
-  });
+export function requestCursorSharingState() {
+  var ws = getWs();
+  if (!ws || ws.readyState !== 1) return false;
+  store.set({ cursorSharingPending: 'refresh' });
+  ws.send(JSON.stringify({ type: 'cursor_sharing_get', requestId: 'cursor-sharing-refresh-' + Date.now() }));
+  return true;
 }
 
 // --- Exported functions ---
@@ -393,7 +369,7 @@ export function initCursors() {
       if (cursorThrottleTimer) { clearTimeout(cursorThrottleTimer); cursorThrottleTimer = null; }
       if (selectionThrottleTimer) { clearTimeout(selectionThrottleTimer); selectionThrottleTimer = null; }
       lastSelectionKey = "";
-      store.set({ cursorSharingEnabled: false, cursorSharingHydrated: false, cursorSharingAccountId: null });
+      store.set({ cursorSharingEnabled: false, cursorSharingHydrated: false, cursorSharingAccountId: null, cursorSharingPending: null, cursorSharingError: disconnected ? "disconnected" : "account-changed" });
       if (identityChanged && state.myUserId && state.connected) {
         var ws = getWs();
         if (ws && ws.readyState === 1) ws.send(JSON.stringify({ type: "cursor_sharing_get", requestId: "cursor-sharing-refresh-" + Date.now() }));

package/lib/public/modules/app-debate-ui.js

@@ -6,6 +6,7 @@ import { store } from './store.js';
 import { getWs } from './ws-ref.js';
 import { scrollToBottom } from './app-rendering.js';
 import { exportDebateAsPdf } from './debate.js';
+import { getProjectAssistantPlaceholder } from './project-chat-identity.js';
 
 // Module-internal UI var (not in store)
 var debateHandRaiseOpen = false;
@@ -64,7 +65,7 @@ export function exitDebateConcludeMode() {
   if (banner) banner.remove();
   var inputEl = document.getElementById("input");
   if (inputEl && inputEl._origPlaceholder) {
-    inputEl.placeholder = inputEl._origPlaceholder;
+    inputEl.placeholder = getProjectAssistantPlaceholder(store.snap(), store.get('currentVendor'));
     delete inputEl._origPlaceholder;
   }
 }
@@ -129,7 +130,7 @@ export function exitDebateEndedMode() {
   if (banner) banner.remove();
   var inputEl2 = document.getElementById("input");
   if (inputEl2 && inputEl2._origPlaceholder) {
-    inputEl2.placeholder = inputEl2._origPlaceholder;
+    inputEl2.placeholder = getProjectAssistantPlaceholder(store.snap(), store.get('currentVendor'));
     delete inputEl2._origPlaceholder;
   }
 }
@@ -191,7 +192,7 @@ export function exitDebateFloorMode() {
   if (banner) banner.remove();
   var inputEl = document.getElementById("input");
   if (inputEl && inputEl._origPlaceholder) {
-    inputEl.placeholder = inputEl._origPlaceholder;
+    inputEl.placeholder = getProjectAssistantPlaceholder(store.snap(), store.get('currentVendor'));
     delete inputEl._origPlaceholder;
   }
 }