clay-server 3.8.1 → 4.0.0-beta.2

package/lib/ws-schema.js

@@ -39,8 +39,11 @@ var schema = {
   "split_group_dissolve":     { direction: "c2s", handler: "lib/session-split-groups.js", description: "Separate a split group without deleting its sessions" },
   "split_group_set_pair":     { direction: "c2s", handler: "lib/session-split-groups.js", description: "Assign Driver/Worker roles on a split group (driverId null clears them)" },
   "pair_session_options":     { direction: "c2s", handler: "lib/project-session-pair.js", description: "Request vendors/models for the pair-session dialog (response reuses the same type)" },
-  "pair_session_create":      { direction: "c2s", handler: "lib/project-session-pair.js", description: "Create a Driver/Worker session pair as a split group" },
+  "pair_session_create":      { direction: "c2s", handler: "lib/project-session-pair.js", description: "Create a Driver/Split Worker session pair as a split group" },
   "worker_proposal_response": { direction: "c2s", handler: "lib/project-worker-proposal.js", description: "Accept or decline a Fable Worker suggestion with the selected runtime" },
+  "project_assignment_response": { direction: "c2s", handler: "lib/workspace-assignment-service.js", description: "Approve or cancel an exact-session cross-project assignment proposal" },
+  "home_clay_session_resolve": { direction: "c2s", handler: "lib/server-home-chat.js", description: "Resolve an opaque Mate session reference through the exact bound source session" },
+  "home_clay_session_target": { direction: "s2c", handler: "lib/public/modules/command-palette.js", description: "Return an owner-validated navigation target for a rendered Mate session reference" },
 
   "session_list":             { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Full list of sessions for the sidebar" },
   "session_switched":         { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Confirmation that active session changed" },
@@ -61,6 +64,11 @@ var schema = {
   "pair_session_created":     { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Result of pair_session_create; carries the new group" },
   "worker_proposal":          { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Inline Fable suggestion to delegate execution to a Worker" },
   "worker_proposal_update":   { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Worker suggestion lifecycle update" },
+  "project_assignment_proposal": { direction: "s2c", handler: "lib/public/modules/app-message-router.js", description: "Approval card for a new owner-bound project assignment" },
+  "project_assignment_status": { direction: "s2c", handler: "lib/public/modules/app-message-router.js", description: "Durable project assignment lifecycle update" },
+  "project_assignment_error": { direction: "s2c", handler: "lib/public/modules/app-message-router.js", description: "Rejected or stale project assignment response" },
+  "home_project_assignment_proposal": { direction: "s2c", handler: "lib/public/modules/app-message-router.js", description: "Home-projected exact-session assignment approval card" },
+  "home_project_assignment_status": { direction: "s2c", handler: "lib/public/modules/app-message-router.js", description: "Home-projected exact-session assignment lifecycle" },
   "split_delegation":         { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "A pair delegation started or ended (drives the split-view flow indicator)" },
 
   // -----------------------------------------------------------------------
@@ -163,6 +171,13 @@ var schema = {
   // Auth
   // -----------------------------------------------------------------------
   "auth_required":            { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Authentication required (e.g. API key needed)" },
+  "vendor_login_start":       { direction: "c2s", handler: "lib/project-vendor-login.js", description: "Start (or re-attach to) the per-vendor login terminal" },
+  "vendor_login_cancel":      { direction: "c2s", handler: "lib/project-vendor-login.js", description: "Dismiss the login flow and kill its terminal" },
+  "vendor_login_state_request": { direction: "c2s", handler: "lib/project-vendor-login.js", description: "Ask for the project's active login flows" },
+  "vendor_login_ready":       { direction: "s2c", handler: "lib/public/modules/vendor-login.js", description: "Login terminal is available; open/re-attach the modal to it" },
+  "vendor_login_state":       { direction: "s2c", handler: "lib/public/modules/vendor-login.js", description: "Active login flows for this project (one per vendor)" },
+  "vendor_login_error":       { direction: "s2c", handler: "lib/public/modules/vendor-login.js", description: "The login flow could not be started" },
+  "auth_refreshed":           { direction: "s2c", handler: "lib/public/modules/vendor-login.js", description: "Login completed and the vendor adapter was restarted" },
 
   // -----------------------------------------------------------------------
   // Rate limiting / scheduling
@@ -242,6 +257,14 @@ var schema = {
   "whats_new_state":          { direction: "s2c", handler: "lib/public/modules/whats-new.js", description: "Unseen What's New entries for the connecting user" },
   "whats_new_seen":           { direction: "c2s", handler: "lib/project-sessions.js", description: "Mark a What's New entry as dismissed by the current user" },
   "whats_new_seen_result":    { direction: "s2c", handler: "lib/public/modules/whats-new.js", description: "Result of marking a What's New entry seen" },
+  "home_dock_get":            { direction: "c2s", handler: "lib/server-home-preferences.js", description: "Request the current user's home dock preference" },
+  "home_dock_set":            { direction: "c2s", handler: "lib/server-home-preferences.js", description: "Persist the current user's home dock preference" },
+  "home_dock_state":          { direction: "s2c", handler: "lib/public/modules/home-dock.js", description: "Current user home dock preference" },
+  "home_surface_get":         { direction: "c2s", handler: "lib/server-home-preferences.js", description: "Request the current user's durable primary surface and Home conversation selection" },
+  "home_surface_set":         { direction: "c2s", handler: "lib/server-home-preferences.js", description: "Persist the current user's primary surface and Home conversation selection" },
+  "home_surface_state":       { direction: "s2c", handler: "lib/public/modules/home-surface.js", description: "Current user primary surface and Home conversation selection" },
+  "home_debates_list":        { direction: "c2s", handler: "lib/server-home-debates.js", description: "Request the current user's durable Home debate archive" },
+  "home_debates_state":       { direction: "s2c", handler: "lib/public/modules/home-debates-archive.js", description: "Current user's durable Home debate archive" },
 
   // -----------------------------------------------------------------------
   // Process stats
@@ -435,6 +458,30 @@ var schema = {
   "mate_available_builtins":  { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Available built-in mates list" },
   "mate_error":               { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Mate operation error" },
 
+  // -----------------------------------------------------------------------
+  // User-installed home tools
+  // -----------------------------------------------------------------------
+  "tools_list":               { direction: "c2s", handler: "lib/server-tools.js", description: "List installed tool definitions" },
+  "tool_get":                 { direction: "c2s", handler: "lib/server-tools.js", description: "Get one installed tool definition" },
+  "tool_install":             { direction: "c2s", handler: "lib/server-tools.js", description: "Install a new declarative tool" },
+  "tool_source_get":          { direction: "c2s", handler: "lib/server-tools.js", description: "Read authored Capsule source for the current user" },
+  "tool_mate_access_set":     { direction: "c2s", handler: "lib/server-tools.js", description: "Set whether Mates may inspect and edit one Capsule" },
+  "tool_remove":              { direction: "c2s", handler: "lib/server-tools.js", description: "Remove an installed tool" },
+  "tool_storage_op":          { direction: "c2s", handler: "lib/server-tools.js", description: "Run an operation against scoped tool storage" },
+  "tool_llm_op":              { direction: "c2s", handler: "lib/server-tools.js", description: "Run a permission-gated vendor-neutral capsule LLM completion" },
+  "tool_llm_config_get":      { direction: "c2s", handler: "lib/server-tools.js", description: "Get the concrete configured provider and model used by Capsule LLM calls" },
+  "tool_control_response":    { direction: "c2s", handler: "lib/server-tools.js", description: "Resolve a mate tool-control request with browser runtime state or an error" },
+  "tools_state":              { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Full installed tool definitions" },
+  "tool_installed":           { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "An installed tool changed" },
+  "tool_source_state":        { direction: "s2c", handler: "lib/public/modules/home-capsule-source.js", description: "Correlated authored Capsule source or read error" },
+  "tool_mate_access_state":   { direction: "s2c", handler: "lib/public/modules/home-capsule-source.js", description: "Server-confirmed Mate editing permission" },
+  "tool_removed":             { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "An installed tool was removed" },
+  "tool_storage_result":      { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Result of a scoped tool storage operation" },
+  "tool_llm_result":          { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Result of a capsule LLM completion" },
+  "tool_llm_config_state":    { direction: "s2c", handler: "lib/public/modules/tool-llm-status.js", description: "Concrete provider and model state for Capsule LLM calls" },
+  "tool_control_request":     { direction: "s2c", handler: "lib/public/modules/home-tools.js", description: "Ask the connected home client to snapshot or drive a sandboxed tool" },
+  "tools_error":              { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Tool registry, runtime, or storage error" },
+
   // -----------------------------------------------------------------------
   // Mentions (@mate)
   // -----------------------------------------------------------------------
@@ -458,7 +505,7 @@ var schema = {
   "debate_stop":              { direction: "c2s", handler: "lib/project.js", description: "Stop the current debate" },
   "debate_conclude_response": { direction: "c2s", handler: "lib/project.js", description: "Respond to a debate conclude prompt (end or continue)" },
   "debate_confirm_brief":     { direction: "c2s", handler: "lib/project.js", description: "Confirm the debate brief and start the debate" },
-  "debate_proposal_response": { direction: "c2s", handler: "lib/project.js", description: "Respond to a debate proposal" },
+  "debate_proposal_response": { direction: "c2s", handler: "lib/project.js", description: "Respond to a debate proposal with optional per-participant model overrides" },
   "debate_user_floor_response": { direction: "c2s", handler: "lib/project.js", description: "User submits their statement during user floor turn" },
   "debate_preparing":         { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Debate is being prepared" },
   "debate_brief_ready":       { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Debate brief is ready for user approval" },
@@ -467,6 +514,9 @@ var schema = {
   "debate_activity":          { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Debate panelist activity indicator" },
   "debate_stream":            { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Incremental debate response text" },
   "debate_turn_done":         { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Debate turn completed with full text" },
+  "debate_tool_decision":     { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Moderator tool permission decision for a debate participant" },
+  "debate_stop_requested":    { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Debate will stop after the active turn" },
+  "debate_stop_cancelled":    { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Pending debate stop was cancelled" },
   "debate_hand_raised":       { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "User hand raise was acknowledged" },
   "debate_comment_queued":    { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "User comment was queued for injection" },
   "debate_comment_injected":  { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "User comment was injected into the debate" },
@@ -556,16 +606,47 @@ var schema = {
   "ralph_files_content":      { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Loop file contents (prompt and judge)" },
 
   // -----------------------------------------------------------------------
-  // Home Chat (Clay host agent)
-  // -----------------------------------------------------------------------
-  "home_clay_open":           { direction: "c2s", handler: "lib/server-clay-home.js", description: "Open/restore the user's Clay home chat session" },
-  "home_clay_send":           { direction: "c2s", handler: "lib/server-clay-home.js", description: "Send a message to Clay from the home chat" },
-  "home_clay_new_session":    { direction: "c2s", handler: "lib/server-clay-home.js", description: "Start a fresh Clay home chat session" },
-  "home_clay_close":          { direction: "c2s", handler: "lib/server-clay-home.js", description: "Tear down the home-chat tap on the user's WS" },
-  "home_clay_history":        { direction: "s2c", handler: "lib/public/modules/home-chat.js", description: "Initial / refreshed Clay home chat history" },
-  "home_clay_delta":          { direction: "s2c", handler: "lib/public/modules/home-chat.js", description: "Streaming assistant text delta for home chat" },
-  "home_clay_done":           { direction: "s2c", handler: "lib/public/modules/home-chat.js", description: "Clay turn finished" },
-  "home_clay_error":          { direction: "s2c", handler: "lib/public/modules/home-chat.js", description: "Home chat error" }
+  // Embedded mate chat
+  // -----------------------------------------------------------------------
+  "home_mate_open":           { direction: "c2s", handler: "lib/server-home-chat.js", description: "Open or restore the selected mate's embedded chat session" },
+  "home_clay_ask":            { direction: "c2s", handler: "lib/server-home-chat.js", description: "Start a fresh builtin Clay conversation from the global search drawer" },
+  "home_mate_sessions_list":  { direction: "c2s", handler: "lib/server-home-chat.js", description: "List the current user's conversations with the selected mate" },
+  "home_mate_session_open":   { direction: "c2s", handler: "lib/server-home-chat.js", description: "Open one explicit conversation with the selected mate" },
+  "home_mate_send":           { direction: "c2s", handler: "lib/server-home-chat.js", description: "Send a message to the selected mate from the home hub" },
+  "home_mate_new_session":    { direction: "c2s", handler: "lib/server-home-chat.js", description: "Start a fresh embedded session with the selected mate, optionally with a typed creation intent" },
+  "home_mate_debate_plan":    { direction: "c2s", handler: "lib/server-home-chat.js", description: "Start a fresh server-seeded debate planning conversation with Clay using an optional prefilled topic" },
+  "home_mate_creation_plan":  { direction: "c2s", handler: "lib/server-home-chat.js", description: "Start a fresh server-seeded Mate creation interview with Clay" },
+  "home_mate_creation_question_response": { direction: "c2s", handler: "lib/server-home-chat.js", description: "Answer an exact pending question in a Clay-led Mate creation interview" },
+  "home_mate_creation_proposal_response": { direction: "c2s", handler: "lib/server-home-chat.js", description: "Approve or cancel an exact Mate creation proposal" },
+  "home_debate_proposal_response": { direction: "c2s", handler: "lib/server-home-chat.js", description: "Approve or cancel an exact Home debate proposal with optional per-participant model overrides" },
+  "home_debate_question_response": { direction: "c2s", handler: "lib/server-home-chat.js", description: "Answer the exact pending AskUserQuestion in an owned Home debate planning session" },
+  "home_debate_control":      { direction: "c2s", handler: "lib/server-home-chat.js", description: "Control or resume the exact owned Home debate session" },
+  "home_mate_close":          { direction: "c2s", handler: "lib/server-home-chat.js", description: "Tear down the embedded mate session tap" },
+  "home_mate_present":        { direction: "c2s", handler: "lib/server-home-chat.js", description: "Report whether Home is visibly presenting its active exact Mate conversation" },
+  "home_mate_memory_list":    { direction: "c2s", handler: "lib/server-home-chat.js", description: "Request a correlated read-only memory projection for one owned Mate" },
+  "home_mate_knowledge_list": { direction: "c2s", handler: "lib/server-home-chat.js", description: "Request a correlated read-only knowledge file list for one owned Mate" },
+  "home_mate_models_get":     { direction: "c2s", handler: "lib/server-home-chat.js", description: "Request an available vendor and model catalog for the selected Mate" },
+  "home_mate_model_set":      { direction: "c2s", handler: "lib/server-home-chat.js", description: "Validate and persist the Mate vendor/model, optionally applying it to an exact owned pristine Home draft" },
+  "home_mate_history":        { direction: "s2c", handler: "lib/public/modules/home-mate-chat.js", description: "Selected mate's initial or refreshed chat history" },
+  "home_clay_activity":       { direction: "s2c", handler: "lib/public/modules/search-clay-chat.js", description: "Sanitized progress stage for a query-bound global-search Clay conversation" },
+  "home_mate_session_identity": { direction: "s2c", handler: "lib/public/modules/app-message-router.js", description: "Promote an active Home session from its local reference to its durable runtime identity" },
+  "home_mate_sessions_state": { direction: "s2c", handler: "lib/public/modules/home-mate-chat.js", description: "Owned visible Mate conversations with sanitized runtime identity, model, status, and timestamps" },
+  "home_mate_delta":          { direction: "s2c", handler: "lib/public/modules/home-mate-chat.js", description: "Selected mate's streaming assistant text delta" },
+  "home_mate_done":           { direction: "s2c", handler: "lib/public/modules/home-mate-chat.js", description: "Selected mate's turn finished" },
+  "home_debate_proposal":     { direction: "s2c", handler: "lib/public/modules/app-message-router.js", description: "Session-bound debate proposal for the active Home transcript" },
+  "home_debate_proposal_resolved": { direction: "s2c", handler: "lib/public/modules/app-message-router.js", description: "Server-confirmed result for a Home debate proposal" },
+  "home_debate_question":     { direction: "s2c", handler: "lib/public/modules/app-message-router.js", description: "Session-bound AskUserQuestion card for Home debate planning" },
+  "home_debate_question_resolved": { direction: "s2c", handler: "lib/public/modules/app-message-router.js", description: "Server-confirmed answer or expiry for a Home debate question" },
+  "home_debate_event":       { direction: "s2c", handler: "lib/public/modules/app-message-router.js", description: "Correlated live debate event for the active Home transcript" },
+  "home_mate_creation_question": { direction: "s2c", handler: "lib/public/modules/app-message-router.js", description: "Session-bound question in a Clay-led Mate creation interview" },
+  "home_mate_creation_question_resolved": { direction: "s2c", handler: "lib/public/modules/app-message-router.js", description: "Server-confirmed Mate interview answer or expiry" },
+  "home_mate_creation_proposal": { direction: "s2c", handler: "lib/public/modules/app-message-router.js", description: "Session-bound new Mate proposal" },
+  "home_mate_creation_proposal_resolved": { direction: "s2c", handler: "lib/public/modules/app-message-router.js", description: "Server-confirmed result for a Mate creation proposal" },
+  "home_mate_error":          { direction: "s2c", handler: "lib/public/modules/home-mate-chat.js", description: "Embedded mate chat error" },
+  "home_mate_memory_state":   { direction: "s2c", handler: "lib/public/modules/home-mate-settings.js", description: "Selected mate's read-only memory summary and entries" },
+  "home_mate_knowledge_state": { direction: "s2c", handler: "lib/public/modules/home-mate-settings.js", description: "Selected mate's read-only knowledge file list" },
+  "home_mate_models_state":   { direction: "s2c", handler: "lib/public/modules/home-mate-settings.js", description: "Correlated Mate model catalog state" },
+  "home_mate_model_result":   { direction: "s2c", handler: "lib/public/modules/home-mate-settings.js", description: "Correlated Mate model selection result" }
 };
 
 module.exports = { schema: schema };

package/lib/yoke/adapters/acp.js

@@ -220,7 +220,7 @@ function createAcpAdapter(vendor, opts) {
       if (!initialized || !acp || !acp.started) await adapter.init(queryOpts);
       if (shuttingDown) throw new Error(driver.displayName + " adapter is shutting down");
       var controller = queryOpts.abortController || new AbortController();
-      var sharedSkills = skillDiscovery.discoverSkills(queryOpts.cwd || cwd);
+      var sharedSkills = queryOpts.skipSkills ? [] : skillDiscovery.discoverSkills(queryOpts.cwd || cwd);
       var skillIndex = skillDiscovery.buildSkillIndex(sharedSkills);
       var acpOptions = (queryOpts.adapterOptions && queryOpts.adapterOptions.ACP) || {};
       var handle = null;
@@ -254,6 +254,7 @@ function createAcpAdapter(vendor, opts) {
       for (var i = 0; i < messages.length; i++) prompt += "User message " + (i + 1) + ": " + messages[i] + "\n";
       var handle = await adapter.createQuery({
         cwd: (titleOpts && titleOpts.cwd) || cwd,
+        env: titleOpts && titleOpts.env,
         systemPrompt: "You generate concise conversation titles. Output only the title.",
         canUseTool: function() { return Promise.resolve({ behavior: "deny" }); },
       });

package/lib/yoke/adapters/antigravity.js

@@ -376,7 +376,7 @@ function createAntigravityAdapter(opts) {
       var handle;
       handle = createAntigravityQueryHandle(binaryPath, Object.assign({}, queryOpts, {
         dangerouslySkipPermissions: !!antigravityOpts.dangerouslySkipPermissions,
-        env: antigravityOpts.env || null,
+        env: antigravityOpts.env || queryOpts.env || null,
         _spawn: opts._spawn || null,
       }), function() {
         var index = activeHandles.indexOf(handle);
@@ -388,6 +388,7 @@ function createAntigravityAdapter(opts) {
     generateTitle: async function(messages, titleOpts) {
       var handle = await adapter.createQuery({
         cwd: (titleOpts && titleOpts.cwd) || cwd,
+        env: titleOpts && titleOpts.env,
         systemPrompt: "Generate a concise conversation title of 3 to 8 words. Output only the title.",
       });
       var prompt = messages.join("\n");

package/lib/yoke/adapters/claude-worker.js

@@ -491,10 +491,12 @@ async function handleQueryStart(msg) {
     }
     return cp;
   };
+  var nativeUserInput = options.userInputMode !== "fallback";
+  delete options.userInputMode;
   options.canUseTool = function(toolName, input, toolOpts) {
     // AskUserQuestion is handled specially: we send it as a separate IPC type
     // so the daemon can use its own AskUserQuestion handling logic
-    if (toolName === "AskUserQuestion") {
+    if (toolName === "AskUserQuestion" && nativeUserInput) {
       var toolUseId = toolOpts.toolUseID || "";
       sendToDaemon({
         type: "ask_user_request",
@@ -511,11 +513,16 @@ async function handleQueryStart(msg) {
         }
       });
     }
+    if (toolName === "AskUserQuestion") {
+      return Promise.resolve({ behavior: "deny", message: "Use the query's structured input fallback tool." });
+    }
     return canUseTool(toolName, input, toolOpts);
   };
-  options.onElicitation = function(request, elicitOpts) {
-    return onElicitation(request, elicitOpts);
-  };
+  if (nativeUserInput) {
+    options.onElicitation = function(request, elicitOpts) {
+      return onElicitation(request, elicitOpts);
+    };
+  }
   // supportedDialogKinds arrives serialized via msg.options (already on `options`);
   // the callback is non-serializable so we wire it here.
   options.onUserDialog = function(request, dialogOpts) {

package/lib/yoke/adapters/claude.js

@@ -12,6 +12,7 @@ var crypto = require("crypto");
 var { spawn } = require("child_process");
 var { resolveOsUserInfo } = require("../../os-users");
 var skillDiscovery = require("../skill-discovery");
+var claudeUserInput = require("../claude-user-input");
 
 // SDK-specific knowledge stays in the adapter (not the relay): the host dialog
 // kinds this client can render, declared to the SDK when an onUserDialog
@@ -26,6 +27,36 @@ function getSharedSkillPlugins(homeDir, existingPlugins) {
   return plugins;
 }
 
+function buildWorkerQueryOptions(queryOpts, claudeOpts, workerCwd) {
+  var queryOptions = {
+    cwd: workerCwd,
+    userInputMode: queryOpts.userInputMode || "auto",
+  };
+  if (queryOpts.env) queryOptions.env = queryOpts.env;
+  queryOptions.settingSources = claudeOpts.settingSources || ["user", "project", "local"];
+  if (queryOpts.title) queryOptions.title = queryOpts.title;
+  if (claudeOpts.includePartialMessages != null) queryOptions.includePartialMessages = claudeOpts.includePartialMessages;
+  if (claudeOpts.enableFileCheckpointing != null) queryOptions.enableFileCheckpointing = claudeOpts.enableFileCheckpointing;
+  if (claudeOpts.extraArgs) queryOptions.extraArgs = claudeOpts.extraArgs;
+  if (claudeOpts.promptSuggestions != null) queryOptions.promptSuggestions = claudeOpts.promptSuggestions;
+  if (claudeOpts.agentProgressSummaries != null) queryOptions.agentProgressSummaries = claudeOpts.agentProgressSummaries;
+  if (claudeOpts.thinking) queryOptions.thinking = claudeOpts.thinking;
+  if (claudeOpts.betas && claudeOpts.betas.length > 0) queryOptions.betas = claudeOpts.betas;
+  if (claudeOpts.permissionMode) queryOptions.permissionMode = claudeOpts.permissionMode;
+  if (claudeOpts.allowDangerouslySkipPermissions) queryOptions.allowDangerouslySkipPermissions = true;
+  if (claudeOpts.settings) queryOptions.settings = claudeOpts.settings;
+  if (queryOpts.appendSystemPrompt) queryOptions.systemPrompt = { type: "preset", preset: "claude_code", append: queryOpts.appendSystemPrompt };
+  queryOptions.plugins = queryOpts.skipSkills ? (claudeOpts.plugins || []) : getSharedSkillPlugins(claudeOpts.originalHome, claudeOpts.plugins);
+  if (queryOpts.toolServerDescriptors) queryOptions.mcpServerDescriptors = queryOpts.toolServerDescriptors;
+  if (queryOpts.onUserDialog) queryOptions.supportedDialogKinds = SUPPORTED_DIALOG_KINDS;
+  if (queryOpts.model) queryOptions.model = queryOpts.model;
+  if (queryOpts.effort) queryOptions.effort = queryOpts.effort;
+  if (queryOpts.resumeSessionId) queryOptions.resume = queryOpts.resumeSessionId;
+  if (queryOpts.persistSession === false) queryOptions.persistSession = false;
+  if (claudeOpts.resumeSessionAt) queryOptions.resumeSessionAt = claudeOpts.resumeSessionAt;
+  return queryOptions;
+}
+
 // --- SDK loading ---
 // Async loader (ESM dynamic import, same pattern as current project.js getSDK)
 var _sdkPromise = null;
@@ -843,7 +874,7 @@ function serializeWorkerValue(value, seen) {
 // in-process QueryHandle. This allows processQueryStream to iterate a worker
 // query identically to an in-process query.
 
-function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool, onUserDialog) {
+function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool, onUserDialog, onUserInputRequest) {
   // Async iterable state
   var iterQueue = [];
   var iterWaiting = null;
@@ -910,8 +941,8 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool,
         break;
 
       case "ask_user_request":
-        if (canUseTool) {
-          canUseTool("AskUserQuestion", msg.input, {
+        if (onUserInputRequest) {
+          claudeUserInput.ask(onUserInputRequest, msg.input, {
             toolUseID: msg.toolUseId,
             signal: { addEventListener: function() {} },
           }).then(function(result) {
@@ -923,17 +954,24 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool,
         break;
 
       case "elicitation_request":
-        if (onElicitation) {
-          onElicitation({
+        if (onUserInputRequest || onElicitation) {
+          var workerElicitationRequest = {
             serverName: msg.serverName,
             message: msg.message,
             mode: msg.mode,
             url: msg.url,
             elicitationId: msg.elicitationId,
             requestedSchema: msg.requestedSchema,
-          }, {
+          };
+          var workerElicitation = onUserInputRequest
+            ? claudeUserInput.elicitation(onUserInputRequest, workerElicitationRequest, {
+              requestId: msg.requestId,
+              signal: { addEventListener: function() {} },
+            })
+            : onElicitation(workerElicitationRequest, {
             signal: { addEventListener: function() {} },
-          }).then(function(result) {
+          });
+          workerElicitation.then(function(result) {
             worker.send({ type: "elicitation_response", requestId: msg.requestId, result: result });
           }).catch(function(e) {
             console.error("[yoke/claude] elicitation_response send failed:", e.message || e);
@@ -1206,12 +1244,14 @@ function createClaudeAdapter(opts) {
   var _cwd = (opts && opts.cwd) || process.cwd();
   var _cachedModels = [];
   var _claudeBinaryPath = resolveClaudeBinaryPath();
+  var _querySDK = (opts && opts.loadSDK) || loadSDK;
 
   // Path to the worker script (for OS-level user isolation)
   var workerScriptPath = path.join(__dirname, "claude-worker.js");
 
   var adapter = {
     vendor: "claude",
+    userInputCapability: { mode: "native", native: true, transport: "AskUserQuestion/onElicitation" },
 
     // Path to worker script (sdk-bridge uses this to spawn worker processes)
     workerScriptPath: workerScriptPath,
@@ -1396,7 +1436,7 @@ function createClaudeAdapter(opts) {
       }
 
       // In-process path
-      var sdk = await loadSDK();
+      var sdk = await _querySDK();
       var mq = createMessageQueue();
       var ac = queryOpts.abortController || new AbortController();
 
@@ -1405,6 +1445,7 @@ function createClaudeAdapter(opts) {
         cwd: queryOpts.cwd || _cwd,
         abortController: ac,
       };
+      if (queryOpts.env) sdkOptions.env = queryOpts.env;
       if (_claudeBinaryPath) sdkOptions.pathToClaudeCodeExecutable = _claudeBinaryPath;
 
       // YOKE standard options -> SDK options
@@ -1418,13 +1459,19 @@ function createClaudeAdapter(opts) {
       if (queryOpts.model) sdkOptions.model = queryOpts.model;
       if (queryOpts.effort) sdkOptions.effort = queryOpts.effort;
       if (queryOpts.toolServers) sdkOptions.mcpServers = queryOpts.toolServers;
-      if (queryOpts.canUseTool) sdkOptions.canUseTool = queryOpts.canUseTool;
-      if (queryOpts.onElicitation) sdkOptions.onElicitation = queryOpts.onElicitation;
+      var nativeUserInputHandler = queryOpts.userInputMode === "fallback" ? null : queryOpts.onUserInputRequest;
+      if (queryOpts.canUseTool || nativeUserInputHandler) {
+        sdkOptions.canUseTool = claudeUserInput.canUseTool(Object.assign({}, queryOpts, { onUserInputRequest: nativeUserInputHandler }));
+      }
+      if (nativeUserInputHandler) {
+        sdkOptions.onElicitation = function (request, elicitOpts) { return claudeUserInput.elicitation(nativeUserInputHandler, request, elicitOpts); };
+      } else if (queryOpts.userInputMode !== "fallback" && queryOpts.onElicitation) sdkOptions.onElicitation = queryOpts.onElicitation;
       if (queryOpts.onUserDialog) {
         sdkOptions.onUserDialog = queryOpts.onUserDialog;
         sdkOptions.supportedDialogKinds = SUPPORTED_DIALOG_KINDS;
       }
       if (queryOpts.resumeSessionId) sdkOptions.resume = queryOpts.resumeSessionId;
+      if (queryOpts.persistSession === false) sdkOptions.persistSession = false;
 
       // Claude-specific options from adapterOptions.CLAUDE
       // Always set settingSources explicitly. SDK 0.2.119+ defaults to
@@ -1445,12 +1492,20 @@ function createClaudeAdapter(opts) {
       if (co.allowDangerouslySkipPermissions) sdkOptions.allowDangerouslySkipPermissions = true;
       if (co.resumeSessionAt) sdkOptions.resumeSessionAt = co.resumeSessionAt;
       if (co.settings) sdkOptions.settings = co.settings;
-      sdkOptions.plugins = getSharedSkillPlugins(co.originalHome, co.plugins);
+      sdkOptions.plugins = queryOpts.skipSkills ? (co.plugins || []) : getSharedSkillPlugins(co.originalHome, co.plugins);
 
       var rawQuery = sdk.query({ prompt: mq, options: sdkOptions });
       return createQueryHandle(rawQuery, mq, ac);
     },
 
+    createOneShotQuery: async function(queryOpts) {
+      var handle = await adapter.createQuery(Object.assign({}, queryOpts || {}, {
+        persistSession: false,
+        resumeSessionId: null,
+      }));
+      return { handle: handle, backendPersistence: "ephemeral" };
+    },
+
     // --- Title generation ---
     generateTitle: async function(messages, opts) {
       console.log("[auto-title/claude] generateTitle called with " + messages.length + " messages");
@@ -1463,6 +1518,7 @@ function createClaudeAdapter(opts) {
       console.log("[auto-title/claude] Creating query with model=haiku...");
       var handle = await adapter.createQuery({
         cwd: (opts && opts.cwd) || _cwd,
+        env: opts && opts.env,
         systemPrompt: systemPrompt,
         model: "haiku",
         adapterOptions: {
@@ -1573,44 +1629,17 @@ function createClaudeAdapter(opts) {
     }
 
     // Create the worker query handle (sets up message handler on worker)
-    var handle = createWorkerQueryHandle(worker, queryOpts.canUseTool, queryOpts.onElicitation, queryOpts.callMcpTool, queryOpts.onUserDialog);
+    var workerUserInputHandler = queryOpts.userInputMode === "fallback" ? null : queryOpts.onUserInputRequest;
+    var workerElicitationHandler = queryOpts.userInputMode === "fallback" ? null : queryOpts.onElicitation;
+    var handle = createWorkerQueryHandle(worker, queryOpts.canUseTool, workerElicitationHandler, queryOpts.callMcpTool, queryOpts.onUserDialog, workerUserInputHandler);
 
     // Wait for worker to be ready before sending query_start
     if (!reusingWorker) {
       await worker.readyPromise;
     }
 
-    // Build serializable query options (no callbacks, no AbortController)
-    var queryOptions = {
-      cwd: workerCwd,
-    };
-    // Always set settingSources explicitly. See in-process path comment
-    // above for the SDK 0.2.119+ default-change rationale.
-    queryOptions.settingSources = claudeOpts.settingSources || ["user", "project", "local"];
-    if (queryOpts.title) queryOptions.title = queryOpts.title;
-    if (claudeOpts.includePartialMessages != null) queryOptions.includePartialMessages = claudeOpts.includePartialMessages;
-    if (claudeOpts.enableFileCheckpointing != null) queryOptions.enableFileCheckpointing = claudeOpts.enableFileCheckpointing;
-    if (claudeOpts.extraArgs) queryOptions.extraArgs = claudeOpts.extraArgs;
-    if (claudeOpts.promptSuggestions != null) queryOptions.promptSuggestions = claudeOpts.promptSuggestions;
-    if (claudeOpts.agentProgressSummaries != null) queryOptions.agentProgressSummaries = claudeOpts.agentProgressSummaries;
-    if (claudeOpts.thinking) queryOptions.thinking = claudeOpts.thinking;
-    if (claudeOpts.betas && claudeOpts.betas.length > 0) queryOptions.betas = claudeOpts.betas;
-    if (claudeOpts.permissionMode) queryOptions.permissionMode = claudeOpts.permissionMode;
-    if (claudeOpts.allowDangerouslySkipPermissions) queryOptions.allowDangerouslySkipPermissions = true;
-    if (claudeOpts.settings) queryOptions.settings = claudeOpts.settings;
-    // Same additive mapping as the in-process path: never pass a plain
-    // string (it would replace the whole Claude Code system prompt).
-    if (queryOpts.appendSystemPrompt) {
-      queryOptions.systemPrompt = { type: "preset", preset: "claude_code", append: queryOpts.appendSystemPrompt };
-    }
-    queryOptions.plugins = getSharedSkillPlugins(claudeOpts.originalHome, claudeOpts.plugins);
-
-    if (queryOpts.toolServerDescriptors) queryOptions.mcpServerDescriptors = queryOpts.toolServerDescriptors;
-    if (queryOpts.onUserDialog) queryOptions.supportedDialogKinds = SUPPORTED_DIALOG_KINDS;
-    if (queryOpts.model) queryOptions.model = queryOpts.model;
-    if (queryOpts.effort) queryOptions.effort = queryOpts.effort;
-    if (queryOpts.resumeSessionId) queryOptions.resume = queryOpts.resumeSessionId;
-    if (claudeOpts.resumeSessionAt) queryOptions.resumeSessionAt = claudeOpts.resumeSessionAt;
+    // Build serializable query options (no callbacks, no AbortController).
+    var queryOptions = buildWorkerQueryOptions(queryOpts, claudeOpts, workerCwd);
 
     // Send query_start; the caller pushes the initial message via handle.pushMessage()
     // which routes through worker IPC.
@@ -1868,6 +1897,7 @@ module.exports = {
     hasWritableWorkerConnection: hasWritableWorkerConnection,
     sendWorkerMessage: sendWorkerMessage,
     canReuseWorker: canReuseWorker,
+    buildWorkerQueryOptions: buildWorkerQueryOptions,
     normalizeEvent: flattenEvent,
   },
 };

package/lib/yoke/adapters/codex.js

@@ -10,6 +10,7 @@ var INITIALIZE_TIMEOUT_MS = require("../interface").INITIALIZE_TIMEOUT_MS;
 var skillDiscovery = require("../skill-discovery");
 var { resolveOsUserInfo } = require("../../os-users");
 var backgroundTasks = require("../codex-background-tasks");
+var codexUserInput = require("../codex-user-input");
 
 // --- Event flattening ---
 // Converts app-server JSON-RPC notifications into flat objects with a yokeType field.
@@ -726,6 +727,7 @@ function createCodexQueryHandle(appServer, queryOpts) {
   var canUseTool = queryOpts.canUseTool || null;
   var callDynamicTool = queryOpts.callDynamicTool || null;
   var onElicitation = queryOpts.onElicitation || null;
+  var onUserInputRequest = queryOpts.onUserInputRequest || null;
   var onFinished = queryOpts.onFinished || null;
 
   // Check if the query was cancelled (either via handle.abort() or direct signal abort)
@@ -925,12 +927,23 @@ function createCodexQueryHandle(appServer, queryOpts) {
       return;
     }
 
-    // MCP tool approval / elicitation (app-server uses mcpServer/elicitation/request)
-    if (method === "item/tool/requestUserInput" || method === "mcpServer/elicitation/request") {
+    if (method === "item/tool/requestUserInput") {
+      if (!onUserInputRequest) {
+        appServer.respondError(msg.id, -32002, "This query cannot request structured user input.");
+        return;
+      }
+      codexUserInput.handleNative(appServer, msg, onUserInputRequest, state.threadId, abortController && abortController.signal);
+      return;
+    }
+
+    // MCP elicitation shares the YOKE user-input lifecycle when available.
+    if (method === "mcpServer/elicitation/request") {
       var mcpParams = msg.params || {};
       var mcpMeta = mcpParams._meta || {};
       console.log("[yoke/codex] MCP approval request:", (mcpMeta.tool || "?"), "server=" + (mcpParams.serverName || "?"));
-      if (onElicitation) {
+      if (onUserInputRequest) {
+        codexUserInput.handleElicitation(appServer, msg, onUserInputRequest, abortController && abortController.signal);
+      } else if (onElicitation) {
         var request = {
           serverName: mcpParams.serverName || (mcpMeta.tool || "Tool"),
           message: mcpParams.message || mcpParams.prompt || "",
@@ -1049,6 +1062,7 @@ function createCodexQueryHandle(appServer, queryOpts) {
         cwd: queryOpts.cwd,
         skipGitRepoCheck: true,
       };
+      if (queryOpts.ephemeral === true) threadParams.ephemeral = true;
       if (queryOpts.modelReasoningEffort) {
         threadParams.modelReasoningEffort = queryOpts.modelReasoningEffort;
       }
@@ -1079,6 +1093,11 @@ function createCodexQueryHandle(appServer, queryOpts) {
         threadResult = await appServer.send("thread/start", threadParams, 60000);
       }
 
+      if (queryOpts.ephemeral === true
+          && (!threadResult || !threadResult.thread || threadResult.thread.ephemeral !== true)) {
+        throw new Error("Codex did not confirm an ephemeral one-shot thread.");
+      }
+
       if (threadResult && threadResult.thread) {
         state.threadId = threadResult.thread.id;
         handlerEntry.threadId = state.threadId;
@@ -1110,7 +1129,7 @@ function createCodexQueryHandle(appServer, queryOpts) {
 
         // Explicit references use Codex's native skill input item regardless of
         // which vendor owns the SKILL.md file.
-        var availableSkills = skillDiscovery.discoverSkills(queryOpts.cwd);
+        var availableSkills = queryOpts.skipSkills ? [] : skillDiscovery.discoverSkills(queryOpts.cwd);
         var skillItemsToInject = [];
         var injected = {};
         for (var ii = 0; ii < input.length; ii++) {
@@ -1293,15 +1312,14 @@ function createCodexAdapter(opts) {
   // 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
   // previous vendor's model.
+  // Kept in sync with what `model/list` reports for the bundled codex build
+  // (0.152.1). Models the CLI no longer offers are rejected at turn/start, so
+  // listing them would only surface a runtime failure in the model picker.
   var CODEX_MODELS = [
     "gpt-5.6-terra",
     "gpt-5.6-sol",
     "gpt-5.6-luna",
     "gpt-5.5",
-    "gpt-5.4",
-    "gpt-5.4-mini",
-    "gpt-5.3-codex",
-    "gpt-5.3-codex-spark",
     "gpt-5.2",
   ];
   var _cachedModels = CODEX_MODELS.slice();
@@ -1516,6 +1534,7 @@ function createCodexAdapter(opts) {
 
   var adapter = {
     vendor: "codex",
+    userInputCapability: { mode: "native", native: true, transport: "item/tool/requestUserInput" },
 
     init: function(initOpts) {
       var requestedLinuxUser = initOpts && initOpts.linuxUser;
@@ -1543,7 +1562,7 @@ function createCodexAdapter(opts) {
       if (_initPromise) return _initPromise;
 
       _initPromise = (async function() {
-        var serverOpts = { cwd: _cwd };
+        var serverOpts = { cwd: _cwd, env: effectiveInitOpts.env || null };
         if (_runtimeLinuxUser) {
           serverOpts.osUserInfo = _resolveOsUserInfo(_runtimeLinuxUser);
         }
@@ -1749,9 +1768,11 @@ function createCodexAdapter(opts) {
         callDynamicTool: queryOpts.callDynamicTool || null,
         abortController: ac,
         canUseTool: queryOpts.canUseTool || null,
-        onElicitation: queryOpts.onElicitation || null,
+        onElicitation: queryOpts.userInputMode === "fallback" ? null : (queryOpts.onElicitation || null),
+        onUserInputRequest: queryOpts.userInputMode === "fallback" ? null : (queryOpts.onUserInputRequest || null),
         resumeSessionId: queryOpts.resumeSessionId || null,
         registerBackgroundTaskReset: registerBackgroundTaskReset,
+        ephemeral: queryOpts.ephemeral === true,
       };
 
       // Reasoning effort
@@ -1806,6 +1827,14 @@ function createCodexAdapter(opts) {
       return handle;
     },
 
+    createOneShotQuery: async function(queryOpts) {
+      var handle = await adapter.createQuery(Object.assign({}, queryOpts || {}, {
+        ephemeral: true,
+        resumeSessionId: null,
+      }));
+      return { handle: handle, backendPersistence: "ephemeral" };
+    },
+
     // --- Title generation ---
     generateTitle: async function(messages, opts) {
       var requestedLinuxUser = opts && opts.linuxUser;
@@ -1823,6 +1852,7 @@ function createCodexAdapter(opts) {
       var ac = new AbortController();
       var handle = await adapter.createQuery({
         cwd: (opts && opts.cwd) || _cwd,
+        env: opts && opts.env,
         systemPrompt: systemPrompt,
         model: "gpt-5.4-mini",
         abortController: ac,