clay-server 3.3.2-beta.3 → 3.4.0-beta.2

package/lib/project-file-watch.js

@@ -21,12 +21,22 @@ function attachFileWatch(ctx) {
   // one browser tab silently replace another tab's live preview subscription.
   var fileWatchers = new Map();
 
+  function settleFileWatchReady(entry, ready) {
+    if (!entry || !entry.resolveReady) return;
+    var resolve = entry.resolveReady;
+    entry.resolveReady = null;
+    resolve(ready);
+  }
+
   function closeFileWatch(key) {
     var entry = fileWatchers.get(key);
     if (!entry) return;
     clearTimeout(entry.debounce);
+    if (entry.reconcile) clearImmediate(entry.reconcile);
+    if (entry.pollTimer) clearInterval(entry.pollTimer);
     try { entry.watcher.close(); } catch (e) {}
     fileWatchers.delete(key);
+    settleFileWatchReady(entry, false);
   }
 
   function sendFileChanged(client, message) {
@@ -37,6 +47,36 @@ function attachFileWatch(ctx) {
     }
   }
 
+  function readFileSnapshot(absPath) {
+    var stat = fs.statSync(absPath);
+    var ext = path.extname(absPath).toLowerCase();
+    if (stat.size > FS_MAX_SIZE || BINARY_EXTS.has(ext)) return null;
+    return { content: fs.readFileSync(absPath, "utf8"), size: stat.size };
+  }
+
+  function publishFileChanged(key, client, relPath, absPath) {
+    var latest = fileWatchers.get(key);
+    if (!latest || latest.relPath !== relPath) return;
+    try {
+      var snapshot = readFileSnapshot(absPath);
+      if (!snapshot) return;
+      if (latest.hasSnapshot && latest.content === snapshot.content && latest.size === snapshot.size) return;
+      latest.hasSnapshot = true;
+      latest.content = snapshot.content;
+      latest.size = snapshot.size;
+      sendFileChanged(client, {
+        type: "fs_file_changed",
+        path: relPath,
+        content: snapshot.content,
+        size: snapshot.size,
+      });
+    } catch (e) {
+      // Atomic saves can briefly remove the destination path between rename
+      // events. Keep the parent watcher alive for the next event.
+      if (e.code !== "ENOENT") closeFileWatch(key);
+    }
+  }
+
   function startFileWatch(client, relPath) {
     // Preserve the old single-argument API for callers outside the websocket
     // file browser. They share one legacy subscription.
@@ -45,10 +85,10 @@ function attachFileWatch(ctx) {
       client = null;
     }
     var absPath = safePath(cwd, relPath);
-    if (!absPath) return;
+    if (!absPath) return Promise.resolve(false);
     var key = client || "_legacy";
     var existing = fileWatchers.get(key);
-    if (existing && existing.relPath === relPath) return;
+    if (existing && existing.relPath === relPath) return existing.ready;
     closeFileWatch(key);
 
     // Watch the parent directory rather than the file inode. Editors and agent
@@ -56,6 +96,8 @@ function attachFileWatch(ctx) {
     // misses later edits even though the path still exists.
     var parentPath = path.dirname(absPath);
     var baseName = path.basename(absPath);
+    var initialSnapshot = null;
+    try { initialSnapshot = readFileSnapshot(absPath); } catch (e) {}
     try {
       var watcher = fs.watch(parentPath, function (eventType, filename) {
         if (filename && String(filename) !== baseName) return;
@@ -63,25 +105,44 @@ function attachFileWatch(ctx) {
         if (!active || active.relPath !== relPath) return;
         clearTimeout(active.debounce);
         active.debounce = setTimeout(function () {
-          var latest = fileWatchers.get(key);
-          if (!latest || latest.relPath !== relPath) return;
-          try {
-            var stat = fs.statSync(absPath);
-            var ext = path.extname(absPath).toLowerCase();
-            if (stat.size > FS_MAX_SIZE || BINARY_EXTS.has(ext)) return;
-            var content = fs.readFileSync(absPath, "utf8");
-            sendFileChanged(client, { type: "fs_file_changed", path: relPath, content: content, size: stat.size });
-          } catch (e) {
-            // Atomic saves can briefly remove the destination path between
-            // rename events. Keep the parent watcher alive for the next event.
-            if (e.code !== "ENOENT") closeFileWatch(key);
-          }
+          publishFileChanged(key, client, relPath, absPath);
         }, 200);
       });
-      fileWatchers.set(key, { watcher: watcher, relPath: relPath, debounce: null });
+      var resolveReady = null;
+      var ready = new Promise(function (resolve) { resolveReady = resolve; });
+      var entry = {
+        watcher: watcher,
+        relPath: relPath,
+        debounce: null,
+        reconcile: null,
+        pollTimer: null,
+        ready: ready,
+        resolveReady: resolveReady,
+        hasSnapshot: !!initialSnapshot,
+        content: initialSnapshot ? initialSnapshot.content : null,
+        size: initialSnapshot ? initialSnapshot.size : null,
+      };
+      fileWatchers.set(key, entry);
+      // Directory events are the low-latency path, but macOS can coalesce or
+      // drop them under load. Periodic content reconciliation is the source of
+      // truth and also survives atomic replacements with identical metadata.
+      entry.pollTimer = setInterval(function () {
+        publishFileChanged(key, client, relPath, absPath);
+      }, 1000);
+      // fs.watch has no readiness event. Reconcile once on the next event-loop
+      // turn so a change between the initial read and native watcher activation
+      // cannot leave the browser showing stale content.
+      entry.reconcile = setImmediate(function () {
+        var active = fileWatchers.get(key);
+        if (active) active.reconcile = null;
+        publishFileChanged(key, client, relPath, absPath);
+        if (fileWatchers.get(key) === entry) settleFileWatchReady(entry, true);
+      });
       watcher.on("error", function () { closeFileWatch(key); });
+      return ready;
     } catch (e) {
       closeFileWatch(key);
+      return Promise.resolve(false);
     }
   }
 

package/lib/project-shell-command.js

@@ -0,0 +1,160 @@
+var { spawn } = require("child_process");
+var { buildUserEnv } = require("./build-user-env");
+var { wrapSpawnAsUser } = require("./os-users");
+
+var MAX_COMMAND_LENGTH = 16 * 1024;
+var MAX_OUTPUT_LENGTH = 64 * 1024;
+var COMMAND_TIMEOUT_MS = 30 * 1000;
+
+function stripTerminalCodes(value) {
+  return String(value || "")
+    .replace(/\x1b\][^\x07]*(?:\x07|\x1b\\)/g, "")
+    .replace(/\x1b\[[0-?]*[ -\/]*[@-~]/g, "")
+    .replace(/\r/g, "");
+}
+
+function attachShellCommand(ctx) {
+  var runningBySocket = new WeakMap();
+
+  function sendResult(ws, data) {
+    ctx.sendTo(ws, Object.assign({ type: "shell_command_result" }, data));
+  }
+
+  function handleShellCommand(ws, msg) {
+    if (msg.type !== "shell_command") return false;
+
+    var requestId = typeof msg.requestId === "string" ? msg.requestId.slice(0, 100) : "";
+    var command = typeof msg.command === "string" ? msg.command.trim() : "";
+    if (!requestId || !command) {
+      sendResult(ws, { requestId: requestId, error: "Enter a command to run." });
+      return true;
+    }
+    if (command.length > MAX_COMMAND_LENGTH) {
+      sendResult(ws, { requestId: requestId, error: "Command is too long." });
+      return true;
+    }
+
+    if (ws._clayUser) {
+      var permissions = ctx.usersModule.getEffectivePermissions(ws._clayUser, ctx.osUsers);
+      if (!permissions.terminal) {
+        sendResult(ws, { requestId: requestId, error: "Terminal access is not permitted." });
+        return true;
+      }
+    }
+    if (runningBySocket.get(ws)) {
+      sendResult(ws, { requestId: requestId, error: "Another shell command is still running." });
+      return true;
+    }
+
+    var session = ctx.getSessionForWs(ws);
+    if (!session) {
+      sendResult(ws, { requestId: requestId, error: "No active session." });
+      return true;
+    }
+
+    var osUserInfo = ctx.getOsUserInfoForWs(ws);
+    var shell = (osUserInfo && osUserInfo.shell)
+      || process.env.SHELL
+      || (process.platform === "win32" ? process.env.COMSPEC || "cmd.exe" : "/bin/sh");
+    var args = process.platform === "win32" ? ["/d", "/s", "/c", command] : ["-lc", command];
+    var spawnOptions = {
+      cwd: ctx.cwd,
+      env: buildUserEnv(osUserInfo),
+      stdio: ["ignore", "pipe", "pipe"],
+    };
+    if (osUserInfo) {
+      spawnOptions.uid = osUserInfo.uid;
+      spawnOptions.gid = osUserInfo.gid;
+    }
+
+    var wrapped = wrapSpawnAsUser(shell, args, spawnOptions);
+    var child;
+    try {
+      child = spawn(wrapped.command, wrapped.args, wrapped.options);
+    } catch (e) {
+      sendResult(ws, { requestId: requestId, error: e.message || "Failed to start command." });
+      return true;
+    }
+
+    runningBySocket.set(ws, child);
+    var chunks = [];
+    var outputLength = 0;
+    var truncated = false;
+    var timedOut = false;
+    var finished = false;
+
+    function collect(data) {
+      if (outputLength >= MAX_OUTPUT_LENGTH) {
+        truncated = true;
+        return;
+      }
+      var text = data.toString("utf8");
+      var remaining = MAX_OUTPUT_LENGTH - outputLength;
+      if (text.length > remaining) {
+        text = text.slice(0, remaining);
+        truncated = true;
+      }
+      chunks.push(text);
+      outputLength += text.length;
+    }
+
+    child.stdout.on("data", collect);
+    child.stderr.on("data", collect);
+
+    var timer = setTimeout(function () {
+      timedOut = true;
+      try { child.kill("SIGTERM"); } catch (e) {}
+      setTimeout(function () {
+        if (!finished) {
+          try { child.kill("SIGKILL"); } catch (e) {}
+        }
+      }, 1000).unref();
+    }, COMMAND_TIMEOUT_MS);
+    timer.unref();
+
+    child.on("error", function (error) {
+      if (finished) return;
+      finished = true;
+      clearTimeout(timer);
+      runningBySocket.delete(ws);
+      sendResult(ws, { requestId: requestId, command: command, error: error.message || "Command failed." });
+    });
+
+    child.on("close", function (code, signal) {
+      if (finished) return;
+      finished = true;
+      clearTimeout(timer);
+      runningBySocket.delete(ws);
+
+      var output = stripTerminalCodes(chunks.join(""));
+      if (truncated) output += "\n… output truncated at 64 KB";
+      if (timedOut) output += (output ? "\n" : "") + "Command timed out after 30 seconds.";
+      var exitCode = typeof code === "number" ? code : null;
+      var context = [
+        "[Shell command executed by the user]",
+        "$ " + command,
+        output || "(no output)",
+        "[Exit code: " + (exitCode == null ? (signal || "unknown") : exitCode) + "]",
+      ].join("\n");
+      if (!session.pendingShellContexts) session.pendingShellContexts = [];
+      session.pendingShellContexts.push(context);
+
+      sendResult(ws, {
+        requestId: requestId,
+        sessionId: session.localId,
+        command: command,
+        output: output,
+        exitCode: exitCode,
+        signal: signal || null,
+        timedOut: timedOut,
+        truncated: truncated,
+      });
+    });
+
+    return true;
+  }
+
+  return { handleShellCommand: handleShellCommand };
+}
+
+module.exports = { attachShellCommand: attachShellCommand };

package/lib/project-user-message.js

@@ -374,6 +374,16 @@ function attachUserMessage(ctx) {
       fullText = mentionPrefix + "\n\n" + fullText;
     }
 
+    // Inject one-shot shell results captured from the composer command mode.
+    if (session.pendingShellContexts && session.pendingShellContexts.length > 0) {
+      var shellPrefix = session.pendingShellContexts.join("\n\n");
+      session.pendingShellContexts = [];
+      fullText = shellPrefix + "\n\n" + fullText;
+    }
+    if (msg.shellCommandResponse) {
+      fullText += "\n\n[Respond to the shell command result above now.]";
+    }
+
     // Inject active terminal context sources (delta only: send new output since last message)
     var TERM_CONTEXT_MAX = 8192; // 8KB max per terminal per message
     var TERM_HEAD_SIZE = 2048;   // keep first 2KB for error context

package/lib/project.js

@@ -28,6 +28,7 @@ var { attachKnowledge } = require("./project-knowledge");
 var { attachFilesystem } = require("./project-filesystem");
 var { attachSessions } = require("./project-sessions");
 var { attachUserMessage } = require("./project-user-message");
+var { attachShellCommand } = require("./project-shell-command");
 var { attachConnection } = require("./project-connection");
 var { attachMcp } = require("./project-mcp");
 var { createLocalMcp } = require("./mcp-local");
@@ -1176,6 +1177,9 @@ function createProjectContext(opts) {
     // --- Filesystem, settings, env (delegated to project-filesystem.js) ---
     if (_filesystem.handleFilesystemMessage(ws, msg)) return;
 
+    // --- Shell command context ---
+    if (_shellCommand.handleShellCommand(ws, msg)) return;
+
     // --- Notes, terminals, context, user message (delegated to project-user-message.js) ---
     if (_userMessage.handleUserMessage(ws, msg)) return;
   }
@@ -1424,6 +1428,15 @@ function createProjectContext(opts) {
     _email: _email,
   });
 
+  var _shellCommand = attachShellCommand({
+    cwd: cwd,
+    osUsers: osUsers,
+    usersModule: usersModule,
+    sendTo: sendTo,
+    getSessionForWs: getSessionForWs,
+    getOsUserInfoForWs: getOsUserInfoForWs,
+  });
+
   // --- Filesystem handler (delegated to project-filesystem.js) ---
   var _filesystem = attachFilesystem({
     cwd: cwd,

package/lib/public/app.js

@@ -51,6 +51,7 @@ import { initTooltips, registerTooltip } from './modules/tooltip.js';
 import { initMateWizard, openMateWizard, closeMateWizard, handleMateCreated } from './modules/mate-wizard.js';
 import { initCommandPalette, handlePaletteSessionSwitch, setPaletteVersion } from './modules/command-palette.js';
 import { initLongPress } from './modules/longpress.js';
+import { initShellCommand } from './modules/shell-command.js';
 import { initConnection, connect as _connConnect, setStatus as _connSetStatus, scheduleReconnect as _connScheduleReconnect, cancelReconnect as _connCancelReconnect } from './modules/app-connection.js';
 import { processMessage as _msgProcessMessage } from './modules/app-messages.js';
 import { getWs as _getWsRef, setWs as _setWsRef } from './modules/ws-ref.js';
@@ -308,6 +309,9 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     returningFromMateDm: false,
     pendingMateInterview: null,
     pendingTermCommand: null,
+    shellCommandMode: false,
+    shellCommandRunning: false,
+    pendingShellCommandId: null,
     mateProjectSlug: null,
     myUserId: null,
     isMultiUserMode: false,
@@ -793,6 +797,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     },
   });
 
+  initShellCommand();
+
   // --- @Mention module ---
   initMention({
     get ws() { return _getWsRef(); },
@@ -879,6 +885,10 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
         if (termBtn) termBtn.style.display = "none";
         var termSideBtn = document.getElementById("terminal-sidebar-btn");
         if (termSideBtn) termSideBtn.style.display = "none";
+        var shellCommandBtn = document.getElementById("shell-command-btn");
+        if (shellCommandBtn) shellCommandBtn.style.display = "none";
+        var mobileShellCommandBtn = document.getElementById("input-more-shell");
+        if (mobileShellCommandBtn) mobileShellCommandBtn.style.display = "none";
       }
       if (!_perms.fileBrowser) {
         var fbBtn = document.getElementById("file-browser-btn");

package/lib/public/css/input.css

@@ -799,6 +799,10 @@
 .vendor-toggle-label {
   pointer-events: none;
 }
+@media (min-width: 901px) {
+  .vendor-toggle-btn:not(.active) .vendor-toggle-label { display: none; }
+  .vendor-toggle-btn:not(.active) { padding: 0 8px; }
+}
 @media (max-width: 900px) {
   .vendor-toggle-label { display: none; }
   .vendor-toggle-btn { padding: 0 8px; }
@@ -822,6 +826,7 @@
 
 #attach-file-btn,
 #attach-image-btn,
+#shell-command-btn,
 #schedule-btn,
 #input-more-btn {
   width: 36px;
@@ -840,14 +845,76 @@
 
 #attach-file-btn .lucide,
 #attach-image-btn .lucide,
+#shell-command-btn .lucide,
 #schedule-btn .lucide,
 #input-more-btn .lucide { width: 20px; height: 20px; flex-shrink: 0; }
 
 #attach-file-btn:hover,
 #attach-image-btn:hover,
+#shell-command-btn:hover,
 #schedule-btn:hover,
 #input-more-btn:hover { background: rgba(var(--overlay-rgb), 0.06); color: var(--text); }
 
+#shell-command-btn.active {
+  background: var(--accent-12);
+  color: var(--accent);
+}
+
+#input-row.shell-command-mode {
+  box-shadow: 0 0 0 1px var(--accent);
+}
+
+#input-row.shell-command-mode #input {
+  font-family: var(--font-mono, "SFMono-Regular", Consolas, monospace);
+}
+
+.shell-command-card {
+  width: min(760px, calc(100% - 24px));
+  margin: 10px auto;
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  background: var(--input-bg);
+  overflow: hidden;
+}
+
+.shell-command-card.error { border-color: rgba(239, 68, 68, 0.45); }
+
+.shell-command-header {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 9px 12px;
+  border-bottom: 1px solid var(--border);
+  color: var(--text-secondary);
+  font-size: 12px;
+}
+
+.shell-command-header code {
+  min-width: 0;
+  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  color: var(--text);
+}
+
+.shell-command-icon { display: inline-flex; }
+.shell-command-icon .lucide { width: 16px; height: 16px; }
+.shell-command-status { flex-shrink: 0; color: var(--text-muted); }
+
+.shell-command-card.running .shell-command-status { color: var(--accent); }
+
+.shell-command-output {
+  max-height: 320px;
+  margin: 0;
+  padding: 12px;
+  overflow: auto;
+  color: var(--text-secondary);
+  font: 12px/1.5 var(--font-mono, "SFMono-Regular", Consolas, monospace);
+  white-space: pre-wrap;
+  word-break: break-word;
+}
+
 #ask-mate-btn {
   width: 36px;
   height: 36px;

package/lib/public/css/mates.css

@@ -682,6 +682,7 @@
 .mate-vendor-label {
   pointer-events: none;
 }
+.mate-vendor-btn:not(.active) .mate-vendor-label { display: none; }
 
 /* Collapse button inside mate header: white to match header style */
 .mate-sidebar-header .sidebar-collapse-btn {

package/lib/public/gemini-avatar.svg

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" role="img" aria-label="Gemini CLI">
+  <defs>
+    <linearGradient id="g" x1="8" y1="56" x2="56" y2="8" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#4f7cff"/>
+      <stop offset="0.5" stop-color="#9b5cff"/>
+      <stop offset="1" stop-color="#ff65b3"/>
+    </linearGradient>
+  </defs>
+  <rect width="64" height="64" rx="16" fill="#10131d"/>
+  <path d="M32 8c2.3 14.1 9.9 21.7 24 24-14.1 2.3-21.7 9.9-24 24-2.3-14.1-9.9-21.7-24-24 14.1-2.3 21.7-9.9 24-24Z" fill="url(#g)"/>
+</svg>

package/lib/public/index.html

@@ -505,6 +505,7 @@
               <button id="input-more-btn" type="button" aria-label="More options" title="More options" class="mobile-only"><i data-lucide="plus"></i></button>
               <button id="attach-file-btn" type="button" aria-label="Attach file" title="Attach file" class="desktop-only"><i data-lucide="paperclip"></i></button>
               <button id="attach-image-btn" type="button" aria-label="Attach image" title="Attach image" class="desktop-only"><i data-lucide="image"></i></button>
+              <button id="shell-command-btn" type="button" aria-label="Run shell command" aria-pressed="false" title="Run a shell command and add its output to the next agent message" class="desktop-only"><i data-lucide="square-terminal"></i></button>
               <button id="stt-btn" type="button" aria-label="Voice input" title="Voice input"><i data-lucide="mic"></i></button>
               <button id="schedule-btn" type="button" aria-label="Schedule message" title="Schedule message"><i data-lucide="clock"></i></button>
               <button id="ask-mate-btn" type="button" aria-label="Ask Mate" title="Ask a Mate for advice on this session"><i data-lucide="at-sign"></i></button>
@@ -527,6 +528,14 @@
                   <img src="/codex-avatar.png" class="vendor-toggle-icon" alt="Codex">
                   <span class="vendor-toggle-label">Codex</span>
                 </button>
+                <button id="vendor-btn-gemini" class="vendor-toggle-btn" data-vendor="gemini">
+                  <img src="/gemini-avatar.svg" class="vendor-toggle-icon" alt="Gemini">
+                  <span class="vendor-toggle-label">Gemini CLI</span>
+                </button>
+                <button id="vendor-btn-opencode" class="vendor-toggle-btn" data-vendor="opencode">
+                  <img src="/opencode-avatar.svg" class="vendor-toggle-icon" alt="OpenCode">
+                  <span class="vendor-toggle-label">OpenCode</span>
+                </button>
                 <button id="vendor-btn-kiro" class="vendor-toggle-btn" data-vendor="kiro">
                   <img src="/kiro-avatar.svg" class="vendor-toggle-icon" alt="Kiro">
                   <span class="vendor-toggle-label">Kiro CLI</span>
@@ -607,6 +616,10 @@
           <i data-lucide="image"></i>
           <span>Image</span>
         </button>
+        <button class="input-more-action" id="input-more-shell">
+          <i data-lucide="square-terminal"></i>
+          <span>Shell command</span>
+        </button>
       </div>
       <div class="input-more-divider"></div>
       <div class="input-more-section-label">

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

@@ -22,7 +22,7 @@ import { handleFindInSessionResults } from './session-search.js';
 import { syncPaneTitles, maybeRestoreSplitGroup, openGroup } from './split-view.js';
 import { showPairDialog, handlePairCreated, handleSplitDelegation, showWorkerDelegationNotice, hideWorkerDelegationNotice } from './split-pair-ui.js';
 import { renderWorkerProposal, updateWorkerProposal } from './worker-proposal.js';
-import { handleInputSync, autoResize, builtinCommands, setScheduleBtnDisabled } from './input.js';
+import { handleInputSync, autoResize, builtinCommands, setScheduleBtnDisabled, sendShellResultToAgent } from './input.js';
 import { startThinking, appendThinking, stopThinking, resetThinkingGroup, createToolItem, updateToolExecuting, updateToolResult, markAllToolsDone, closeToolGroup, removeToolFromGroup, resetToolState, getTools, getPlanContent, setPlanContent, renderPlanBanner, renderPlanCard, getTodoTools, handleTodoWrite, handleTaskCreate, handleTaskUpdate, applyDeadSessionTodoCompaction, isPlanFilePath, enableMainInput, addTurnMeta, updateSubagentActivity, addSubagentToolEntry, markSubagentDone, initSubagentStop, updateSubagentProgress, updateSubagentTaskStatus, renderAskUserQuestion, markAskUserAnswered, renderPermissionRequest, markPermissionCancelled, markPermissionResolved, renderElicitationRequest, markElicitationResolved, renderUserDialogRequest, markUserDialogResolved, updateThinkingTokens } from './tools.js';
 import { showDoneNotification, playDoneSound, isNotifAlertEnabled, isNotifSoundEnabled } from './notifications.js';
 import { handleFsList, handleFsRead, handleFileChanged, handleDirChanged, handleFileHistory, handleGitDiff, handleFileAt, refreshIfOpen, getPendingNavigate, handleFsSearch, presentMarkdownEdit } from './filebrowser.js';
@@ -42,6 +42,7 @@ import { checkAdminAccess } from './admin.js';
 import { mateAvatarUrl } from './avatar.js';
 import { showImageModal, sendExtensionCommand, handleMcpToolCallMessage } from './app-misc.js';
 import { handleMcpServersState } from './mcp-ui.js';
+import { handleShellCommandResult } from './shell-command.js';
 import { handleLoopRegistryUpdated, handleScheduleRunStarted, handleScheduleRunFinished, handleLoopScheduled, isSchedulerOpen, enterCraftingMode, exitCraftingMode, handleLoopRegistryFiles } from './scheduler.js';
 
 // --- App module imports ---
@@ -1209,6 +1210,15 @@ export function processMessage(msg) {
         addConflictMessage(msg);
         break;
 
+      case "session_writer_conflict":
+        removeMatePreThinking();
+        setActivity(null);
+        stopThinking();
+        markAllToolsDone();
+        closeToolGroup();
+        addSystemMessage(msg.text || "This session is already open in another process.", true);
+        break;
+
       case "context_overflow":
         removeMatePreThinking();
         setActivity(null);
@@ -1371,6 +1381,11 @@ export function processMessage(msg) {
         updateTerminalList(msg.terminals);
         break;
 
+      case "shell_command_result":
+        handleShellCommandResult(msg);
+        if (!msg.error) sendShellResultToAgent(msg);
+        break;
+
       case "context_sources_state":
         handleContextSourcesState(msg);
         break;

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

@@ -89,6 +89,8 @@ var EFFORT_LEVELS = ["low", "medium", "high", "xhigh", "max"];
 var EFFORT_LEVELS_BY_VENDOR = {
   claude: ["low", "medium", "high", "xhigh", "max"],
   codex: ["minimal", "low", "medium", "high", "xhigh"],
+  gemini: [],
+  opencode: [],
   kiro: ["low", "medium", "high", "xhigh", "max"],
 };
 var THINKING_OPTIONS = ["disabled", "adaptive", "budget"];
@@ -441,8 +443,16 @@ export function initPanels() {
   var vendorToggleWrap = $("vendor-toggle-wrap");
   var vendorBtnClaude = $("vendor-btn-claude");
   var vendorBtnCodex = $("vendor-btn-codex");
+  var vendorBtnGemini = $("vendor-btn-gemini");
+  var vendorBtnOpenCode = $("vendor-btn-opencode");
   var vendorBtnKiro = $("vendor-btn-kiro");
-  var vendorBtns = { claude: vendorBtnClaude, codex: vendorBtnCodex, kiro: vendorBtnKiro };
+  var vendorBtns = {
+    claude: vendorBtnClaude,
+    codex: vendorBtnCodex,
+    gemini: vendorBtnGemini,
+    opencode: vendorBtnOpenCode,
+    kiro: vendorBtnKiro,
+  };
 
   function updateVendorToggle() {
     var installed = store.get('installedVendors') || [];
@@ -471,6 +481,8 @@ export function initPanels() {
 
   if (vendorBtnClaude) vendorBtnClaude.addEventListener("click", function() { onVendorClick("claude"); });
   if (vendorBtnCodex) vendorBtnCodex.addEventListener("click", function() { onVendorClick("codex"); });
+  if (vendorBtnGemini) vendorBtnGemini.addEventListener("click", function() { onVendorClick("gemini"); });
+  if (vendorBtnOpenCode) vendorBtnOpenCode.addEventListener("click", function() { onVendorClick("opencode"); });
   if (vendorBtnKiro) vendorBtnKiro.addEventListener("click", function() { onVendorClick("kiro"); });
 
   // --- Reactive UI sync ---

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

@@ -24,6 +24,7 @@ import { isSchedulerOpen, closeScheduler, resetScheduler } from './scheduler.js'
 import { connect, cancelReconnect, setStatus } from './app-connection.js';
 import { setTurnCounter, setPrependAnchor, setActivityEl, setIsUserScrolledUp, hideSuggestionChips } from './app-rendering.js';
 import { resetToolState, enableMainInput, resetTurnMetaCost } from './tools.js';
+import { resetShellCommand } from './shell-command.js';
 import { clearPendingImages } from './input.js';
 import { clearAllMentionActive } from './sidebar-mates.js';
 import { setRewindMode } from './rewind.js';
@@ -368,6 +369,7 @@ export function resetClientState() {
   store.set({ currentFullText: "" });
   resetToolState();
   clearPendingImages();
+  resetShellCommand();
   clearAllMentionActive();
   setActivityEl(null);
   store.set({ processing: false });

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

@@ -19,21 +19,27 @@ import { getScheduledMsgEl } from './app-rate-limit.js';
 export var VENDOR_AVATARS = {
   claude: "/claude-code-avatar.png",
   codex: "/codex-avatar.png",
+  gemini: "/gemini-avatar.svg",
+  opencode: "/opencode-avatar.svg",
   kiro: "/kiro-avatar.svg",
 };
 export var VENDOR_NAMES = {
   claude: "Claude Code",
   codex: "Codex",
+  gemini: "Gemini CLI",
+  opencode: "OpenCode",
   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", "kiro"];
+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",
+  opencode: "https://opencode.ai/",
   kiro: "https://kiro.dev/",
 };
 var NEW_MSG_BTN_DEFAULT = "\u2193 Latest";