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

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;
 }
@@ -318,7 +347,7 @@ function createAdapters(opts) {
   // 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 };
+  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) {
@@ -345,7 +374,7 @@ 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) {
@@ -353,20 +382,20 @@ function createAdapters(opts) {
     }
   }
 
-  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;
+        console.log("[yoke] Adapter created: " + subprocessVendor);
       } 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");
     }
   }
 
@@ -406,7 +435,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/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.1",
+  "version": "3.4.0-beta.10",
   "description": "Self-hosted team workspace for Claude Code and Codex. Multi-user, browser-based, with persistent AI mates.",
   "bin": {
     "clay-server": "./bin/cli.js",

package/lib/public/gemini-avatar.svg

@@ -1,11 +0,0 @@
-<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/yoke/adapters/gemini.js

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