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

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

@@ -12,7 +12,7 @@ import { dismissOverlayPanels, closeSidebar, updatePageTitle, spawnDustParticles
 import { showConfirm } from './app-misc.js';
 import { getUpcomingSchedules } from './scheduler.js';
 import { refreshMobileChatSheet } from './sidebar-mobile.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 { openGroup, separateGroup } from './split-view.js';
 import { groupedSessionIds } from './split-group-helpers.js';
 import { openPairDialog } from './split-pair-ui.js';
@@ -299,13 +299,10 @@ function appendSessionCloseButton(el, session) {
   el.appendChild(closeBtn);
 }
 
-// Resolve the vendor the "New session" button should launch: the project's
-// last-used vendor when its CLI is still installed, else the first installed
-// vendor, else Claude (so the button always has a sane label to render).
+// Resolve the vendor the "New session" button should launch from the stable
+// installed-vendor priority (Claude, then Codex, then the remaining vendors).
 export function resolveDefaultVendor() {
   var installed = store.get('installedVendors') || [];
-  var last = store.get('lastVendor') || "";
-  if (last && installed.indexOf(last) !== -1) return last;
   for (var i = 0; i < VENDOR_ORDER.length; i++) {
     if (installed.indexOf(VENDOR_ORDER[i]) !== -1) return VENDOR_ORDER[i];
   }
@@ -330,6 +327,7 @@ export function startNewSession(vendor, extra) {
     currentModel: "",
     currentModels: [],
     vendorSelectionLocked: true,
+    sessionVendorBound: true,
   });
 }
 
