clay-server 3.4.0-beta.2 → 3.4.0-beta.21

package/lib/yoke/adapters/codex.js

@@ -7,6 +7,7 @@ var path = require("path");
 var fs = require("fs");
 var { CodexAppServer } = require("../codex-app-server");
 var skillDiscovery = require("../skill-discovery");
+var { resolveOsUserInfo } = require("../../os-users");
 
 // --- Event flattening ---
 // Converts app-server JSON-RPC notifications into flat objects with a yokeType field.
@@ -1071,6 +1072,7 @@ function createCodexQueryHandle(appServer, queryOpts) {
         await appServer.send("turn/start", {
           threadId: state.threadId,
           input: input,
+          model: state.model,
         }, 60000);
 
         // Wait for turn to complete
@@ -1143,7 +1145,7 @@ function createCodexQueryHandle(appServer, queryOpts) {
     },
 
     setModel: function(model) {
-      // Model is set at thread creation. Cannot change mid-thread.
+      state.model = model || "gpt-5.6-terra";
       return Promise.resolve();
     },
 
@@ -1220,6 +1222,13 @@ function createCodexAdapter(opts) {
   var _cwd = (opts && opts.cwd) || process.cwd();
   var _slug = (opts && opts.slug) || "";
   var _defaultInitOpts = Object.assign({}, opts || {});
+  var _runtimeLinuxUser = (opts && opts.runtimeLinuxUser) || null;
+  var _requiresLinuxUser = !!(opts && opts.osUsers) && !_runtimeLinuxUser;
+  var _userRuntimes = Object.create(null);
+  var _resolveOsUserInfo = (opts && opts.resolveOsUserInfo) || resolveOsUserInfo;
+  var _createAppServer = (opts && opts.createAppServer) || function(serverOpts) {
+    return new CodexAppServer(null, serverOpts);
+  };
   // Codex models are a fixed list (the app-server doesn't enumerate them), so
   // model listing must not depend on a successful app-server init — otherwise a
   // slow/failed `initialize` leaves the picker empty and the chip shows the
@@ -1244,6 +1253,45 @@ function createCodexAdapter(opts) {
   var _shuttingDown = false;
   var _activeQueries = [];
 
+  function withoutLinuxUser(callOpts) {
+    var cleaned = Object.assign({}, callOpts || {});
+    delete cleaned.linuxUser;
+    return cleaned;
+  }
+
+  function getUserRuntime(linuxUser) {
+    if (!linuxUser) return null;
+    if (_runtimeLinuxUser) {
+      if (_runtimeLinuxUser !== linuxUser) {
+        throw new Error("Codex runtime user mismatch: expected " + _runtimeLinuxUser + ", received " + linuxUser);
+      }
+      return adapter;
+    }
+    if (!_userRuntimes[linuxUser]) {
+      var runtimeOpts = Object.assign({}, _defaultInitOpts, {
+        runtimeLinuxUser: linuxUser,
+      });
+      delete runtimeOpts.linuxUser;
+      _userRuntimes[linuxUser] = createCodexAdapter(runtimeOpts);
+    }
+    return _userRuntimes[linuxUser];
+  }
+
+  function shutdownUserRuntimes(method, idleMs) {
+    var users = Object.keys(_userRuntimes);
+    if (!users.length) return Promise.resolve([]);
+    return Promise.all(users.map(function(linuxUser) {
+      var runtime = _userRuntimes[linuxUser];
+      var result = method === "shutdownIfIdle"
+        ? runtime.shutdownIfIdle(idleMs)
+        : runtime.shutdown();
+      return Promise.resolve(result).then(function(stopped) {
+        if (method === "shutdown" || stopped) delete _userRuntimes[linuxUser];
+        return stopped;
+      });
+    }));
+  }
+
   function updateLastActiveAt() {
     _lastActiveAt = Date.now();
   }
@@ -1279,7 +1327,7 @@ function createCodexAdapter(opts) {
       fastModeState: null,
       capabilities: {
         effort: true,
-        midSessionModelSwitch: false,
+        midSessionModelSwitch: true,
         fork: true,
         rollback: true,
         sessionListing: false,
@@ -1396,6 +1444,16 @@ function createCodexAdapter(opts) {
     vendor: "codex",
 
     init: function(initOpts) {
+      var requestedLinuxUser = initOpts && initOpts.linuxUser;
+      if (!_runtimeLinuxUser && requestedLinuxUser) {
+        return getUserRuntime(requestedLinuxUser).init(withoutLinuxUser(initOpts));
+      }
+      if (_requiresLinuxUser) {
+        return Promise.reject(new Error("Codex requires a mapped Linux user while OS-user isolation is enabled"));
+      }
+      if (_runtimeLinuxUser && requestedLinuxUser && requestedLinuxUser !== _runtimeLinuxUser) {
+        return Promise.reject(new Error("Codex runtime user mismatch"));
+      }
       if (_shuttingDown) {
         return Promise.reject(createShutdownError());
       }
@@ -1412,6 +1470,9 @@ function createCodexAdapter(opts) {
 
       _initPromise = (async function() {
         var serverOpts = { cwd: _cwd };
+        if (_runtimeLinuxUser) {
+          serverOpts.osUserInfo = _resolveOsUserInfo(_runtimeLinuxUser);
+        }
 
         // Extract adapter options
         if (effectiveInitOpts && effectiveInitOpts.adapterOptions && effectiveInitOpts.adapterOptions.CODEX) {
@@ -1478,7 +1539,7 @@ function createCodexAdapter(opts) {
         }
 
         // Spawn and initialize app-server
-        _appServer = new CodexAppServer(null, serverOpts);
+        _appServer = _createAppServer(serverOpts);
         await _appServer.start();
 
         await _appServer.send("initialize", {
@@ -1565,6 +1626,16 @@ function createCodexAdapter(opts) {
     },
 
     createQuery: async function(queryOpts) {
+      var requestedLinuxUser = queryOpts && queryOpts.linuxUser;
+      if (!_runtimeLinuxUser && requestedLinuxUser) {
+        return getUserRuntime(requestedLinuxUser).createQuery(withoutLinuxUser(queryOpts));
+      }
+      if (_requiresLinuxUser) {
+        throw new Error("Codex requires a mapped Linux user while OS-user isolation is enabled");
+      }
+      if (_runtimeLinuxUser && requestedLinuxUser && requestedLinuxUser !== _runtimeLinuxUser) {
+        throw new Error("Codex runtime user mismatch");
+      }
       if (_shuttingDown) {
         throw createShutdownError();
       }
@@ -1661,6 +1732,13 @@ function createCodexAdapter(opts) {
 
     // --- Title generation ---
     generateTitle: async function(messages, opts) {
+      var requestedLinuxUser = opts && opts.linuxUser;
+      if (!_runtimeLinuxUser && requestedLinuxUser) {
+        return getUserRuntime(requestedLinuxUser).generateTitle(messages, withoutLinuxUser(opts));
+      }
+      if (_requiresLinuxUser) {
+        throw new Error("Codex requires a mapped Linux user while OS-user isolation is enabled");
+      }
       var systemPrompt = "You are a title generator. Output only a short title (3-8 words). No quotes, no punctuation at the end, no explanation.";
       var prompt = "Below is a conversation between a user and an AI assistant. Generate a short, descriptive title (3-8 words) that captures the main topic. Reply with ONLY the title, nothing else.\n\n";
       for (var i = 0; i < messages.length; i++) {
@@ -1708,6 +1786,11 @@ function createCodexAdapter(opts) {
     listSessions: function() { return Promise.resolve([]); },
     renameSession: function() { return Promise.resolve(); },
     forkSession: function(threadId, opts) {
+      var requestedLinuxUser = opts && opts.linuxUser;
+      if (!_runtimeLinuxUser && requestedLinuxUser) {
+        return getUserRuntime(requestedLinuxUser).forkSession(threadId, withoutLinuxUser(opts));
+      }
+      if (_requiresLinuxUser) return Promise.reject(new Error("Codex requires a mapped Linux user while OS-user isolation is enabled"));
       if (!_appServer || !_appServer.started) return Promise.resolve(null);
       return _appServer.send("thread/fork", { threadId: threadId }, 30000).then(function(result) {
         var newThreadId = (result && result.thread) ? result.thread.id : null;
@@ -1715,17 +1798,30 @@ function createCodexAdapter(opts) {
         return { sessionId: newThreadId };
       });
     },
-    rollbackThread: function(threadId, numTurns) {
+    rollbackThread: function(threadId, numTurns, opts) {
+      var requestedLinuxUser = opts && opts.linuxUser;
+      if (!_runtimeLinuxUser && requestedLinuxUser) {
+        return getUserRuntime(requestedLinuxUser).rollbackThread(threadId, numTurns, withoutLinuxUser(opts));
+      }
+      if (_requiresLinuxUser) return Promise.reject(new Error("Codex requires a mapped Linux user while OS-user isolation is enabled"));
       if (!_appServer || !_appServer.started) return Promise.resolve(null);
       return _appServer.send("thread/rollback", { threadId: threadId, numTurns: numTurns }, 30000);
     },
 
     // Shutdown the app-server process
     shutdown: function() {
-      return beginShutdown(true);
+      return Promise.all([
+        beginShutdown(true),
+        shutdownUserRuntimes("shutdown"),
+      ]).then(function() { return true; });
     },
 
     shutdownIfIdle: function(idleMs) {
+      if (!_runtimeLinuxUser && Object.keys(_userRuntimes).length > 0) {
+        return shutdownUserRuntimes("shutdownIfIdle", idleMs).then(function(results) {
+          return results.some(function(stopped) { return !!stopped; });
+        });
+      }
       if (_shuttingDown || _shutdownPromise) return Promise.resolve(false);
       if (_initPromise) return Promise.resolve(false);
       if (!_appServer) return Promise.resolve(false);

package/lib/yoke/adapters/copilot.js

@@ -0,0 +1,7 @@
+var createAcpAdapter = require("./acp").createAcpAdapter;
+
+function createCopilotAdapter(opts) {
+  return createAcpAdapter("copilot", opts);
+}
+
+module.exports = { createCopilotAdapter: createCopilotAdapter };

package/lib/yoke/adapters/grok.js

@@ -0,0 +1,7 @@
+var createAcpAdapter = require("./acp").createAcpAdapter;
+
+function createGrokAdapter(opts) {
+  return createAcpAdapter("grok", opts);
+}
+
+module.exports = { createGrokAdapter: createGrokAdapter };

package/lib/yoke/adapters/junie.js

@@ -0,0 +1,7 @@
+var createAcpAdapter = require("./acp").createAcpAdapter;
+
+function createJunieAdapter(opts) {
+  return createAcpAdapter("junie", opts);
+}
+
+module.exports = { createJunieAdapter: createJunieAdapter };

package/lib/yoke/adapters/kimi.js

@@ -0,0 +1,7 @@
+var createAcpAdapter = require("./acp").createAcpAdapter;
+
+function createKimiAdapter(opts) {
+  return createAcpAdapter("kimi", opts);
+}
+
+module.exports = { createKimiAdapter: createKimiAdapter };

package/lib/yoke/adapters/kiro.js

@@ -762,7 +762,7 @@ function createKiroQueryHandle(acp, queryOpts) {
 
     setModel: function(model) {
       state.model = model;
-      return setSessionModel(model).catch(function() {});
+      return setSessionModel(model);
     },
 
     setEffort: function() { return Promise.resolve(); },
@@ -867,7 +867,7 @@ function createKiroAdapter(opts) {
       fastModeState: null,
       capabilities: {
         effort: false,
-        midSessionModelSwitch: false,
+        midSessionModelSwitch: true,
         fork: false,
         rollback: false,
         sessionListing: false,

package/lib/yoke/adapters/qwen.js

@@ -0,0 +1,7 @@
+var createAcpAdapter = require("./acp").createAcpAdapter;
+
+function createQwenAdapter(opts) {
+  return createAcpAdapter("qwen", opts);
+}
+
+module.exports = { createQwenAdapter: createQwenAdapter };

package/lib/yoke/codex-app-server.js

@@ -9,6 +9,8 @@ var readline = require("readline");
 var path = require("path");
 var fs = require("fs");
 var { createRequire } = require("module");
+var { buildUserEnv } = require("../build-user-env");
+var { wrapSpawnAsUser } = require("../os-users");
 
 // --- Find the codex binary path ---
 // Mirrors the logic from @openai/codex-sdk findCodexPath()
@@ -120,14 +122,30 @@ function CodexAppServer(executablePath, opts) {
   this._stderrBuf = "";
 }
 
+function buildSpawnSpec(executablePath, args, opts, wrapFn) {
+  opts = opts || {};
+  var osUserInfo = opts.osUserInfo || null;
+  var env = osUserInfo
+    ? Object.assign(buildUserEnv(osUserInfo), opts.env || {})
+    : Object.assign({}, process.env, opts.env || {});
+  var spawnOptions = {
+    stdio: ["pipe", "pipe", "pipe"],
+    env: env,
+    cwd: opts.cwd || process.cwd(),
+  };
+  if (osUserInfo) {
+    spawnOptions.uid = osUserInfo.uid;
+    spawnOptions.gid = osUserInfo.gid;
+  }
+  return (wrapFn || wrapSpawnAsUser)(executablePath, args, spawnOptions);
+}
+
 CodexAppServer.prototype.start = function() {
   var self = this;
 
   return new Promise(function(resolve, reject) {
     try {
       var args = ["app-server"];
-      var env = Object.assign({}, process.env, self.opts.env || {});
-
       // Pass config overrides via --config key=value flags
       if (self.opts.config) {
         var configArgs = serializeConfig(self.opts.config, "");
@@ -136,13 +154,11 @@ CodexAppServer.prototype.start = function() {
         }
       }
 
-      console.log("[codex-app-server] Spawning:", self.executablePath, args.join(" "));
+      var spawnSpec = buildSpawnSpec(self.executablePath, args, self.opts);
+      var userSuffix = self.opts.osUserInfo ? " as " + self.opts.osUserInfo.user : "";
+      console.log("[codex-app-server] Spawning" + userSuffix + ":", spawnSpec.command, spawnSpec.args.join(" "));
 
-      self.proc = spawn(self.executablePath, args, {
-        stdio: ["pipe", "pipe", "pipe"],
-        env: env,
-        cwd: self.opts.cwd || process.cwd(),
-      });
+      self.proc = spawn(spawnSpec.command, spawnSpec.args, spawnSpec.options);
 
       self.proc.on("error", function(err) {
         console.error("[codex-app-server] Process error:", err.message);
@@ -383,4 +399,5 @@ CodexAppServer.prototype.stop = function() {
 module.exports = {
   CodexAppServer: CodexAppServer,
   findCodexPath: findCodexPath,
+  buildSpawnSpec: buildSpawnSpec,
 };

package/lib/yoke/index.js

@@ -6,13 +6,18 @@ var instructions = require("./instructions");
 var vendorRegistry = require("./vendor-registry");
 var createClaudeAdapter = require("./adapters/claude").createClaudeAdapter;
 var createCodexAdapter = require("./adapters/codex").createCodexAdapter;
-var createGeminiAdapter = require("./adapters/gemini").createGeminiAdapter;
+var createAntigravityAdapter = require("./adapters/antigravity").createAntigravityAdapter;
 var createOpenCodeAdapter = require("./adapters/opencode").createOpenCodeAdapter;
+var createKimiAdapter = require("./adapters/kimi").createKimiAdapter;
+var createGrokAdapter = require("./adapters/grok").createGrokAdapter;
+var createCopilotAdapter = require("./adapters/copilot").createCopilotAdapter;
+var createQwenAdapter = require("./adapters/qwen").createQwenAdapter;
+var createJunieAdapter = require("./adapters/junie").createJunieAdapter;
 var createKiroAdapter = require("./adapters/kiro").createKiroAdapter;
 
 // Keep the first session in a new project predictable. This order is also
 // used by the UI when a project has no remembered vendor yet.
-var DEFAULT_VENDOR_ORDER = ["claude", "codex", "gemini", "opencode", "kiro"];
+var DEFAULT_VENDOR_ORDER = ["claude", "codex", "grok", "kimi", "copilot", "qwen", "junie", "antigravity", "opencode", "kiro"];
 
 function resolveDefaultVendor(availableVendors) {
   availableVendors = availableVendors || {};
@@ -73,10 +78,20 @@ function createAdapter(opts) {
     adapter = createClaudeAdapter(opts);
   } else if (vendor === "codex") {
     adapter = createCodexAdapter(opts);
-  } else if (vendor === "gemini") {
-    adapter = createGeminiAdapter(opts);
+  } else if (vendor === "antigravity") {
+    adapter = createAntigravityAdapter(opts);
   } else if (vendor === "opencode") {
     adapter = createOpenCodeAdapter(opts);
+  } else if (vendor === "kimi") {
+    adapter = createKimiAdapter(opts);
+  } else if (vendor === "grok") {
+    adapter = createGrokAdapter(opts);
+  } else if (vendor === "copilot") {
+    adapter = createCopilotAdapter(opts);
+  } else if (vendor === "qwen") {
+    adapter = createQwenAdapter(opts);
+  } else if (vendor === "junie") {
+    adapter = createJunieAdapter(opts);
   } else if (vendor === "kiro") {
     adapter = createKiroAdapter(opts);
   } else {
@@ -102,7 +117,7 @@ function logAuthCheck(auth) {
   if (_lastAuthLogKey === key && now - _lastAuthLogAt < 30000) return;
   _lastAuthLogKey = key;
   _lastAuthLogAt = now;
-  console.log("[yoke] Auth check: claude=" + auth.claude + " codex=" + auth.codex + " gemini=" + auth.gemini + " opencode=" + auth.opencode + " kiro=" + auth.kiro);
+  console.log("[yoke] Auth check: " + Object.keys(auth).map(function(vendor) { return vendor + "=" + auth[vendor]; }).join(" "));
 }
 
 function checkAuth() {
@@ -236,8 +251,13 @@ function checkAuth() {
   _authCache = {
     claude: checkClaude(),
     codex: checkCodex(),
-    gemini: !!lookupBinary("gemini"),
+    antigravity: !!lookupBinary("agy"),
     opencode: !!lookupBinary("opencode"),
+    kimi: !!lookupBinary("kimi"),
+    grok: !!lookupBinary("grok"),
+    copilot: !!lookupBinary("copilot"),
+    qwen: !!lookupBinary("qwen"),
+    junie: !!lookupBinary("junie"),
     kiro: checkKiro(),
   };
   logAuthCheck(_authCache);
@@ -261,7 +281,7 @@ function checkInstalled() {
 
   var fs = require("fs");
   var execFileSync = require("child_process").execFileSync;
-  var result = { claude: false, codex: false, gemini: false, opencode: false, kiro: false };
+  var result = { claude: false, codex: false, antigravity: false, opencode: false, kimi: false, grok: false, copilot: false, qwen: false, junie: false, kiro: false };
   try {
     if (process.platform === "win32") execFileSync("where", ["claude"], { timeout: 3000, stdio: ["pipe", "pipe", "pipe"] });
     else execFileSync("which", ["claude"], { timeout: 3000, stdio: ["pipe", "pipe", "pipe"] });
@@ -290,10 +310,19 @@ function checkInstalled() {
     }
   } catch (e) {}
   try {
-    var acpProfiles = require("./acp-agent-profiles");
-    result.gemini = !!acpProfiles.findAcpAgentPath(acpProfiles.getAcpAgentProfile("gemini"));
-    result.opencode = !!acpProfiles.findAcpAgentPath(acpProfiles.getAcpAgentProfile("opencode"));
+    var antigravityBinary = process.platform === "win32"
+      ? execFileSync("where", ["agy"], { timeout: 3000, encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] })
+      : execFileSync("which", ["agy"], { timeout: 3000, encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] });
+    result.antigravity = !!antigravityBinary.trim();
   } catch (e) {}
+  var acpVendorKeys = ["opencode", "kimi", "grok", "copilot", "qwen", "junie"];
+  for (var acpIndex = 0; acpIndex < acpVendorKeys.length; acpIndex++) {
+    try {
+      var acpProfiles = require("./acp-agent-profiles");
+      var acpVendor = acpVendorKeys[acpIndex];
+      result[acpVendor] = !!acpProfiles.findAcpAgentPath(acpProfiles.getAcpAgentProfile(acpVendor));
+    } catch (e) {}
+  }
   _installedCache = result;
   return result;
 }
@@ -317,8 +346,10 @@ function createAdapters(opts) {
   // Claude Code supports multiple auth modes (OAuth, Bedrock, Vertex, API key)
   // that `claude auth status` does not always detect. Runtime auth failures are
   // handled downstream via query-level error detection.
-  var installed = checkInstalled();
-  var auth = { claude: false, codex: false, gemini: false, opencode: false, kiro: false };
+  // Tests can supply a fixed installation snapshot without probing or spawning
+  // vendor binaries; production callers always use the cached host scan.
+  var installed = opts._installed || checkInstalled();
+  var auth = { claude: false, codex: false, antigravity: false, opencode: false, kimi: false, grok: false, copilot: false, qwen: false, junie: false, kiro: false };
   var adapters = {};
 
   function supportsConfiguredIsolation(vendor) {
@@ -334,10 +365,10 @@ function createAdapters(opts) {
         // per-project teardown never shuts it down on behalf of one project
         // (see destroy() in lib/project.js).
         _sharedClaudeAdapter.shared = true;
+        console.log("[yoke] Shared adapter created: claude");
       }
       adapters.claude = _sharedClaudeAdapter;
       auth.claude = true;
-      console.log("[yoke] Adapter created: claude");
     } catch (e) {
       console.error("[yoke] Failed to create adapter for claude:", e.message);
     }
@@ -345,28 +376,26 @@ function createAdapters(opts) {
 
   if (installed.codex && supportsConfiguredIsolation("codex")) {
     try {
-      adapters.codex = createAdapter({ vendor: "codex", cwd: opts.cwd, slug: opts.slug });
+      adapters.codex = createAdapter({ vendor: "codex", cwd: opts.cwd, slug: opts.slug, osUsers: !!opts.osUsers });
       auth.codex = true;
-      console.log("[yoke] Adapter created: codex");
     } catch (e) {
       console.error("[yoke] Failed to create adapter for codex:", e.message);
     }
   }
 
-  var acpVendors = ["gemini", "opencode"];
-  for (var acpIndex = 0; acpIndex < acpVendors.length; acpIndex++) {
-    var acpVendor = acpVendors[acpIndex];
-    var acpInfo = vendorRegistry.getVendorInfo(acpVendor);
-    if (installed[acpVendor] && supportsConfiguredIsolation(acpVendor)) {
+  var subprocessVendors = ["antigravity", "opencode", "kimi", "grok", "copilot", "qwen", "junie"];
+  for (var subprocessIndex = 0; subprocessIndex < subprocessVendors.length; subprocessIndex++) {
+    var subprocessVendor = subprocessVendors[subprocessIndex];
+    var subprocessInfo = vendorRegistry.getVendorInfo(subprocessVendor);
+    if (installed[subprocessVendor] && supportsConfiguredIsolation(subprocessVendor)) {
       try {
-        adapters[acpVendor] = createAdapter({ vendor: acpVendor, cwd: opts.cwd, slug: opts.slug });
-        auth[acpVendor] = true;
-        console.log("[yoke] Adapter created: " + acpVendor);
+        adapters[subprocessVendor] = createAdapter({ vendor: subprocessVendor, cwd: opts.cwd, slug: opts.slug });
+        auth[subprocessVendor] = true;
       } catch (e) {
-        console.error("[yoke] Failed to create adapter for " + acpVendor + ":", e.message);
+        console.error("[yoke] Failed to create adapter for " + subprocessVendor + ":", e.message);
       }
-    } else if (installed[acpVendor] && opts.osUsers) {
-      console.log("[yoke] " + acpInfo.displayName + " adapter disabled: OS-user isolation requires per-user spawning");
+    } else if (installed[subprocessVendor] && opts.osUsers) {
+      console.log("[yoke] " + subprocessInfo.displayName + " adapter disabled: OS-user isolation requires per-user spawning");
     }
   }
 
@@ -375,7 +404,6 @@ function createAdapters(opts) {
     try {
       adapters.kiro = createAdapter({ vendor: "kiro", cwd: opts.cwd, slug: opts.slug });
       auth.kiro = true;
-      console.log("[yoke] Adapter created: kiro");
     } catch (e) {
       console.error("[yoke] Failed to create adapter for kiro:", e.message);
     }
@@ -383,6 +411,12 @@ function createAdapters(opts) {
     console.log("[yoke] " + kiroInfo.displayName + " adapter disabled: OS-user isolation requires per-user spawning");
   }
 
+  var registeredVendors = Object.keys(adapters);
+  if (registeredVendors.length > 0) {
+    var registrationScope = opts.slug ? " for " + opts.slug : "";
+    console.log("[yoke] Adapters registered" + registrationScope + ": " + registeredVendors.join(", "));
+  }
+
   return { adapters: adapters, auth: auth };
 }
 
@@ -406,7 +440,12 @@ async function lazyCreateAdapter(adapters, vendor, opts) {
   if (!installed[vendor]) return null;
 
   try {
-    var ad = createAdapter({ vendor: vendor, cwd: opts.cwd, slug: opts.slug });
+    var ad = createAdapter({
+      vendor: vendor,
+      cwd: opts.cwd,
+      slug: opts.slug,
+      osUsers: !!(opts.osUsers || opts.linuxUser),
+    });
     if (typeof ad.init === "function") {
       await ad.init(opts || {});
     }

package/lib/yoke/instructions.js

@@ -18,12 +18,15 @@ var KNOWN_FILES = [
   { file: ".cursorrules", label: ".cursorrules" },
   { file: ".github/copilot-instructions.md", label: ".github/copilot-instructions.md" },
   { file: "COPILOT.md", label: "COPILOT.md" },
+  { file: "QWEN.md", label: "QWEN.md" },
 ];
 
 // Files each vendor reads natively (skip these to avoid duplication).
 var NATIVE_FILES = {
   claude: ["CLAUDE.md"],
   codex: ["AGENTS.md"],
+  copilot: [".github/copilot-instructions.md", "COPILOT.md"],
+  qwen: ["QWEN.md"],
 };
 
 // Scan projectDir for instruction files and return merged text.

package/lib/yoke/interface.js

@@ -9,6 +9,17 @@
 //   2. QueryHandle (returned by adapter.createQuery)
 
 var TOOL_POLICIES = ["ask", "allow-all"];
+var BACKGROUND_TASK_TYPES = ["shell", "agent", "monitor", "other"];
+
+/*
+ * Optional adapter event contract:
+ *   { yokeType: "background_tasks_changed", tasks: [{ task_id, task_type, description }] }
+ *
+ * Each event replaces the complete live set. An adapter that emits this event
+ * must reset it to an empty set when its CLI process restarts. task_type uses
+ * BACKGROUND_TASK_TYPES; adapters without a level signal may synthesize one,
+ * and adapters that emit nothing simply have no background-task indicator.
+ */
 
 /**
  * Validate that an adapter object implements all required methods.
@@ -93,6 +104,7 @@ function validateQueryHandle(handle) {
 
 module.exports = {
   TOOL_POLICIES: TOOL_POLICIES,
+  BACKGROUND_TASK_TYPES: BACKGROUND_TASK_TYPES,
   ADAPTER_METHODS: ADAPTER_METHODS,
   QUERY_HANDLE_METHODS: QUERY_HANDLE_METHODS,
   validateAdapter: validateAdapter,

package/lib/yoke/vendor-registry.js

@@ -40,13 +40,13 @@ var VENDOR_REGISTRY = {
     },
     rateLimitTracking: true,
   },
-  gemini: {
-    displayName: "Gemini CLI",
-    loginCommand: "gemini",
-    binaryName: "gemini",
-    avatar: "/gemini-avatar.svg",
+  antigravity: {
+    displayName: "Antigravity CLI",
+    loginCommand: "agy",
+    binaryName: "agy",
+    avatar: "/antigravity-avatar.png",
     sessionModes: ["gui"],
-    effortLevels: [],
+    effortLevels: ["low", "medium", "high"],
     osUserIsolation: false,
     usageDashboard: null,
     rateLimitTracking: false,
@@ -62,6 +62,61 @@ var VENDOR_REGISTRY = {
     usageDashboard: null,
     rateLimitTracking: false,
   },
+  kimi: {
+    displayName: "Kimi Code",
+    loginCommand: "kimi login",
+    binaryName: "kimi",
+    avatar: "/kimi-avatar.svg",
+    sessionModes: ["gui"],
+    effortLevels: [],
+    osUserIsolation: false,
+    usageDashboard: null,
+    rateLimitTracking: false,
+  },
+  grok: {
+    displayName: "Grok Build",
+    loginCommand: "grok login --device-auth",
+    binaryName: "grok",
+    avatar: "/grok-avatar.svg",
+    sessionModes: ["gui"],
+    effortLevels: [],
+    osUserIsolation: false,
+    usageDashboard: null,
+    rateLimitTracking: false,
+  },
+  copilot: {
+    displayName: "GitHub Copilot CLI",
+    loginCommand: "copilot login",
+    binaryName: "copilot",
+    avatar: "/copilot-avatar.svg",
+    sessionModes: ["gui"],
+    effortLevels: [],
+    osUserIsolation: false,
+    usageDashboard: null,
+    rateLimitTracking: false,
+  },
+  qwen: {
+    displayName: "Qwen Code",
+    loginCommand: "qwen",
+    binaryName: "qwen",
+    avatar: "/qwen-avatar.svg",
+    sessionModes: ["gui"],
+    effortLevels: [],
+    osUserIsolation: false,
+    usageDashboard: null,
+    rateLimitTracking: false,
+  },
+  junie: {
+    displayName: "Junie CLI",
+    loginCommand: "junie",
+    binaryName: "junie",
+    avatar: "/junie-avatar.svg",
+    sessionModes: ["gui"],
+    effortLevels: [],
+    osUserIsolation: false,
+    usageDashboard: null,
+    rateLimitTracking: false,
+  },
   kiro: {
     displayName: "Kiro CLI",
     loginCommand: "kiro-cli login",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "3.4.0-beta.2",
+  "version": "3.4.0-beta.21",
   "description": "Self-hosted team workspace for Claude Code and Codex. Multi-user, browser-based, with persistent AI mates.",
   "bin": {
     "clay-server": "./bin/cli.js",