clay-server 3.4.0-beta.1 → 3.4.0-beta.11

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

@@ -13,33 +13,48 @@ import { showImageModal, showPasteModal } from './app-misc.js';
 import { sendMessage, hasSendableContent } from './input.js';
 import { getChatLayout } from './theme.js';
 import { getScheduledMsgEl } from './app-rate-limit.js';
+export { VENDOR_ORDER, EXPERIMENTAL_VENDORS, isExperimentalVendor } from './vendor-priority.js';
 
 // Keep these client constants aligned with lib/yoke/vendor-registry.js. The
 // browser cannot import the server's CommonJS registry directly.
 export var VENDOR_AVATARS = {
   claude: "/claude-code-avatar.png",
   codex: "/codex-avatar.png",
-  gemini: "/gemini-avatar.svg",
+  antigravity: "/antigravity-avatar.png",
   opencode: "/opencode-avatar.svg",
+  kimi: "/kimi-avatar.svg",
+  grok: "/grok-avatar.svg",
+  copilot: "/copilot-avatar.svg",
+  qwen: "/qwen-avatar.svg",
+  junie: "/junie-avatar.svg",
   kiro: "/kiro-avatar.svg",
 };
 export var VENDOR_NAMES = {
   claude: "Claude Code",
   codex: "Codex",
-  gemini: "Gemini CLI",
+  antigravity: "Antigravity CLI",
   opencode: "OpenCode",
+  kimi: "Kimi Code",
+  grok: "Grok Build",
+  copilot: "GitHub Copilot CLI",
+  qwen: "Qwen Code",
+  junie: "Junie CLI",
   kiro: "Kiro CLI",
 };
 // Display order for every vendor Clay knows about, installed or not. Pickers
 // render the full list so a missing CLI reads as "not installed yet" rather
 // than "Clay doesn't support it".
-export var VENDOR_ORDER = ["claude", "codex", "gemini", "opencode", "kiro"];
 // Where to send the user when they pick a vendor whose CLI isn't installed.
 export var VENDOR_HOMEPAGES = {
   claude: "https://claude.com/product/claude-code",
   codex: "https://openai.com/codex/",
-  gemini: "https://github.com/google-gemini/gemini-cli",
+  antigravity: "https://antigravity.google/product/antigravity-cli",
   opencode: "https://opencode.ai/",
+  kimi: "https://www.kimi.com/code/",
+  grok: "https://docs.x.ai/build/overview",
+  copilot: "https://github.com/features/copilot/cli",
+  qwen: "https://qwenlm.github.io/qwen-code-docs/",
+  junie: "https://junie.jetbrains.com/",
   kiro: "https://kiro.dev/",
 };
 var NEW_MSG_BTN_DEFAULT = "\u2193 Latest";

package/lib/public/modules/input.js

@@ -7,6 +7,7 @@ import { mateAvatarUrl } from './avatar.js';
 import { tuiIsActive, tuiSubmitText } from './session-tui-view.js';
 import { VENDOR_AVATARS, VENDOR_NAMES } from './app-rendering.js';
 import { showToast } from './utils.js';
+import { isShellCommandMode, submitShellCommand } from './shell-command.js';
 
 var ctx;
 
@@ -75,6 +76,37 @@ export var builtinCommands = [
   { name: "status", desc: "Process status and resource usage" },
 ];
 