@@ -396,10 +394,12 @@ function showNewSessionMenu(anchorBtn, defaultVendor) {
       item.type = "button";
       item.innerHTML = '<img src="' + VENDOR_AVATARS[vendor] + '" class="session-top-action-icon" alt="">' +
         '<span class="session-new-vendor-name">' + 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="session-new-vendor-note">Not installed</span>' + iconHtml("external-link"));
       item.title = isInstalled
         ? "New " + name + " session"
         : name + " is not installed - open " + VENDOR_HOMEPAGES[vendor];
+      if (isExperimentalVendor(vendor)) item.title += " · Experimental integration; not yet validated through direct use testing";
       item.addEventListener("click", function (e) {
         e.stopPropagation();
         closeSessionCtxMenu();

package/lib/public/modules/split-pair-ui.js

@@ -1,6 +1,6 @@
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
-import { VENDOR_AVATARS, VENDOR_NAMES, VENDOR_ORDER } from './app-rendering.js';
+import { VENDOR_AVATARS, VENDOR_NAMES, VENDOR_ORDER, isExperimentalVendor } from './app-rendering.js';
 import { effortLevelsFor, effortDisplayName } from './app-panels.js';
 import { showToast } from './utils.js';
 
@@ -46,7 +46,8 @@ function buildVendorSelect(installed, preferred) {
     if (installed.indexOf(VENDOR_ORDER[i]) === -1) continue;
     var option = document.createElement("option");
     option.value = VENDOR_ORDER[i];
-    option.textContent = VENDOR_NAMES[VENDOR_ORDER[i]] || VENDOR_ORDER[i];
+    option.textContent = (isExperimentalVendor(VENDOR_ORDER[i]) ? "🧪 " : "") + (VENDOR_NAMES[VENDOR_ORDER[i]] || VENDOR_ORDER[i]);
+    if (isExperimentalVendor(VENDOR_ORDER[i])) option.title = "Experimental integration; not yet validated through direct use testing";
     select.appendChild(option);
   }
   if (preferred && installed.indexOf(preferred) !== -1) select.value = preferred;

package/lib/public/modules/tools.js

@@ -817,8 +817,13 @@ function resolvePermissionIdentity(mateId, vendor) {
   var vendorAvatars = {
     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 vendorName = (vendor && VENDOR_NAMES[vendor]) || VENDOR_NAMES.claude;

package/lib/public/modules/vendor-priority.js

@@ -0,0 +1,14 @@
+export var VENDOR_ORDER = ["claude", "codex", "grok", "kimi", "copilot", "qwen", "junie", "antigravity", "opencode", "kiro"];
+export var EXPERIMENTAL_VENDORS = ["grok", "kimi", "copilot", "qwen", "junie", "antigravity", "opencode"];
+
+export function isExperimentalVendor(vendor) {
+  return EXPERIMENTAL_VENDORS.indexOf(vendor) !== -1;
+}
+
+export function firstInstalledVendor(installedVendors) {
+  var installed = Array.isArray(installedVendors) ? installedVendors : [];
+  for (var i = 0; i < VENDOR_ORDER.length; i++) {
+    if (installed.indexOf(VENDOR_ORDER[i]) !== -1) return VENDOR_ORDER[i];
+  }
+  return "";
+}

package/lib/public/modules/vendor-selection.js

@@ -0,0 +1,20 @@
+import { store } from './store.js';
+import { firstInstalledVendor } from './vendor-priority.js';
+
+export function selectDefaultVendorForBlankSession() {
+  var state = store.snap();
+  if (!state.activeSessionId || state.sessionHasHistory || state.sessionVendorBound || state.dmMode) return "";
+  var vendor = firstInstalledVendor(state.installedVendors);
+  if (!vendor) return "";
+  if (vendor === state.currentVendor) {
+    if (state.vendorSelectionLocked) store.set({ vendorSelectionLocked: false });
+    return vendor;
+  }
+  store.set({
+    currentVendor: vendor,
+    currentModel: "",
+    currentModels: [],
+    vendorSelectionLocked: false,
+  });
+  return vendor;
+}

package/lib/public/modules/worktree-location.js

@@ -0,0 +1,17 @@
+export function isExternalWorktree(project) {
+  return !!(project && project.isWorktree && project.worktreeExternal === true);
+}
+
+export function externalWorktreeTooltip(name) {
+  return name + " — outside the main project folder";
+}
+
+export function appendExternalWorktreeBadge(container, className) {
+  var badge = document.createElement("span");
+  badge.className = className;
+  badge.setAttribute("role", "img");
+  badge.setAttribute("aria-label", "Outside the main project folder");
+  badge.innerHTML = '<i data-lucide="external-link"></i>';
+  container.appendChild(badge);
+  return badge;
+}

package/lib/public/qwen-avatar.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" role="img" aria-label="Qwen Code">
+  <rect width="64" height="64" rx="14" fill="#6b4eff"/>
+  <path d="M32 12a20 20 0 1 0 12 36l7 5-3-11a20 20 0 0 0-16-30zm0 9a11 11 0 1 1-7.8 18.8A11 11 0 0 1 32 21z" fill="#fff"/>
+</svg>

package/lib/public/style.css

@@ -1,12 +1,12 @@
 @import url("css/base.css");
 @import url("css/icon-strip.css");
-@import url("css/title-bar.css");
+@import url("css/title-bar.css?v=20260824");
 @import url("css/pane.css");
 @import url("css/worker-proposal.css");
 @import url("css/sidebar.css");
 @import url("css/overlays.css");
 @import url("css/menus.css");
-@import url("css/messages.css?v=20260407");
+@import url("css/messages.css?v=20260824");
 @import url("css/rewind.css");
 @import url("css/input.css");
 @import url("css/filebrowser.css");
@@ -35,3 +35,4 @@
 @import url("css/debate.css");
 @import url("css/notifications-center.css");
 @import url("css/tui-attention.css");
+@import url("css/pwa-mobile.css?v=20260824f");

package/lib/sdk-bridge.js

@@ -110,6 +110,7 @@ function createSDKBridge(opts) {
   var adapters = opts.adapters || {};
   var mateDisplayName = opts.mateDisplayName || "";
   var isMate = opts.isMate || (slug.indexOf("mate-") === 0);
+  var osUsers = !!opts.osUsers;
   var dangerouslySkipPermissions = opts.dangerouslySkipPermissions || false;
   // mcpServers may be either a static object or a getter function. The
   // getter form lets callers gate individual servers at call time (e.g.
@@ -323,6 +324,14 @@ function createSDKBridge(opts) {
   var mergeSkills = skills.mergeSkills;
 
   // --- Message processing (extracted to sdk-message-processor.js) ---
+  function getSessionLinuxUser(session) {
+    if (!osUsers || !session) return null;
+    if (session.lastLinuxUser) return session.lastLinuxUser;
+    if (!session.ownerId) return null;
+    var owner = usersModule.findUserById(session.ownerId);
+    return owner && owner.linuxUser ? owner.linuxUser : null;
+  }
+
   // Auto-generate a session title via YOKE adapter.generateTitle().
   // Triggered by sdk-message-processor after AUTO_TITLE_TURN_THRESHOLD turns.
   function autoGenerateTitle(session) {
@@ -345,7 +354,10 @@ function createSDKBridge(opts) {
     }
     console.log("[auto-title] Calling adapter.generateTitle with " + userMessages.length + " messages for session " + session.localId);
 
-    sessionAdapter.generateTitle(userMessages, { cwd: cwd }).then(function(title) {
+    sessionAdapter.generateTitle(userMessages, {
+      cwd: cwd,
+      linuxUser: getSessionLinuxUser(session) || undefined,
+    }).then(function(title) {
       if (!title || title.length < 2) return;
       title = title.substring(0, 100);
       if (!session.titleManuallySet) {
@@ -1131,7 +1143,9 @@ function createSDKBridge(opts) {
   async function rollbackConversation(session, numTurns) {
     var sessionAdapter = getAdapterForSession(session);
     if (sessionAdapter && typeof sessionAdapter.rollbackThread === "function") {
-      await sessionAdapter.rollbackThread(session.cliSessionId, numTurns);
+      await sessionAdapter.rollbackThread(session.cliSessionId, numTurns, {
+        linuxUser: getSessionLinuxUser(session) || undefined,
+      });
     }
     // Claude: conversation rollback is handled by rewindFiles + local history trim
   }
@@ -1143,7 +1157,11 @@ function createSDKBridge(opts) {
 
   async function forkSessionUnified(session, uuid) {
     var sessionAdapter = getAdapterForSession(session);
-    var result = await sessionAdapter.forkSession(session.cliSessionId, { upToMessageId: uuid, dir: cwd });
+    var result = await sessionAdapter.forkSession(session.cliSessionId, {
+      upToMessageId: uuid,
+      dir: cwd,
+      linuxUser: getSessionLinuxUser(session) || undefined,
+    });
     if (!result || !result.sessionId) throw new Error("Fork returned no session id");
 
     // Adapters with rollbackThread (e.g. Codex) use local history copy
@@ -1471,6 +1489,7 @@ function createSDKBridge(opts) {
 
     var queryOpts = {
       cwd: cwd,
+      linuxUser: linuxUser || undefined,
       // appendSystemPrompt, NOT systemPrompt: a plain-string systemPrompt
       // REPLACES the entire Claude Code system prompt (sdk.d.ts:2096), which
       // would strip the driver session down to the two-sentence pair preset.
@@ -1528,6 +1547,10 @@ function createSDKBridge(opts) {
         ACP: {
           mcpServers: getAcpMcpServers(session),
         },
+        ANTIGRAVITY: {
+          dangerouslySkipPermissions: dangerouslySkipPermissions
+            || session.permissionMode === "bypassPermissions",
+        },
         KIRO: {
           engine: kiroConfig.engine,
           mode: kiroConfig.mode,
@@ -1790,16 +1813,20 @@ function createSDKBridge(opts) {
     } catch (e) {}
     if ((codexBin && fs.existsSync(codexBin)) || tryLookup(yoke.getVendorInfo("codex").binaryName)) result.push("codex");
 
-    var acpVendorKeys = ["gemini", "opencode"];
+    var subprocessVendorKeys = ["antigravity", "opencode", "kimi", "grok", "copilot", "qwen", "junie"];
     var acpProfiles = require("./yoke/acp-agent-profiles");
-    for (var acpVendorIndex = 0; acpVendorIndex < acpVendorKeys.length; acpVendorIndex++) {
-      var acpVendor = acpVendorKeys[acpVendorIndex];
-      var acpInfo = yoke.getVendorInfo(acpVendor);
-      if (!linuxUser || acpInfo.osUserIsolation) {
-        var acpProfile = acpProfiles.getAcpAgentProfile(acpVendor);
-        if (acpProfiles.findAcpAgentPath(acpProfile)) result.push(acpVendor);
+    for (var subprocessVendorIndex = 0; subprocessVendorIndex < subprocessVendorKeys.length; subprocessVendorIndex++) {
+      var subprocessVendor = subprocessVendorKeys[subprocessVendorIndex];
+      var subprocessInfo = yoke.getVendorInfo(subprocessVendor);
+      if (!linuxUser || subprocessInfo.osUserIsolation) {
+        if (subprocessVendor === "antigravity") {
+          if (tryLookup(subprocessInfo.binaryName)) result.push(subprocessVendor);
+        } else {
+          var acpProfile = acpProfiles.getAcpAgentProfile(subprocessVendor);
+          if (acpProfiles.findAcpAgentPath(acpProfile)) result.push(subprocessVendor);
+        }
       } else {
-        console.log("[sdk-bridge] " + acpInfo.displayName + " hidden for OS-isolated user " + linuxUser + ": per-user spawning is not implemented");
+        console.log("[sdk-bridge] " + subprocessInfo.displayName + " hidden for OS-isolated user " + linuxUser + ": per-user spawning is not implemented");
       }
     }
 
@@ -1832,6 +1859,13 @@ function createSDKBridge(opts) {
     var defaultVendor = adapter ? adapter.vendor : "claude";
     sm.defaultVendor = defaultVendor;
 
+    // Installation detection is independent of adapter initialization. Publish
+    // it before warmup so a new project does not render the initial empty state
+    // as if every CLI were missing while the default adapter starts up.
+    sm.installedVendors = detectInstalledVendors(linuxUser);
+    sm.availableVendors = getAvailableVendors(linuxUser);
+    sendModelInfoForVendor(defaultVendor, sm.currentModel || "");
+
     // Initialize default adapter first (provides skills, slash commands, etc.)
     if (adapter) {
       try {
@@ -1883,19 +1917,8 @@ function createSDKBridge(opts) {
     //     actually issues a query with it.
     sm.modelsByVendor = sm.modelsByVendor || {};
 
-    // Detect installed vendors per-user (binary existence check)
-    sm.installedVendors = detectInstalledVendors(linuxUser);
-    sm.availableVendors = getAvailableVendors(linuxUser);
-
-    // Send initial state to client
-    send({
-      type: "model_info",
-      model: sm.currentModel || "",
-      models: getModelsForVendor(defaultVendor),
-      vendor: defaultVendor,
-      availableVendors: sm.availableVendors,
-      installedVendors: sm.installedVendors,
-    });
+    // Send the fully initialized state to the client.
+    sendModelInfoForVendor(defaultVendor, sm.currentModel || "");
   }
 
   async function setModel(session, model) {
@@ -2009,7 +2032,7 @@ function createSDKBridge(opts) {
   // Creates a mention session that can be reused across multiple mentions
   // within a conversation flow (session continuity).
   async function createMentionSession(opts) {
-    // opts: { vendor, claudeMd, initialContext, initialMessage, onDelta, onDone, onError, onActivity }
+    // opts: { vendor, linuxUser, claudeMd, initialContext, initialMessage, onDelta, onDone, onError, onActivity }
     var abortController = new AbortController();
 
     // Current response callbacks (swapped on each pushMessage)
@@ -2029,6 +2052,7 @@ function createSDKBridge(opts) {
     try {
       handle = await mentionAdapter.createQuery({
         cwd: cwd,
+        linuxUser: opts.linuxUser || undefined,
         systemPrompt: opts.claudeMd,
         model: opts.model || undefined,
         toolServers: opts.includeMcpServers ? (mergeMcpServers(getMcpServers(), getRemoteMcpServers) || undefined) : undefined,

package/lib/sdk-message-processor.js

@@ -792,7 +792,16 @@ function attachMessageProcessor(ctx) {
       // processQueryStream can finish the turn when the iterator closes.
       var adapterErrorText = parsed.text || parsed.message || parsed.error || "Agent runtime error";
       session._lastAdapterError = adapterErrorText;
-      sendAndRecord(session, { type: "error", text: adapterErrorText });
+      var isSessionWriterConflict = /thread-store conflict|already has an active writer/i.test(adapterErrorText);
+      if (isSessionWriterConflict) {
+        sendAndRecord(session, {
+          type: "session_writer_conflict",
+          vendor: session.vendor || "codex",
+          text: "This Codex session is already open in another Clay or Codex process. Stop the other server or close the other session, then try again.",
+        });
+      } else {
+        sendAndRecord(session, { type: "error", text: adapterErrorText });
+      }
 
     } else if (parsed.yokeType === "model_refusal") {
       // Model declined the request. "fallback" => the CLI retried on another

package/lib/session-notes-mcp-server.js

@@ -2,7 +2,13 @@
 
 var buildShape = require("./session-spawn-mcp-server").buildShape;
 
-var MEMORY_CONTRACT = "The sticky-note board persists across sessions and is a user-facing artifact shared with people and Clay agents, not private agent scratch space. Default to not writing. Create a note proactively only when the user explicitly asks to remember or track something, or when all of these are true: it will remain useful after the current task and session, it is not already adequately recorded in the repository or another note, and the user would likely be glad to find it on the board a week later. Good notes capture an unresolved commitment, durable product decision, user preference, constraint, or handoff that will materially change future work. Never create a note merely because work is important, lengthy, spans agents or restarts, or might help another agent. Do not record completed work, implementation details, test results, investigation logs, transient blockers, conversation summaries, or announcements of your own activity. When uncertain, do not write. Updates are visible too: update only when durable state materially changes, and remove a note created by your session when it stops being useful instead of turning it into a completion log. Put a concise plain-text title on the first line, stay focused on one topic, and include only the context needed for future action.";
+var MEMORY_CONTRACT =
+  "The sticky-note board persists across sessions and is a user-facing artifact shared with people and Clay agents, not private agent scratch space. " +
+  "Default to not writing. Create a note proactively only when the user explicitly asks to remember or track something, or when all of these are true: it will remain useful after the current task and session, it is not already adequately recorded in the repository or another note, and the user would likely be glad to find it on the board a week later. " +
+  "Good notes capture an unresolved commitment, durable product decision, user preference, constraint, or handoff that will materially change future work. " +
+  "Important exception for deferred defects: while doing code or technical work, actively create a sticky note when you discover a concrete defect, regression risk, security issue, or data-loss risk that is outside the current session goal and will remain unfixed when the turn ends. Do not wait for the user to ask. Include the observable evidence, affected component, likely impact, and a clear next action. Check active notes first when a duplicate is plausible. Do not create defect notes for speculation, general cleanup ideas, or problems you fixed in the current session. " +
+  "Never create a note merely because work is important, lengthy, spans agents or restarts, or might help another agent. Do not record completed work, implementation details, test results, investigation logs, transient blockers, conversation summaries, or announcements of your own activity. When uncertain, do not write. " +
+  "Updates are visible too: update only when durable state materially changes, and remove a note created by your session when it stops being useful instead of turning it into a completion log. Put a concise plain-text title on the first line, stay focused on one topic, and include only the context needed for future action.";
 
 function getToolDefs(handlers) {
   return [

package/lib/worktree.js

@@ -43,9 +43,14 @@ function isWorktree(projectPath) {
   }
 }
 
+function isPathInside(parentPath, candidatePath) {
+  var relative = path.relative(path.resolve(parentPath), path.resolve(candidatePath));
+  return relative !== "" && relative !== ".." && relative.indexOf(".." + path.sep) !== 0 && !path.isAbsolute(relative);
+}
+
 // Scan worktrees for a given project path
-// Returns array of { path, branch, bare, detached, accessible }
-// accessible = true if worktree path is inside parentPath
+// Returns array of { path, branch, bare, detached, external }
+// external = true when Git registered the worktree outside the main project folder
 function scanWorktrees(projectPath) {
   var resolvedParent = path.resolve(projectPath);
   try {
@@ -63,7 +68,7 @@ function scanWorktrees(projectPath) {
       if (wt.bare) continue;
       var resolvedWt = path.resolve(wt.path);
       if (resolvedWt === resolvedParent) continue;
-      wt.accessible = resolvedWt.indexOf(resolvedParent + path.sep) === 0;
+      wt.external = !isPathInside(resolvedParent, resolvedWt);
       wt.dirName = path.basename(wt.path);
       results.push(wt);
     }
@@ -131,4 +136,4 @@ function removeWorktree(projectPath, worktreeDirName) {
   }
 }
 
-module.exports = { scanWorktrees: scanWorktrees, createWorktree: createWorktree, removeWorktree: removeWorktree, isWorktree: isWorktree };
+module.exports = { scanWorktrees: scanWorktrees, createWorktree: createWorktree, removeWorktree: removeWorktree, isWorktree: isWorktree, isPathInside: isPathInside };

package/lib/ws-schema.js

@@ -145,6 +145,7 @@ var schema = {
   "kill_process":             { direction: "c2s", handler: "lib/project-sessions.js", description: "Kill a system process by PID" },
   "process_killed":           { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Process was successfully killed" },
   "process_conflict":         { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Conflict: another process is using the session" },
+  "session_writer_conflict":  { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Codex session is already open in another process" },
 
   // -----------------------------------------------------------------------
   // Context / usage
@@ -353,6 +354,8 @@ var schema = {
   "term_closed":              { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Terminal session was closed" },
   "term_list":                { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Full list of open terminals" },
   "term_error":               { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Terminal error (e.g. access denied)" },
+  "shell_command":            { direction: "c2s", handler: "lib/project-shell-command.js", description: "Run a one-shot shell command for agent context" },
+  "shell_command_result":     { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "One-shot shell command output and exit status" },
 
   // -----------------------------------------------------------------------
   // Sticky notes

package/lib/yoke/acp-agent-profiles.js

@@ -96,21 +96,16 @@ function validateOpenCodeConfig(config) {
   }
 }
 
+function trustDefaultWhenModeIsNotExposed(ctx, next) {
+  var options = ctx.state && ctx.state.configOptions;
+  for (var i = 0; i < (options || []).length; i++) {
+    if (options[i].category === "mode" || options[i].id === "mode") return next();
+  }
+  if (ctx.state && ctx.state.modes) return next();
+  return Promise.resolve();
+}
+
 var ACP_AGENT_PROFILES = {
-  gemini: {
-    vendor: "gemini",
-    displayName: "Gemini CLI",
-    binaryName: "gemini",
-    overrideName: "GEMINI_CLI_PATH",
-    args: ["--acp", "--approval-mode=default"],
-    defaultModels: ["auto"],
-    defaultModel: "auto",
-    // Gemini advertises loadSession, but releases through 0.46.0 could load
-    // the transcript without restoring the model's conversation memory.
-    // Keep resume gated until Clay's live contract test proves it reliable.
-    sessionResume: false,
-    permissionModeGuaranteed: true,
-  },
   opencode: {
     vendor: "opencode",
     displayName: "OpenCode",
@@ -161,6 +156,61 @@ var ACP_AGENT_PROFILES = {
       return Promise.resolve();
     },
   },
+  kimi: {
+    vendor: "kimi",
+    displayName: "Kimi Code",
+    binaryName: "kimi",
+    overrideName: "KIMI_CLI_PATH",
+    args: ["acp"],
+    defaultModels: ["auto"],
+    defaultModel: "auto",
+    sessionResume: null,
+    ensureSafePermissionMode: trustDefaultWhenModeIsNotExposed,
+  },
+  grok: {
+    vendor: "grok",
+    displayName: "Grok Build",
+    binaryName: "grok",
+    overrideName: "GROK_CLI_PATH",
+    args: ["--no-auto-update", "--permission-mode", "ask", "agent", "stdio"],
+    defaultModels: ["auto"],
+    defaultModel: "auto",
+    sessionResume: null,
+    permissionModeGuaranteed: true,
+  },
+  copilot: {
+    vendor: "copilot",
+    displayName: "GitHub Copilot CLI",
+    binaryName: "copilot",
+    overrideName: "COPILOT_CLI_PATH",
+    args: ["--acp"],
+    defaultModels: ["auto"],
+    defaultModel: "auto",
+    sessionResume: null,
+    ensureSafePermissionMode: trustDefaultWhenModeIsNotExposed,
+  },
+  qwen: {
+    vendor: "qwen",
+    displayName: "Qwen Code",
+    binaryName: "qwen",
+    overrideName: "QWEN_CLI_PATH",
+    args: ["--acp", "--approval-mode", "default"],
+    defaultModels: ["auto"],
+    defaultModel: "auto",
+    sessionResume: null,
+    permissionModeGuaranteed: true,
+  },
+  junie: {
+    vendor: "junie",
+    displayName: "Junie CLI",
+    binaryName: "junie",
+    overrideName: "JUNIE_CLI_PATH",
+    args: ["--acp", "true"],
+    defaultModels: ["auto"],
+    defaultModel: "auto",
+    sessionResume: null,
+    ensureSafePermissionMode: trustDefaultWhenModeIsNotExposed,
+  },
 };
 
 function getAcpAgentProfile(vendor) {