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

package/lib/yoke/adapters/antigravity.js

@@ -0,0 +1,417 @@
+var childProcess = require("child_process");
+var readline = require("readline");
+var skillDiscovery = require("../skill-discovery");
+
+function findBinary() {
+  if (process.env.ANTIGRAVITY_CLI_PATH) return process.env.ANTIGRAVITY_CLI_PATH;
+  try {
+    var command = process.platform === "win32" ? "where" : "which";
+    return childProcess.execFileSync(command, ["agy"], {
+      encoding: "utf8",
+      timeout: 3000,
+      stdio: ["pipe", "pipe", "pipe"],
+    }).trim().split(/\r?\n/)[0] || null;
+  } catch (e) {
+    return null;
+  }
+}
+
+function modelValue(model) {
+  if (typeof model === "string") return model;
+  return model && (model.id || model.slug || model.value || model.model);
+}
+
+function parseModels(stdout) {
+  try {
+    var parsed = JSON.parse(String(stdout || ""));
+    var list = Array.isArray(parsed) ? parsed : (parsed.models || parsed.data || []);
+    var models = [];
+    for (var i = 0; i < list.length; i++) {
+      var value = modelValue(list[i]);
+      if (value && models.indexOf(value) === -1) models.push(value);
+    }
+    return models;
+  } catch (e) {
+    var lines = String(stdout || "").split(/\r?\n/);
+    var fallback = [];
+    for (var j = 0; j < lines.length; j++) {
+      var match = lines[j].trim().match(/^([^\s]+)\s+/);
+      if (match && fallback.indexOf(match[1]) === -1) fallback.push(match[1]);
+    }
+    return fallback;
+  }
+}
+
+function fetchModels(binaryPath, cwd) {
+  return new Promise(function(resolve) {
+    childProcess.execFile(binaryPath, ["models", "--output-format", "json"], {
+      cwd: cwd || process.cwd(),
+      timeout: 20000,
+      maxBuffer: 4 * 1024 * 1024,
+    }, function(err, stdout) {
+      if (err || !stdout) { resolve([]); return; }
+      resolve(parseModels(stdout));
+    });
+  });
+}
+
+function isAuthError(value) {
+  return /authentication required|not authenticated|sign in|log ?in|credentials|unauthorized|forbidden|\b401\b/i.test(String(value || ""));
+}
+
+function toolName(name) {
+  var value = String(name || "").toLowerCase();
+  if (value === "run_command" || value === "shell" || value === "bash") return "Bash";
+  if (value.indexOf("read") !== -1) return "Read";
+  if (value.indexOf("write") !== -1 || value.indexOf("create") !== -1) return "Write";
+  if (value.indexOf("edit") !== -1 || value.indexOf("replace") !== -1 || value.indexOf("delete") !== -1) return "Edit";
+  if (value.indexOf("search_web") !== -1 || value.indexOf("web_search") !== -1) return "WebSearch";
+  if (value.indexOf("fetch") !== -1 || value.indexOf("url") !== -1) return "WebFetch";
+  if (value.indexOf("search") !== -1 || value.indexOf("grep") !== -1) return "Grep";
+  if (value.indexOf("glob") !== -1 || value.indexOf("find") !== -1) return "Glob";
+  if (value.indexOf("subagent") !== -1 || value.indexOf("task") !== -1) return "Task";
+  return name || "Tool";
+}
+
+function createAntigravityQueryHandle(binaryPath, queryOpts, onFinished) {
+  var processHandle = null;
+  var outputReader = null;
+  var events = [];
+  var eventWaiter = null;
+  var messages = [];
+  var started = false;
+  var activeTurn = false;
+  var ended = false;
+  var inputEnded = false;
+  var finished = false;
+  var stderr = "";
+  var sessionId = queryOpts.resumeSessionId || null;
+  var model = queryOpts.model || "auto";
+  var effort = queryOpts.effort || null;
+  var toolPolicy = queryOpts.dangerouslySkipPermissions ? "allow-all" : "ask";
+  var blockCounter = 0;
+  var textBlockId = null;
+  var toolBlocks = {};
+  var latestUsage = null;
+  var firstMessage = true;
+
+  function notifyFinished() {
+    if (finished) return;
+    finished = true;
+    if (typeof onFinished === "function") onFinished();
+  }
+
+  function pushEvent(event) {
+    if (ended) return;
+    if (eventWaiter) {
+      var resolve = eventWaiter;
+      eventWaiter = null;
+      resolve({ value: event, done: false });
+    } else {
+      events.push(event);
+    }
+  }
+
+  function endEvents() {
+    if (ended) return;
+    ended = true;
+    if (eventWaiter) {
+      var resolve = eventWaiter;
+      eventWaiter = null;
+      resolve({ value: undefined, done: true });
+    }
+    notifyFinished();
+  }
+
+  function buildPrompt(text, images) {
+    var prompt = text || "";
+    if (firstMessage) {
+      var systemParts = [queryOpts.systemPrompt, queryOpts.appendSystemPrompt].filter(function(part) { return !!part; });
+      if (systemParts.length) prompt = systemParts.join("\n\n") + "\n\n" + prompt;
+      firstMessage = false;
+    }
+    if (images && images.length) {
+      prompt += "\n\n[Clay could not forward " + images.length + " attached image(s) because Antigravity CLI stream input currently accepts text only.]";
+    }
+    return prompt;
+  }
+
+  function writeNextMessage() {
+    if (!processHandle || !processHandle.stdin || activeTurn || !messages.length) return;
+    activeTurn = true;
+    textBlockId = null;
+    toolBlocks = {};
+    pushEvent({ yokeType: "turn_start", messageType: "user" });
+    processHandle.stdin.write(JSON.stringify({
+      event: "user",
+      message: { content: messages.shift() },
+    }) + "\n");
+  }
+
+  function finishTurn(result) {
+    result = result || {};
+    if (result.conversation_id) sessionId = result.conversation_id;
+    if (result.usage) latestUsage = result.usage;
+    var status = result.status || "SUCCESS";
+    if (status !== "SUCCESS") {
+      if (status === "CANCELED" || status === "INTERRUPTED") {
+        pushEvent({ yokeType: "interrupted" });
+      } else {
+        var errorText = result.error || "Antigravity CLI ended the turn with status " + status;
+        pushEvent(isAuthError(errorText)
+          ? { yokeType: "auth_required", vendor: "antigravity" }
+          : { yokeType: "error", text: errorText });
+      }
+    }
+    pushEvent({
+      yokeType: "result",
+      messageType: "assistant",
+      cost: null,
+      duration: typeof result.duration_seconds === "number" ? result.duration_seconds * 1000 : null,
+      usage: latestUsage ? {
+        input_tokens: latestUsage.input_tokens || 0,
+        output_tokens: latestUsage.output_tokens || 0,
+        cache_read_input_tokens: latestUsage.cache_read_tokens || 0,
+        cache_creation_input_tokens: 0,
+      } : null,
+      sessionId: sessionId,
+      lastStreamInputTokens: latestUsage ? latestUsage.input_tokens : null,
+    });
+    activeTurn = false;
+    if (messages.length) writeNextMessage();
+    else if (inputEnded && processHandle && processHandle.stdin) processHandle.stdin.end();
+  }
+
+  function handleStep(step) {
+    if (!step) return;
+    if (step.step_type === "agent_response") {
+      if (!textBlockId) {
+        textBlockId = "agy_blk_" + (++blockCounter);
+        pushEvent({ yokeType: "text_start", blockId: textBlockId });
+      }
+      if (step.text_delta) pushEvent({ yokeType: "text_delta", blockId: textBlockId, text: step.text_delta });
+      return;
+    }
+    if (step.step_type !== "tool") return;
+    var info = step.tool_info || {};
+    var id = "agy_tool_" + step.step_index;
+    var name = toolName(step.tool_name || info.name);
+    if (!toolBlocks[id]) {
+      toolBlocks[id] = "agy_blk_" + (++blockCounter);
+      pushEvent({ yokeType: "tool_start", blockId: toolBlocks[id], toolId: id, toolName: name });
+      pushEvent({ yokeType: "tool_executing", blockId: toolBlocks[id], toolId: id, toolName: name, input: info.parameters || {} });
+    }
+    if (step.state === "DONE") {
+      var error = info.error;
+      pushEvent({
+        yokeType: "tool_result",
+        blockId: toolBlocks[id],
+        toolId: id,
+        content: error ? (error.message || String(error)) : (info.output || ""),
+        isError: !!error,
+      });
+    }
+  }
+
+  function handleOutput(line) {
+    var event;
+    try { event = JSON.parse(line); } catch (e) { return; }
+    if (event.event === "init") {
+      sessionId = event.conversation_id || (event.init && event.init.conversation_id) || sessionId;
+      return;
+    }
+    if (event.event === "step_update") {
+      handleStep(event.step_update);
+      return;
+    }
+    if (event.event === "result") finishTurn(event.result);
+  }
+
+  function start() {
+    if (started || ended) return;
+    started = true;
+    var args = ["--input-format", "stream-json", "--output-format", "stream-json"];
+    if (sessionId) args.push("--conversation", sessionId);
+    if (model && model !== "auto") args.push("--model", model);
+    if (effort) args.push("--effort", effort);
+    if (toolPolicy === "allow-all") args.push("--dangerously-skip-permissions");
+    var spawnProcess = queryOpts._spawn || childProcess.spawn;
+    processHandle = spawnProcess(binaryPath, args, {
+      cwd: queryOpts.cwd || process.cwd(),
+      env: Object.assign({}, process.env, queryOpts.env || {}),
+      stdio: ["pipe", "pipe", "pipe"],
+    });
+    outputReader = readline.createInterface({ input: processHandle.stdout });
+    outputReader.on("line", handleOutput);
+    processHandle.stderr.on("data", function(chunk) {
+      stderr += String(chunk);
+      if (stderr.length > 65536) stderr = stderr.slice(-65536);
+    });
+    processHandle.on("error", function(err) {
+      pushEvent({ yokeType: "error", text: "Failed to start Antigravity CLI: " + err.message });
+      endEvents();
+    });
+    processHandle.on("exit", function(code, signal) {
+      if (!ended && activeTurn) {
+        var message = stderr.trim() || "Antigravity CLI exited before completing the turn";
+        pushEvent(isAuthError(message)
+          ? { yokeType: "auth_required", vendor: "antigravity" }
+          : { yokeType: "error", text: message + (code ? " (exit " + code + ")" : signal ? " (" + signal + ")" : "") });
+      }
+      endEvents();
+    });
+    writeNextMessage();
+  }
+
+  var handle = {
+    [Symbol.asyncIterator]: function() {
+      return {
+        next: function() {
+          if (events.length) return Promise.resolve({ value: events.shift(), done: false });
+          if (ended) return Promise.resolve({ value: undefined, done: true });
+          return new Promise(function(resolve) { eventWaiter = resolve; });
+        },
+      };
+    },
+    pushMessage: function(text, images) {
+      if (ended || inputEnded) return false;
+      messages.push(buildPrompt(text, images));
+      if (!started) start();
+      else writeNextMessage();
+      return true;
+    },
+    setModel: function(value) {
+      if (started) return Promise.reject(new Error("Antigravity CLI cannot switch models after a streaming session starts"));
+      model = value || "auto";
+      return Promise.resolve();
+    },
+    setEffort: function(value) {
+      if (started) return Promise.reject(new Error("Antigravity CLI cannot switch effort after a streaming session starts"));
+      effort = value || null;
+      return Promise.resolve();
+    },
+    setToolPolicy: function(policy) {
+      if (started) return Promise.reject(new Error("Antigravity CLI cannot switch tool policy after a streaming session starts"));
+      toolPolicy = policy === "allow-all" ? "allow-all" : "ask";
+      return Promise.resolve();
+    },
+    stopTask: function() { return Promise.resolve(); },
+    getContextUsage: function() {
+      if (!latestUsage) return Promise.resolve(null);
+      return Promise.resolve({
+        input_tokens: (latestUsage.input_tokens || 0) + (latestUsage.cache_read_tokens || 0),
+        contextWindow: null,
+      });
+    },
+    endInput: function() {
+      inputEnded = true;
+      if (!activeTurn && processHandle && processHandle.stdin) processHandle.stdin.end();
+    },
+    abort: function() {
+      if (ended) return;
+      pushEvent({ yokeType: "interrupted" });
+      if (processHandle) processHandle.kill("SIGINT");
+      endEvents();
+    },
+    close: function() {
+      inputEnded = true;
+      if (processHandle && processHandle.stdin) processHandle.stdin.end();
+      endEvents();
+    },
+  };
+  return handle;
+}
+
+function createAntigravityAdapter(opts) {
+  opts = opts || {};
+  var cwd = opts.cwd || process.cwd();
+  var binaryPath = opts._binaryPath || null;
+  var cachedModels = ["auto"];
+  var activeHandles = [];
+
+  function capabilities() {
+    return {
+      effort: true,
+      midSessionModelSwitch: false,
+      fork: false,
+      rollback: false,
+      sessionListing: false,
+      sessionRename: false,
+      thinking: false,
+      betas: false,
+      rewind: false,
+      sessionResume: true,
+      promptSuggestions: false,
+      elicitation: false,
+      fileCheckpointing: false,
+      contextCompacting: false,
+      skillSharing: true,
+      toolPolicy: ["ask", "allow-all"],
+    };
+  }
+
+  var adapter = {
+    vendor: "antigravity",
+    init: async function() {
+      if (!binaryPath) binaryPath = findBinary();
+      if (!binaryPath) throw new Error("Antigravity CLI binary not found: agy");
+      var fetched = opts._fetchModels ? await opts._fetchModels(binaryPath, cwd) : await fetchModels(binaryPath, cwd);
+      if (fetched && fetched.length) cachedModels = fetched;
+      var skills = skillDiscovery.discoverSkills(cwd).map(function(skill) { return skill.name; });
+      return {
+        models: cachedModels.slice(),
+        defaultModel: cachedModels[0] || "auto",
+        skills: skills,
+        slashCommands: skills,
+        fastModeState: null,
+        capabilities: capabilities(),
+      };
+    },
+    supportedModels: function() { return Promise.resolve(cachedModels.slice()); },
+    createToolServer: function() { return null; },
+    createQuery: async function(queryOpts) {
+      if (!binaryPath) await adapter.init();
+      queryOpts = queryOpts || {};
+      var antigravityOpts = (queryOpts.adapterOptions && queryOpts.adapterOptions.ANTIGRAVITY) || {};
+      var handle;
+      handle = createAntigravityQueryHandle(binaryPath, Object.assign({}, queryOpts, {
+        dangerouslySkipPermissions: !!antigravityOpts.dangerouslySkipPermissions,
+        env: antigravityOpts.env || null,
+        _spawn: opts._spawn || null,
+      }), function() {
+        var index = activeHandles.indexOf(handle);
+        if (index !== -1) activeHandles.splice(index, 1);
+      });
+      activeHandles.push(handle);
+      return handle;
+    },
+    generateTitle: async function(messages, titleOpts) {
+      var handle = await adapter.createQuery({
+        cwd: (titleOpts && titleOpts.cwd) || cwd,
+        systemPrompt: "Generate a concise conversation title of 3 to 8 words. Output only the title.",
+      });
+      var prompt = messages.join("\n");
+      var title = "";
+      handle.pushMessage(prompt);
+      handle.endInput();
+      for await (var event of handle) {
+        if (event.yokeType === "text_delta") title += event.text;
+      }
+      return title.trim().replace(/^['\"]|['\"]$/g, "").slice(0, 80) || "New conversation";
+    },
+    shutdown: function() {
+      var handles = activeHandles.slice();
+      for (var i = 0; i < handles.length; i++) handles[i].abort();
+      activeHandles = [];
+      return Promise.resolve(true);
+    },
+  };
+  return adapter;
+}
+
+module.exports = {
+  createAntigravityAdapter: createAntigravityAdapter,
+  createAntigravityQueryHandle: createAntigravityQueryHandle,
+  fetchModels: fetchModels,
+  parseModels: parseModels,
+};

package/lib/yoke/adapters/claude.js

@@ -197,6 +197,26 @@ function flattenEvent(raw) {
       base.summary = raw.summary || null;
       return base;
     }
+    if (raw.subtype === "background_tasks_changed") {
+      base.yokeType = "background_tasks_changed";
+      base.tasks = normalizeBackgroundTasks(raw.tasks);
+      return base;
+    }
+    if (raw.subtype === "task_updated") {
+      base.yokeType = "task_updated";
+      base.task_id = raw.task_id;
+      base.patch = raw.patch || {};
+      return base;
+    }
+    if (raw.subtype === "task_notification") {
+      base.yokeType = "task_notification";
+      base.parentToolId = raw.parent_tool_use_id;
+      base.taskId = raw.task_id;
+      base.status = raw.status || "completed";
+      base.summary = raw.summary || "";
+      base.usage = raw.usage || null;
+      return base;
+    }
     // Model refusal: the model declined and the CLI either fell back to
     // another model or ended the turn. Translate to a vendor-neutral
     // yokeType so the relay never sees SDK subtype strings.
@@ -343,6 +363,20 @@ function flattenEvent(raw) {
   return base;
 }
 
+function normalizeBackgroundTasks(tasks) {
+  if (!Array.isArray(tasks)) return [];
+  return tasks.map(function(task) {
+    var nativeType = task && task.task_type;
+    var taskType = nativeType === "local_bash" ? "shell"
+      : nativeType === "local_agent" ? "agent" : "other";
+    return {
+      task_id: task && task.task_id,
+      task_type: taskType,
+      description: (task && task.description) || "",
+    };
+  });
+}
+
 // --- QueryHandle ---
 // Wraps a raw SDK query object with the YOKE QueryHandle interface.
 // Events are flattened via flattenEvent before yielding.

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 };