+function commitVendorForTurn() {
+  var committedVendor = store.get('currentVendor');
+  var vendorToggle = document.getElementById("vendor-toggle-wrap");
+  var activeIndicator = document.getElementById("active-vendor-indicator");
+  var activeIcon = document.getElementById("active-vendor-icon");
+  if (committedVendor) {
+    if (vendorToggle) {
+      vendorToggle.classList.add("hidden");
+      vendorToggle.classList.remove("locked");
+    }
+    if (activeIndicator && activeIcon) {
+      activeIcon.src = VENDOR_AVATARS[committedVendor] || VENDOR_AVATARS.claude;
+      activeIcon.alt = VENDOR_NAMES[committedVendor] || VENDOR_NAMES.claude;
+      activeIndicator.title = (VENDOR_NAMES[committedVendor] || VENDOR_NAMES.claude) + " session";
+      activeIndicator.classList.remove("hidden");
+    }
+  } else if (vendorToggle) {
+    vendorToggle.classList.remove("hidden");
+    vendorToggle.classList.add("locked");
+  }
+  store.set({ vendorSelectionLocked: false, sessionHasHistory: true });
+}
+
+function showPreThinkingForTurn() {
+  if (ctx.isMateDm && ctx.isMateDm()) {
+    ctx.showMatePreThinking();
+  } else if (ctx.showClaudePreThinking) {
+    ctx.showClaudePreThinking();
+  }
+}
+
 // --- Send ---
 export function sendMessage() {
   // Debate ended mode intercept: route to resume handler
@@ -92,6 +124,14 @@ export function sendMessage() {
     ctx.handleDebateFloorSend();
     return;
   }
+  if (isShellCommandMode()) {
+    var shellText = ctx.inputEl.value.trim();
+    if (!shellText || !submitShellCommand(shellText)) return;
+    ctx.inputEl.value = "";
+    sendInputSync();
+    autoResize();
+    return;
+  }
   // DM mode intercept: if in DM mode, route to DM handler instead
   if (ctx.isDmMode && ctx.isDmMode() && ctx.handleDmSend) {
     ctx.handleDmSend();
@@ -304,36 +344,10 @@ export function sendMessage() {
   // Bumping sessionHasHistory drives in-session lock states (e.g. the
   // Codex model picker that becomes informational once the thread is
   // bound to a model).
-  var _committedVendor = store.get('currentVendor');
-  var _vtw2 = document.getElementById("vendor-toggle-wrap");
-  var _avi = document.getElementById("active-vendor-indicator");
-  var _avIcon = document.getElementById("active-vendor-icon");
-  if (_committedVendor) {
-    if (_vtw2) {
-      _vtw2.classList.add("hidden");
-      _vtw2.classList.remove("locked");
-    }
-    if (_avi && _avIcon) {
-      _avIcon.src = VENDOR_AVATARS[_committedVendor] || VENDOR_AVATARS.claude;
-      _avIcon.alt = VENDOR_NAMES[_committedVendor] || VENDOR_NAMES.claude;
-      _avi.title = (VENDOR_NAMES[_committedVendor] || VENDOR_NAMES.claude) + " session";
-      _avi.classList.remove("hidden");
-    }
-  } else if (_vtw2) {
-    // No committed vendor (defensive — shouldn't happen because the
-    // input is otherwise gated on a vendor pick). Fall back to the
-    // locked toggle so the running vendor is still visible.
-    _vtw2.classList.remove("hidden");
-    _vtw2.classList.add("locked");
-  }
-  store.set({ vendorSelectionLocked: false, sessionHasHistory: true });
+  commitVendorForTurn();
 
   // Show pre-thinking dots before server responds
-  if (ctx.isMateDm && ctx.isMateDm()) {
-    ctx.showMatePreThinking();
-  } else if (ctx.showClaudePreThinking) {
-    ctx.showClaudePreThinking();
-  }
+  showPreThinkingForTurn();
 
   ctx.inputEl.value = "";
   sendInputSync();
@@ -354,6 +368,22 @@ export function sendTextMessage(text) {
   return true;
 }
 
+export function sendShellResultToAgent(msg) {
+  if (!ctx || !ctx.connected || !msg || msg.error || !msg.command) return false;
+  if (String(msg.sessionId) !== String(store.get("activeSessionId"))) return false;
+  var payload = {
+    type: "message",
+    text: "$ " + msg.command,
+    shellCommandResponse: true,
+  };
+  var selectedVendor = store.get("currentVendor") || null;
+  if (selectedVendor) payload.vendor = selectedVendor;
+  ctx.ws.send(JSON.stringify(payload));
+  commitVendorForTurn();
+  showPreThinkingForTurn();
+  return true;
+}
+
 export function autoResize() {
   ctx.inputEl.style.height = "auto";
   ctx.inputEl.style.height = Math.min(ctx.inputEl.scrollHeight, 120) + "px";

package/lib/public/modules/mate-sidebar.js

@@ -6,6 +6,7 @@ import { hideKnowledge } from './mate-knowledge.js';
 import { isSchedulerOpen, closeScheduler } from './scheduler.js';
 import { hideNotes } from './sticky-notes.js';
 import { openSearch as openSessionSearch } from './session-search.js';
+import { isExperimentalVendor } from './vendor-priority.js';
 
 var getWs = null;
 var currentMateId = null;
@@ -152,19 +153,26 @@ export function showMateSidebar(mateId, mateData) {
     var vendorIcons = {
       claude: "/claude-code-avatar.png",
       codex: "/codex-avatar.png",
-      gemini: "/gemini-avatar.svg",
+      antigravity: "/antigravity-avatar.png",
       opencode: "/opencode-avatar.svg",
+      kimi: "/kimi-avatar.svg",
+      grok: "/grok-avatar.svg",
+      copilot: "/copilot-avatar.svg",
+      qwen: "/qwen-avatar.svg",
+      junie: "/junie-avatar.svg",
       kiro: "/kiro-avatar.svg",
     };
-    var vendorNames = { claude: "Claude Code", codex: "Codex", gemini: "Gemini CLI", opencode: "OpenCode", kiro: "Kiro CLI" };
-    var vendorKeys = ["claude", "codex", "gemini", "opencode", "kiro"];
+    var vendorNames = { claude: "Claude Code", codex: "Codex", grok: "Grok Build", kimi: "Kimi Code", copilot: "GitHub Copilot CLI", qwen: "Qwen Code", junie: "Junie CLI", antigravity: "Antigravity CLI", opencode: "OpenCode", kiro: "Kiro CLI" };
+    var vendorKeys = ["claude", "codex", "grok", "kimi", "copilot", "qwen", "junie", "antigravity", "opencode", "kiro"];
     mateVendorWrap.innerHTML = "";
     for (var vi = 0; vi < vendorKeys.length; vi++) {
       var vk = vendorKeys[vi];
       var vBtn = document.createElement("button");
       vBtn.className = "mate-vendor-btn" + (vk === mateVendor ? " active" : "");
+      if (isExperimentalVendor(vk)) vBtn.classList.add("experimental");
       if (available.indexOf(vk) === -1) vBtn.classList.add("disabled");
       vBtn.dataset.vendor = vk;
+      vBtn.title = vendorNames[vk] + (isExperimentalVendor(vk) ? " · Experimental integration; not yet validated through direct use testing" : "");
       vBtn.innerHTML = '<img src="' + vendorIcons[vk] + '" class="mate-vendor-icon" alt="' + vendorNames[vk] + '"><span class="mate-vendor-label">' + vendorNames[vk] + '</span>';
       vBtn.addEventListener("click", function() {
         var v = this.dataset.vendor;

package/lib/public/modules/notifications.js

@@ -72,6 +72,7 @@ export function initNotifications(_ctx) {
   if (window.visualViewport) {
     var layout = $("layout");
     var mobileTabBar = document.getElementById("mobile-tab-bar");
+    var keyboardWasOpen = false;
     // Capture initial viewport height before any keyboard interaction.
     // In iOS PWA standalone mode, window.innerHeight shrinks when the
     // keyboard opens, so we need a stable baseline for comparison.
@@ -86,7 +87,12 @@ export function initNotifications(_ctx) {
       // Toggle class so CSS can remove the tab-bar bottom padding while keyboard is up
       var keyboardOpen = vv.height < stableViewportHeight - 100;
       document.body.classList.toggle("keyboard-open", keyboardOpen);
-      if (!keyboardOpen) ctx.scrollToBottom();
+      if (keyboardOpen && !keyboardWasOpen && ctx.forceScrollToBottom) {
+        requestAnimationFrame(function() { ctx.forceScrollToBottom(); });
+      } else if (!keyboardOpen) {
+        ctx.scrollToBottom();
+      }
+      keyboardWasOpen = keyboardOpen;
       // Hide tab bar when software keyboard is open
       if (mobileTabBar) {
         if (keyboardOpen) {

package/lib/public/modules/pane-bridge.js

@@ -5,6 +5,7 @@
 
 import { store } from './store.js';
 import { applyContextView, getContextView } from './app-panels.js';
+import { forceExternalLinkToNewTab } from './pane-links.js';
 
 var panelOpen = false;
 
@@ -29,9 +30,19 @@ function togglePaneContextPanel() {
   applyContextView(panelOpen ? "panel" : "off");
 }
 
+function preparePaneLink(event) {
+  var target = event.target;
+  if (!target || typeof target.closest !== "function") return;
+  var anchor = target.closest("a[href]");
+  if (!anchor || anchor.hasAttribute("download")) return;
+  forceExternalLinkToNewTab(anchor, window.location.href);
+}
+
 export function initPaneBridge() {
   if (!store.get('paneMode')) return;
   panelOpen = getContextView() === "panel";
+  document.addEventListener("click", preparePaneLink, true);
+  document.addEventListener("auxclick", preparePaneLink, true);
   window.addEventListener("message", function (event) {
     if (event.origin !== window.location.origin) return;
     var msg = event.data;

package/lib/public/modules/pane-links.js

@@ -0,0 +1,23 @@
+export function isExternalWebLink(href, currentHref) {
+  if (!href) return false;
+  try {
+    var url = new URL(href, currentHref);
+    var currentUrl = new URL(currentHref);
+    if (url.protocol !== "http:" && url.protocol !== "https:") return false;
+    return url.origin !== currentUrl.origin;
+  } catch (err) {
+    return false;
+  }
+}
+
+export function forceExternalLinkToNewTab(anchor, currentHref) {
+  if (!anchor || !isExternalWebLink(anchor.href, currentHref)) return false;
+
+  var rel = (anchor.getAttribute("rel") || "").split(/\s+/).filter(Boolean);
+  if (rel.indexOf("noopener") === -1) rel.push("noopener");
+  if (rel.indexOf("noreferrer") === -1) rel.push("noreferrer");
+
+  anchor.setAttribute("target", "_blank");
+  anchor.setAttribute("rel", rel.join(" "));
+  return true;
+}

package/lib/public/modules/project-switcher.js

@@ -19,6 +19,7 @@ import { getCachedProjects, switchProject } from './app-projects.js';
 import { openDm } from './app-dm.js';
 import { mateAvatarUrl } from './avatar.js';
 import { parseEmojis } from './markdown.js';
+import { isExternalWorktree, externalWorktreeTooltip, appendExternalWorktreeBadge } from './worktree-location.js';
 
 var _projectMru = [];   // project slugs, most recent first
 var _mateMru = [];      // mate ids (mate_XXX), most recent first
@@ -257,18 +258,16 @@ function buildProjectEntries() {
   // Keep natural (server-provided) order so the list looks the same
   // every time the switcher opens. MRU only drives initial highlight.
   return projects.map(function (p) {
-    // Worktrees can end up "outside project path" (parent workspace
-    // unmounted or moved); those are effectively unreachable from
-    // this session and shouldn't be switchable.
-    var unreachable = p.isWorktree && p.worktreeAccessible === false;
+    var external = isExternalWorktree(p);
     return {
       key: p.slug,
       title: p.title || p.project || p.slug,
       icon: p.icon || null,
       fallbackIcon: 'folder',
       isCurrent: p.slug === store.get('currentSlug'),
-      disabled: unreachable,
-      disabledReason: unreachable ? 'Outside project path' : null,
+      external: external,
+      disabled: false,
+      disabledReason: null,
     };
   });
 }
@@ -336,6 +335,7 @@ function buildEntryNode(entry, index) {
   item.className = 'cmd-palette-item project-switcher-item';
   if (entry.disabled) item.classList.add('disabled');
   if (entry.disabled && entry.disabledReason) item.title = entry.disabledReason;
+  if (entry.external) item.title = externalWorktreeTooltip(entry.title);
   item.dataset.index = String(index);
 
   var iconWrap = document.createElement('div');
@@ -353,6 +353,7 @@ function buildEntryNode(entry, index) {
     fallback.setAttribute('data-lucide', entry.fallbackIcon || 'folder');
     iconWrap.appendChild(fallback);
   }
+  if (entry.external) appendExternalWorktreeBadge(iconWrap, 'project-switcher-external-badge');
   item.appendChild(iconWrap);
 
   var body = document.createElement('div');

package/lib/public/modules/shell-command.js

@@ -0,0 +1,148 @@
+import { store } from './store.js';
+import { getWs } from './ws-ref.js';
+import { iconHtml, refreshIcons } from './icons.js';
+import { showToast } from './utils.js';
+
+var defaultPlaceholder = "";
+
+function getInput() {
+  return document.getElementById("input");
+}
+
+function appendToMessages(element) {
+  var messages = document.getElementById("messages");
+  if (!messages) return;
+  messages.appendChild(element);
+  requestAnimationFrame(function () { messages.scrollTop = messages.scrollHeight; });
+}
+
+function setMode(active) {
+  var input = getInput();
+  var button = document.getElementById("shell-command-btn");
+  var row = document.getElementById("input-row");
+  store.set({ shellCommandMode: active });
+  if (button) {
+    button.classList.toggle("active", active);
+    button.setAttribute("aria-pressed", active ? "true" : "false");
+  }
+  if (row) row.classList.toggle("shell-command-mode", active);
+  if (input) {
+    if (!defaultPlaceholder) defaultPlaceholder = input.placeholder;
+    input.placeholder = active ? "Run a shell command in this project…" : defaultPlaceholder;
+    input.focus();
+  }
+}
+
+export function isShellCommandMode() {
+  return !!store.get("shellCommandMode");
+}
+
+export function toggleShellCommandMode() {
+  if (store.get("shellCommandRunning")) return;
+  var target = store.get("dmTargetUser");
+  if (store.get("dmMode") && target && !target.isMate) {
+    showToast("Shell commands are available in agent sessions, not user DMs.", "error");
+    return;
+  }
+  setMode(!isShellCommandMode());
+}
+
+function renderPendingCommand(requestId, command) {
+  var card = document.createElement("div");
+  card.className = "shell-command-card running";
+  card.dataset.requestId = requestId;
+  card.innerHTML =
+    '<div class="shell-command-header">' +
+      '<span class="shell-command-icon">' + iconHtml("square-terminal") + '</span>' +
+      '<code></code><span class="shell-command-status">Running…</span>' +
+    '</div>' +
+    '<pre class="shell-command-output">Waiting for output…</pre>';
+  card.querySelector("code").textContent = "$ " + command;
+  appendToMessages(card);
+  refreshIcons();
+}
+
+export function submitShellCommand(command) {
+  command = String(command || "").trim();
+  if (!command || store.get("shellCommandRunning")) return false;
+  var ws = getWs();
+  if (!ws || ws.readyState !== 1) {
+    showToast("Not connected — command not run.", "error");
+    return false;
+  }
+
+  var requestId = "shell_" + Date.now() + "_" + Math.random().toString(36).slice(2, 9);
+  store.set({ shellCommandRunning: true, pendingShellCommandId: requestId });
+  var input = getInput();
+  if (input) {
+    input.disabled = true;
+    input.placeholder = "Running command…";
+  }
+  renderPendingCommand(requestId, command);
+  ws.send(JSON.stringify({ type: "shell_command", requestId: requestId, command: command }));
+  return true;
+}
+
+export function handleShellCommandResult(msg) {
+  var cards = document.querySelectorAll(".shell-command-card[data-request-id]");
+  var card = null;
+  for (var i = 0; i < cards.length; i++) {
+    if (cards[i].dataset.requestId === (msg.requestId || "")) {
+      card = cards[i];
+      break;
+    }
+  }
+  if (card) {
+    var status = card.querySelector(".shell-command-status");
+    var output = card.querySelector(".shell-command-output");
+    card.classList.remove("running");
+    if (msg.error) {
+      card.classList.add("error");
+      if (status) status.textContent = "Failed";
+      if (output) output.textContent = msg.error;
+    } else {
+      card.classList.toggle("error", msg.exitCode !== 0);
+      if (status) status.textContent = msg.timedOut ? "Timed out" : "Exit " + (msg.exitCode == null ? "—" : msg.exitCode);
+      if (output) output.textContent = msg.output || "(no output)";
+    }
+  }
+
+  store.set({ shellCommandRunning: false, pendingShellCommandId: null });
+  var input = getInput();
+  if (input) input.disabled = false;
+  if (msg.error) {
+    setMode(true);
+  } else {
+    setMode(false);
+  }
+  var messages = document.getElementById("messages");
+  if (messages) requestAnimationFrame(function () { messages.scrollTop = messages.scrollHeight; });
+}
+
+export function initShellCommand() {
+  var button = document.getElementById("shell-command-btn");
+  var mobileButton = document.getElementById("input-more-shell");
+  if (button) button.addEventListener("click", toggleShellCommandMode);
+  if (mobileButton) {
+    mobileButton.addEventListener("click", function () {
+      var sheet = document.getElementById("input-more-sheet");
+      if (sheet) {
+        sheet.classList.remove("open");
+        setTimeout(function () { sheet.classList.add("hidden"); }, 250);
+      }
+      toggleShellCommandMode();
+    });
+  }
+  store.subscribe(function (state, previous) {
+    if (previous.connected && !state.connected && state.shellCommandRunning) {
+      resetShellCommand();
+    }
+  });
+}
+
+export function resetShellCommand() {
+  store.set({ shellCommandMode: false, shellCommandRunning: false, pendingShellCommandId: null });
+  var input = getInput();
+  if (input) input.disabled = false;
+  setMode(false);
+}

package/lib/public/modules/sidebar-mates.js

@@ -460,7 +460,7 @@ export function renderUserStrip(allUsers, onlineUserIds, myUserId, dmFavorites,
       var vendorLabels = {
         claude: "Claude Code",
         codex: "OpenAI Codex",
-        gemini: "Gemini CLI",
+        antigravity: "Antigravity CLI",
         opencode: "OpenCode",
         kiro: "Kiro CLI",
       };

package/lib/public/modules/sidebar-mobile.js

@@ -15,7 +15,7 @@ import {
   resolveDefaultVendor,
   startNewSession
 } from './sidebar-sessions.js';
-import { VENDOR_AVATARS, VENDOR_NAMES, VENDOR_ORDER, VENDOR_HOMEPAGES } from './app-rendering.js';
+import { VENDOR_AVATARS, VENDOR_NAMES, VENDOR_ORDER, VENDOR_HOMEPAGES, isExperimentalVendor } from './app-rendering.js';
 import {
   getCachedProjectList,
   getCachedCurrentSlug,
@@ -754,6 +754,7 @@ function renderMobileSessionsInto(container) {
       if (vendor === mobileDefaultVendor) vBtn.classList.add("active");
       vBtn.innerHTML = '<img src="' + VENDOR_AVATARS[vendor] + '" class="mobile-session-new-icon" alt="">' +
         '<span>' + name + '</span>' +
+        (isExperimentalVendor(vendor) ? '<span class="vendor-experimental-badge" aria-label="Experimental integration" title="Experimental integration; not yet validated through direct use testing">🧪</span>' : '') +
         (isInstalled ? "" : '<span class="mobile-vendor-note">Not installed</span>');
       vBtn.addEventListener("click", function () {
         if (!isInstalled) {

package/lib/public/modules/sidebar-projects.js

@@ -13,6 +13,7 @@ import { showIconTooltip, hideIconTooltip, closeUserCtxMenu, getCurrentDmUserId
 import { switchProject, openAddProjectModal, getCachedProjects } from './app-projects.js';
 import { showHomeHub } from './app-home-hub.js';
 import { getPendingTuiAttention } from './app-notifications.js';
+import { isExternalWorktree, externalWorktreeTooltip, appendExternalWorktreeBadge } from './worktree-location.js';
 
 // --- Project state ---
 var cachedProjectList = [];
@@ -489,7 +490,7 @@ export function closeProjectCtxMenu() {
   }
 }
 
-function showIconCtxMenu(anchorEl, slug, name) {
+function showIconCtxMenu(anchorEl, slug, name, options) {
   closeProjectCtxMenu();
   if (closeUserCtxMenu) closeUserCtxMenu();
   closeEmojiPicker();
@@ -510,17 +511,19 @@ function showIconCtxMenu(anchorEl, slug, name) {
   menu.appendChild(iconItem);
 
   if (isWorktree) {
-    var removeWtItem = document.createElement("button");
-    removeWtItem.className = "project-ctx-item project-ctx-delete";
-    removeWtItem.innerHTML = iconHtml("trash-2") + " <span>Remove Worktree</span>";
-    removeWtItem.addEventListener("click", function (e) {
-      e.stopPropagation();
-      closeProjectCtxMenu();
-      if (getWs() && store.get('connected')) {
-        getWs().send(JSON.stringify({ type: "remove_project_check", slug: slug, name: name || slug }));
-      }
-    });
-    menu.appendChild(removeWtItem);
+    if (!options || options.canRemoveWorktree !== false) {
+      var removeWtItem = document.createElement("button");
+      removeWtItem.className = "project-ctx-item project-ctx-delete";
+      removeWtItem.innerHTML = iconHtml("trash-2") + " <span>Remove Worktree</span>";
+      removeWtItem.addEventListener("click", function (e) {
+        e.stopPropagation();
+        closeProjectCtxMenu();
+        if (getWs() && store.get('connected')) {
+          getWs().send(JSON.stringify({ type: "remove_project_check", slug: slug, name: name || slug }));
+        }
+      });
+      menu.appendChild(removeWtItem);
+    }
   } else {
     var wtItem = document.createElement("button");
     wtItem.className = "project-ctx-item";
@@ -1253,8 +1256,8 @@ export function renderIconStrip(projects, currentSlug) {
       (function (wt) {
         var wtEl = document.createElement("a");
         var isWtActive = wt.slug === currentSlug && !currentDmUserId;
-        var isAccessible = wt.worktreeAccessible !== false;
-        wtEl.className = "icon-strip-wt-item" + (isWtActive ? " active" : "") + (!isAccessible ? " wt-disabled" : "");
+        var isExternal = isExternalWorktree(wt);
+        wtEl.className = "icon-strip-wt-item" + (isWtActive ? " active" : "") + (isExternal ? " wt-external" : "");
         wtEl.href = "/p/" + wt.slug + "/";
         wtEl.dataset.slug = wt.slug;
 
@@ -1276,42 +1279,28 @@ export function renderIconStrip(projects, currentSlug) {
         if (wt.isProcessing) wtStatus.classList.add("processing");
         wtEl.appendChild(wtStatus);
 
-        var tooltipText = wt.name;
-        if (!isAccessible) {
-          tooltipText += " (outside project path, cannot be accessed)";
-        }
+        if (isExternal) appendExternalWorktreeBadge(wtEl, "worktree-external-badge");
+
+        var tooltipText = isExternal ? externalWorktreeTooltip(wt.name) : wt.name;
         (function (text, elem) {
           elem.addEventListener("mouseenter", function () { showIconTooltip(elem, text); });
           elem.addEventListener("mouseleave", hideIconTooltip);
         })(tooltipText, wtEl);
 
-        if (isAccessible) {
-          (function (slug) {
-            wtEl.addEventListener("click", function (e) {
-              e.preventDefault();
-              if (switchProject) switchProject(slug);
-            });
-          })(wt.slug);
-        } else {
+        (function (slug) {
           wtEl.addEventListener("click", function (e) {
             e.preventDefault();
+            if (switchProject) switchProject(slug);
           });
-        }
+        })(wt.slug);
 
-        if (isAccessible) {
-          (function (slug, name, elem) {
-            elem.addEventListener("contextmenu", function (e) {
-              e.preventDefault();
-              e.stopPropagation();
-              showIconCtxMenu(elem, slug, name);
-            });
-          })(wt.slug, wt.name, wtEl);
-        } else {
-          wtEl.addEventListener("contextmenu", function (e) {
+        (function (slug, name, elem, external) {
+          elem.addEventListener("contextmenu", function (e) {
             e.preventDefault();
             e.stopPropagation();
+            showIconCtxMenu(elem, slug, name, { canRemoveWorktree: !external });
           });
-        }
+        })(wt.slug, wt.name, wtEl, isExternal);
 
         if (!isWtActive && (wt.pendingPermissions > 0 || getPendingTuiAttention(wt.slug) > 0)) {
           wtEl.classList.add("has-pending-perm");
@@ -1360,7 +1349,10 @@ export function renderIconStrip(projects, currentSlug) {
 
   renderProjectList(projects, currentSlug);
 
-  try { lucide.createIcons({ nodes: [container] }); } catch (e) {}
+  var iconNodes = [container];
+  var mobileProjectList = document.getElementById("project-list");
+  if (mobileProjectList) iconNodes.push(mobileProjectList);
+  try { lucide.createIcons({ nodes: iconNodes }); } catch (e) {}
 }
 
 function renderProjectList(projects, currentSlug) {
@@ -1401,11 +1393,10 @@ function renderProjectList(projects, currentSlug) {
     var wtList = document.createElement("div");
     wtList.className = "mobile-folder-items";
     for (var wi = 0; wi < worktrees.length; wi++) {
-      var isAccessible = worktrees[wi].worktreeAccessible !== false;
       var wtItem = createMobileProjectItem(worktrees[wi], currentSlug, true);
-      if (!isAccessible) wtItem.classList.add("wt-disabled");
-      if (!isAccessible) {
-        wtItem.addEventListener("click", function (e) { e.preventDefault(); e.stopPropagation(); });
+      if (isExternalWorktree(worktrees[wi])) {
+        wtItem.classList.add("wt-external");
+        appendExternalWorktreeBadge(wtItem, "mobile-worktree-external-badge");
       }
       wtList.appendChild(wtItem);
     }