clay-server 4.1.0-beta.8 → 4.1.0

package/lib/users-default-vendor-preferences.js

@@ -0,0 +1,80 @@
+// Durable user-scoped New session vendor preference storage.
+
+var PREFERENCE_KEY = "defaultVendorPreference";
+
+function validVendor(value) {
+  return typeof value === "string" && /^[a-z0-9][a-z0-9_-]{0,39}$/.test(value);
+}
+
+function attachDefaultVendorPreferences(deps) {
+  var loadUsers = deps.loadUsers;
+  var saveUsers = deps.saveUsers;
+  var isMultiUser = deps.isMultiUser || function () { return false; };
+  var configModule = deps.configModule || require("./config");
+
+  function getRecord(data, userId) {
+    var records = Array.isArray(data.users) ? data.users : [];
+    for (var i = 0; i < records.length; i++) if (records[i] && records[i].id === userId) return records[i];
+    return null;
+  }
+
+  function readValue(value, source) {
+    if (value === undefined || value === null || value === "") return { present: false, vendor: null, source: null };
+    if (!validVendor(value)) return { present: true, vendor: null, source: source, error: "Default coding vendor is invalid." };
+    return { present: true, vendor: value, source: source };
+  }
+
+  function getDefaultVendor(userId) {
+    var data;
+    try { data = loadUsers(); } catch (error) { return { present: false, vendor: null, source: null, error: "Unable to read default coding vendor: " + (error.message || error) }; }
+    var record = getRecord(data, userId);
+    if (isMultiUser() && !record) return { present: false, vendor: null, source: null, error: "User not found." };
+    if (record && Object.prototype.hasOwnProperty.call(record, PREFERENCE_KEY)) return readValue(record[PREFERENCE_KEY], "explicit");
+    if (record) return { present: false, vendor: null, source: null };
+    if (userId === "default") {
+      var config;
+      try { config = configModule.loadConfig() || {}; } catch (configError) { return { present: false, vendor: null, source: null, error: "Unable to read default coding vendor: " + (configError.message || configError) }; }
+      if (Object.prototype.hasOwnProperty.call(config, PREFERENCE_KEY)) return readValue(config[PREFERENCE_KEY], "explicit");
+    }
+    return { present: false, vendor: null, source: null };
+  }
+
+  function setDefaultVendor(userId, vendor) {
+    if (vendor !== "" && !validVendor(vendor)) return { ok: false, error: "Default coding vendor is invalid." };
+    var data;
+    try { data = loadUsers(); } catch (error) { return { ok: false, error: "Unable to read default coding vendor: " + (error.message || error) }; }
+    var record = getRecord(data, userId);
+    if (isMultiUser() && !record) return { ok: false, error: "User not found." };
+    if (record) {
+      var nextData = Object.assign({}, data, { users: (data.users || []).map(function (item) {
+        if (item !== record) return item;
+        var next = Object.assign({}, item);
+        if (vendor) next.defaultVendorPreference = vendor;
+        else delete next.defaultVendorPreference;
+        return next;
+      }) });
+      try { saveUsers(nextData); } catch (saveError) { return { ok: false, error: "Unable to save default coding vendor: " + (saveError.message || saveError) }; }
+      if (!vendor && userId === "default") {
+        try {
+          var recordConfig = configModule.loadConfig() || {};
+          delete recordConfig[PREFERENCE_KEY];
+          configModule.saveConfig(Object.assign({}, recordConfig));
+        } catch (recordConfigError) { return { ok: false, error: "Unable to clear default coding vendor: " + (recordConfigError.message || recordConfigError) }; }
+      }
+      return { ok: true, vendor: vendor };
+    }
+    if (userId !== "default") return { ok: false, error: "User not found." };
+    try {
+      var current = configModule.loadConfig() || {};
+      var nextConfig = Object.assign({}, current);
+      if (vendor) nextConfig.defaultVendorPreference = vendor;
+      else delete nextConfig.defaultVendorPreference;
+      configModule.saveConfig(nextConfig);
+      return { ok: true, vendor: vendor };
+    } catch (configSaveError) { return { ok: false, error: "Unable to save default coding vendor: " + (configSaveError.message || configSaveError) }; }
+  }
+
+  return { getDefaultVendor: getDefaultVendor, setDefaultVendor: setDefaultVendor, validVendor: validVendor };
+}
+
+module.exports = { attachDefaultVendorPreferences: attachDefaultVendorPreferences, validVendor: validVendor, PREFERENCE_KEY: PREFERENCE_KEY };

package/lib/users.js

@@ -11,6 +11,8 @@ var { attachHomeSurfacePreferences } = require("./users-home-surface-preferences
 var { attachExperimentalPreferences } = require("./users-experimental-preferences");
 var { attachScheduledTaskPreferences } = require("./users-scheduled-task-preferences");
 var { attachDefaultAiPreferences } = require("./users-default-ai-preferences");
+var { attachDefaultVendorPreferences } = require("./users-default-vendor-preferences");
+var { attachContextViewPreferences } = require("./users-context-view-preferences");
 
 var USERS_FILE = path.join(CONFIG_DIR, "users.json");
 
@@ -404,6 +406,8 @@ var homeSurfacePreferences = attachHomeSurfacePreferences({ loadUsers: loadUsers
 var experimentalPreferences = attachExperimentalPreferences({ loadUsers: loadUsers, saveUsers: saveUsers });
 var scheduledTaskPreferences = attachScheduledTaskPreferences({ loadUsers: loadUsers, saveUsers: saveUsers });
 var defaultAiPreferences = attachDefaultAiPreferences({ loadUsers: loadUsers, saveUsers: saveUsers, isMultiUser: auth.isMultiUser });
+var defaultVendorPreferences = attachDefaultVendorPreferences({ loadUsers: loadUsers, saveUsers: saveUsers, isMultiUser: auth.isMultiUser });
+var contextViewPreferences = attachContextViewPreferences({ loadUsers: loadUsers, saveUsers: saveUsers, isMultiUser: auth.isMultiUser });
 
 // Alias auth functions
 var isMultiUser = auth.isMultiUser;
@@ -464,6 +468,10 @@ var getScheduledTaskInterviewEngine = scheduledTaskPreferences.get;
 var setScheduledTaskInterviewEngine = scheduledTaskPreferences.set;
 var getDefaultAiPreference = defaultAiPreferences.getDefaultAiPreference;
 var setDefaultAiPreference = defaultAiPreferences.setDefaultAiPreference;
+var getDefaultVendorPreference = defaultVendorPreferences.getDefaultVendor;
+var setDefaultVendorPreference = defaultVendorPreferences.setDefaultVendor;
+var getContextViewPreference = contextViewPreferences.get;
+var setContextViewPreference = contextViewPreferences.set;
 
 module.exports = {
   USERS_FILE: USERS_FILE,
@@ -545,6 +553,10 @@ module.exports = {
   setScheduledTaskInterviewEngine: setScheduledTaskInterviewEngine,
   getDefaultAiPreference: getDefaultAiPreference,
   setDefaultAiPreference: setDefaultAiPreference,
+  getDefaultVendorPreference: getDefaultVendorPreference,
+  setDefaultVendorPreference: setDefaultVendorPreference,
+  getContextViewPreference: getContextViewPreference,
+  setContextViewPreference: setContextViewPreference,
   getDeletedBuiltinKeys: getDeletedBuiltinKeys,
   addDeletedBuiltinKey: addDeletedBuiltinKey,
   removeDeletedBuiltinKey: removeDeletedBuiltinKey,

package/lib/ws-schema.js

@@ -81,6 +81,11 @@ var schema = {
   "scheduled_task_update":    { direction: "c2s", handler: "lib/project-scheduled-tasks.js", description: "Update an exact schedule revision" },
   "scheduled_task_cancel":    { direction: "c2s", handler: "lib/project-scheduled-tasks.js", description: "Cancel the active schedule interview or draft" },
   "scheduled_task_action_result": { direction: "s2c", handler: "lib/public/modules/scheduled-tasks.js", description: "Correlated create or edit result" },
+  "scheduled_task_results_state": { direction: "s2c", handler: "lib/public/modules/project-logs.js", description: "Authorized per-user unread Scheduled Tasks result state" },
+  "scheduled_task_result_created": { direction: "s2c", handler: "lib/public/modules/project-logs.js", description: "Live terminal Scheduled Tasks result notification" },
+  "scheduled_task_result_mark_read": { direction: "c2s", handler: "lib/project-logs.js", description: "Mark an exact displayed scheduled result read for the current user" },
+  "scheduled_task_result_open_session": { direction: "c2s", handler: "lib/project-logs.js", description: "Resolve the hidden Driver for an authorized scheduled result" },
+  "scheduled_task_result_session": { direction: "s2c", handler: "lib/public/modules/project-logs.js", description: "Authorized hidden scheduled Driver navigation target" },
   "search_results":           { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Session title search results" },
   "search_content_results":   { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Full-text content search results" },
   "fork_complete":            { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Fork succeeded, includes new session ID" },
@@ -718,6 +723,12 @@ var schema = {
   "default_ai_get":           { direction: "c2s", handler: "lib/server-default-ai.js", description: "Read the authenticated user's shared Default AI and available providers" },
   "default_ai_catalog_get":   { direction: "c2s", handler: "lib/server-default-ai.js", description: "Read one installed provider catalog for the Default AI picker" },
   "default_ai_set":           { direction: "c2s", handler: "lib/server-default-ai.js", description: "Validate and persist the authenticated user's shared Default AI" },
+  "default_vendor_get":       { direction: "c2s", handler: "lib/server-default-vendor.js", description: "Read the authenticated user's New session vendor preference" },
+  "default_vendor_set":       { direction: "c2s", handler: "lib/server-default-vendor.js", description: "Validate and persist the authenticated user's New session vendor preference" },
+  "default_vendor_state":     { direction: "s2c", handler: "lib/public/modules/default-vendor.js", description: "Correlated or same-user-broadcast New session vendor preference" },
+  "context_view_get":         { direction: "c2s", handler: "lib/server-context-view.js", description: "Read the authenticated user's context display preference" },
+  "context_view_set":         { direction: "c2s", handler: "lib/server-context-view.js", description: "Persist the authenticated user's context display preference" },
+  "context_view_state":       { direction: "s2c", handler: "lib/public/modules/context-view-preference.js", description: "Correlated or same-user-broadcast context display preference" },
   "default_ai_state":         { direction: "s2c", handler: "lib/public/modules/default-ai.js", description: "Correlated or same-user-broadcast canonical Default AI state" },
   "default_ai_catalog":       { direction: "s2c", handler: "lib/public/modules/default-ai.js", description: "Correlated Default AI provider catalog" },
   "home_mate_history":        { direction: "s2c", handler: "lib/public/modules/home-mate-chat.js", description: "Selected mate's initial or refreshed chat history" },

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

@@ -82,13 +82,26 @@ function isSafeOpenCodePermission(value) {
 }
 
 function validateOpenCodeConfig(config) {
-  if (!config || config.permission !== "ask") {
+  if (!config || typeof config !== "object" || Array.isArray(config)) {
+    throw new Error("OpenCode resolved configuration is malformed");
+  }
+  var globalPermission = config.permission;
+  var globalAsk = globalPermission === "ask" || (
+    isSafeOpenCodePermission(globalPermission) && globalPermission["*"] === "ask"
+  );
+  if (!globalAsk) {
     throw new Error("OpenCode resolved configuration does not preserve global ask permissions");
   }
+  if (config.agent !== undefined && (!config.agent || typeof config.agent !== "object" || Array.isArray(config.agent))) {
+    throw new Error("OpenCode resolved configuration has malformed agents");
+  }
   var agents = config.agent || {};
   var names = Object.keys(agents);
   for (var i = 0; i < names.length; i++) {
-    var agent = agents[names[i]] || {};
+    var agent = agents[names[i]];
+    if (!agent || typeof agent !== "object" || Array.isArray(agent)) {
+      throw new Error("OpenCode agent has malformed resolved configuration: " + names[i]);
+    }
     if (agent.permission === undefined) continue;
     if (!isSafeOpenCodePermission(agent.permission)) {
       throw new Error("OpenCode agent has unsafe resolved permissions: " + names[i]);

package/lib/yoke/adapters/acp.js

@@ -44,6 +44,7 @@ function createAcpAdapter(vendor, opts) {
   var defaultModel = driver.defaultModel || cachedModels[0] || "auto";
   var activeHandles = [];
   var lastActiveAt = Date.now();
+  var skillEnv = opts.env || process.env;
 
   function context(extra) {
     return Object.assign({
@@ -96,7 +97,7 @@ function createAcpAdapter(vendor, opts) {
   }
 
   function readyResult() {
-    var skills = skillDiscovery.discoverSkills(cwd).map(function(skill) { return skill.name; });
+    var skills = skillDiscovery.discoverSkills(cwd, { env: skillEnv }).map(function(skill) { return skill.name; });
     var result = {
       models: cachedModels.slice(),
       defaultModel: defaultModel,
@@ -220,7 +221,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 = queryOpts.skipSkills ? [] : skillDiscovery.discoverSkills(queryOpts.cwd || cwd);
+      var sharedSkills = queryOpts.skipSkills ? [] : skillDiscovery.discoverSkills(queryOpts.cwd || cwd, queryOpts.skillOptions || { env: queryOpts.env || skillEnv });
       var skillIndex = skillDiscovery.buildSkillIndex(sharedSkills);
       var acpOptions = (queryOpts.adapterOptions && queryOpts.adapterOptions.ACP) || {};
       var handle = null;

package/lib/yoke/adapters/antigravity.js

@@ -353,12 +353,12 @@ function createAntigravityAdapter(opts) {
 
   var adapter = {
     vendor: "antigravity",
-    init: async function() {
+    init: async function(initOpts) {
       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; });
+      var skills = skillDiscovery.discoverSkills(cwd, { env: (initOpts && initOpts.env) || null }).map(function(skill) { return skill.name; });
       return {
         models: cachedModels.slice(),
         defaultModel: cachedModels[0] || "auto",

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

@@ -16,6 +16,8 @@ try { require("fs").writeSync(2, "[sdk-worker] BOOT pid=" + process.pid + " uid=
 var net = require("net");
 var crypto = require("crypto");
 var path = require("path");
+var claudeContextUsage = require(path.join(__dirname, "../claude-context-usage"));
+var claudeModelSwitch = require(path.join(__dirname, "../claude-model-switch"));
 var fs = require("fs");
 
 var socketPath = process.argv[2];
@@ -265,6 +267,9 @@ function handleMessage(msg) {
     case "abort":
       if (abortController) abortController.abort();
       break;
+    case "get_context_usage":
+      claudeContextUsage.respond(queryInstance, msg, sendToDaemon);
+      break;
     case "set_model":
       handleSetModel(msg);
       break;
@@ -322,6 +327,8 @@ function canUseTool(toolName, input, opts) {
     input: input,
     toolUseId: opts.toolUseID || "",
     decisionReason: opts.decisionReason || "",
+    defaultToNo: opts.defaultToNo === true,
+    suppressAlwaysAllowRule: opts.suppressAlwaysAllowRule === true,
   });
   return new Promise(function(resolve) {
     pendingPermissions[requestId] = resolve;
@@ -544,6 +551,10 @@ async function handleQueryStart(msg) {
     return onUserDialog(request, dialogOpts);
   };
 
+  if (options.reportModelSwitches) {
+    claudeModelSwitch.attach(options, function(change) { sendToDaemon({ type: "model_switched", change: change }); });
+  }
+  delete options.reportModelSwitches;
   perf("creating query instance");
   try {
     queryInstance = sdk.query({
@@ -600,18 +611,6 @@ async function handleQueryStart(msg) {
       }
       sendToDaemon({ type: "sdk_event", event: event });
     }
-    perf("all events streamed (counts=" + JSON.stringify(eventCounts) + "), fetching context usage");
-    // Fetch context usage breakdown before queryInstance is cleared
-    try {
-      if (queryInstance && typeof queryInstance.getContextUsage === "function") {
-        var ctxUsage = await queryInstance.getContextUsage();
-        sendToDaemon({ type: "context_usage", data: ctxUsage });
-        perf("context usage sent");
-      }
-    } catch (e) {
-      // Non-fatal: SDK may have already shut down
-      console.error("[sdk-worker] getContextUsage failed (non-fatal):", e.message);
-    }
     perf("sending query_done");
     sendToDaemon({ type: "query_done" });
   } catch (err) {

package/lib/yoke/adapters/claude.js

@@ -13,6 +13,9 @@ var { spawn } = require("child_process");
 var { resolveOsUserInfo } = require("../../os-users");
 var skillDiscovery = require("../skill-discovery");
 var claudeUserInput = require("../claude-user-input");
+var claudeCorrelation = require("../claude-message-correlation");
+var claudeContextUsage = require("../claude-context-usage");
+var claudeModelSwitch = require("../claude-model-switch");
 
 // 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
@@ -53,20 +56,39 @@ var PER_TASK_STOP_AFFORDANCE = true;
 // queryOpts.systemPromptSnapshot. A bare string prompt cannot be recorded, so
 // it is promoted to the custom form the SDK requires.
 function applySystemPromptSnapshot(systemPrompt, enabled) {
-  if (!enabled || !systemPrompt) return systemPrompt;
+  if (!systemPrompt) return systemPrompt;
+  enabled = enabled === true;
   if (typeof systemPrompt === "string" || Array.isArray(systemPrompt)) {
-    return { type: "custom", prompt: systemPrompt, snapshot: true };
+    return { type: "custom", prompt: systemPrompt, snapshot: enabled };
   }
   if (typeof systemPrompt === "object") {
-    return Object.assign({}, systemPrompt, { snapshot: true });
+    return Object.assign({}, systemPrompt, { snapshot: enabled });
   }
   return systemPrompt;
 }
 
-function getSharedSkillPlugins(homeDir, existingPlugins) {
+function getSharedSkillPlugins(homeDir, existingPlugins, cwd, env) {
   var plugins = Array.isArray(existingPlugins) ? existingPlugins.slice() : [];
-  var bridgePath = skillDiscovery.ensureClaudeCodexPlugin(homeDir ? { homeDir: homeDir } : null);
+  // undefined means normal in-process Claude and may use the configured
+  // daemon home; null means a failed mapped-user resolution and must fail
+  // closed without constructing any personal bridges.
+  if (homeDir === null) return plugins;
+  var effectiveHome = homeDir === undefined ? require("../../config").REAL_HOME || os.homedir() : homeDir;
+  var rootOptions = { homeDir: effectiveHome, env: env, scopedHome: !!homeDir };
+  var roots = skillDiscovery.getSkillRoots(cwd, rootOptions);
+  var codexRoot = roots.filter(function (root) { return root.source === "codex-user"; })[0];
+  var codexOpts = codexRoot ? { homeDir: effectiveHome, source: codexRoot.path, name: "codex" } : null;
+  if (codexRoot && codexRoot.path !== path.join(effectiveHome, ".codex", "skills")) {
+    codexOpts.name = "codex-" + crypto.createHash("sha256").update(codexRoot.path).digest("hex").slice(0, 12);
+  }
+  var bridgePath = skillDiscovery.ensureClaudeCodexPlugin(codexOpts);
   if (bridgePath) plugins.push({ type: "local", path: bridgePath, skipMcpDiscovery: true });
+  for (var i = 0; i < roots.length; i++) {
+    if (roots[i].source === "codex-user" || roots[i].source === "claude-user" || roots[i].source === "claude-project") continue;
+    var rootId = crypto.createHash("sha256").update(roots[i].source + "\0" + path.resolve(roots[i].path)).digest("hex").slice(0, 12);
+    var sharedPath = skillDiscovery.ensureClaudeCodexPlugin({ homeDir: effectiveHome, source: roots[i].path, name: "shared-" + roots[i].source + "-" + rootId });
+    if (sharedPath) plugins.push({ type: "local", path: sharedPath, skipMcpDiscovery: true });
+  }
   return plugins;
 }
 
@@ -88,16 +110,18 @@ function buildWorkerQueryOptions(queryOpts, claudeOpts, workerCwd) {
   if (claudeOpts.permissionMode) queryOptions.permissionMode = claudeOpts.permissionMode;
   if (claudeOpts.allowDangerouslySkipPermissions) queryOptions.allowDangerouslySkipPermissions = true;
   if (claudeOpts.settings) queryOptions.settings = claudeOpts.settings;
-  if (queryOpts.appendSystemPrompt) {
+  if (queryOpts.systemPrompt) queryOptions.systemPrompt = applySystemPromptSnapshot(queryOpts.systemPrompt, queryOpts.systemPromptSnapshot);
+  if (!queryOpts.systemPrompt && queryOpts.appendSystemPrompt) {
     queryOptions.systemPrompt = applySystemPromptSnapshot(
       { type: "preset", preset: "claude_code", append: queryOpts.appendSystemPrompt },
       queryOpts.systemPromptSnapshot
     );
   }
-  queryOptions.plugins = queryOpts.skipSkills ? (claudeOpts.plugins || []) : getSharedSkillPlugins(claudeOpts.originalHome, claudeOpts.plugins);
+  queryOptions.plugins = queryOpts.skipSkills ? (claudeOpts.plugins || []) : getSharedSkillPlugins(claudeOpts.originalHome, claudeOpts.plugins, workerCwd, queryOpts.env);
   if (queryOpts.toolServerDescriptors) queryOptions.mcpServerDescriptors = queryOpts.toolServerDescriptors;
   if (queryOpts.onUserDialog) queryOptions.supportedDialogKinds = SUPPORTED_DIALOG_KINDS;
   queryOptions.perTaskStopAffordance = PER_TASK_STOP_AFFORDANCE;
+  if (queryOpts.onModelSwitch) queryOptions.reportModelSwitches = true;
   if (queryOpts.model) queryOptions.model = queryOpts.model;
   if (queryOpts.effort) queryOptions.effort = queryOpts.effort;
   if (queryOpts.resumeSessionId) queryOptions.resume = queryOpts.resumeSessionId;
@@ -203,6 +227,11 @@ function createMessageQueue() {
 function flattenEvent(raw) {
   // session_id and uuid are cross-cutting: attach to any event that has them
   var base = {};
+  if (raw.user_message_uuid) base.userMessageId = raw.user_message_uuid;
+  if (Array.isArray(raw.user_message_uuids)) base.userMessageIds = raw.user_message_uuids.slice();
+  if (raw.resume_reason) base.resumeReason = raw.resume_reason;
+  if (Number.isInteger(raw.result_index)) base.resultIndex = raw.result_index;
+  if (raw.local_command) base.localCommand = raw.local_command;
   if (raw.session_id) base.sessionId = raw.session_id;
   if (raw.uuid) {
     base.uuid = raw.uuid;
@@ -418,6 +447,7 @@ function flattenEvent(raw) {
   // --- result ---
   if (raw.type === "result") {
     base.yokeType = "result";
+    if (Number.isInteger(raw.queued_turn_count) && raw.queued_turn_count >= 0) base.queuedTurnCount = raw.queued_turn_count;
     base.cost = raw.total_cost_usd;
     base.duration = raw.duration_ms;
     base.usage = raw.usage || null;
@@ -517,6 +547,7 @@ function normalizeBackgroundTasks(tasks) {
 // Wraps a raw SDK query object with the YOKE QueryHandle interface.
 // Events are flattened via flattenEvent before yielding.
 function createQueryHandle(rawQuery, messageQueue, abortController) {
+  var correlation = claudeCorrelation.createCorrelation();
   var closed = false;
   var handle = {
     // Opaque adapter state (null for in-process queries)
@@ -530,7 +561,7 @@ function createQueryHandle(rawQuery, messageQueue, abortController) {
           return rawIter.next().then(function(result) {
             if (result.done) closed = true;
             if (result.done) return result;
-            return { value: flattenEvent(result.value), done: false };
+            return { value: correlation.result(result.value, flattenEvent(result.value)), done: false };
           }, function(err) {
             closed = true;
             throw err;
@@ -539,6 +570,8 @@ function createQueryHandle(rawQuery, messageQueue, abortController) {
       };
     },
 
+    getSubmittedMessageCount: correlation.submitted,
+
     pushMessage: function(text, images) {
       if (closed) return false;
       var content = [];
@@ -551,7 +584,10 @@ function createQueryHandle(rawQuery, messageQueue, abortController) {
         }
       }
       if (text) content.push({ type: "text", text: text });
-      return messageQueue.push({ type: "user", message: { role: "user", content: content } });
+      var message = correlation.message(content);
+      var accepted = messageQueue.push(message);
+      if (accepted) correlation.accepted(message);
+      return accepted;
     },
 
     setModel: function(model) {
@@ -605,9 +641,9 @@ function createQueryHandle(rawQuery, messageQueue, abortController) {
       return Promise.resolve(null);
     },
 
-    getContextUsage: function() {
+    getContextUsage: function(options) {
       if (rawQuery && typeof rawQuery.getContextUsage === "function") {
-        return rawQuery.getContextUsage();
+        return rawQuery.getContextUsage(claudeContextUsage.options(options));
       }
       return Promise.resolve(null);
     },
@@ -979,7 +1015,9 @@ 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, onUserInputRequest) {
+function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool, onUserDialog, onUserInputRequest, onModelSwitch) {
+  var contextRequests = claudeContextUsage.createRequests(worker);
+  var correlation = claudeCorrelation.createCorrelation();
   // Async iterable state
   var iterQueue = [];
   var iterWaiting = null;
@@ -1003,6 +1041,7 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool,
   }
 
   function endIter() {
+    contextRequests.close();
     if (iterEnded) return;
     iterEnded = true;
     if (iterWaiting) {
@@ -1013,6 +1052,7 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool,
   }
 
   function errorIter(err) {
+    contextRequests.close();
     if (iterEnded) return;
     iterEnded = true;
     iterError = err;
@@ -1028,7 +1068,7 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool,
   worker.onMessage(function(msg) {
     switch (msg.type) {
       case "sdk_event":
-        pushToIter(flattenEvent(msg.event));
+        pushToIter(correlation.result(msg.event, flattenEvent(msg.event)));
         break;
 
       case "permission_request":
@@ -1036,6 +1076,8 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool,
           canUseTool(msg.toolName, msg.input, {
             toolUseID: msg.toolUseId,
             decisionReason: msg.decisionReason,
+            defaultToNo: msg.defaultToNo === true,
+            suppressAlwaysAllowRule: msg.suppressAlwaysAllowRule === true,
             signal: { addEventListener: function() {} },
           }).then(function(result) {
             worker.send({ type: "permission_response", requestId: msg.requestId, result: result });
@@ -1116,6 +1158,12 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool,
         }
         break;
 
+      case "model_switched":
+        if (onModelSwitch) onModelSwitch(msg.change);
+        break;
+      case "context_usage_response":
+        contextRequests.receive(msg);
+        break;
       case "context_usage":
       case "model_changed":
       case "effort_changed":
@@ -1198,6 +1246,8 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool,
       };
     },
 
+    getSubmittedMessageCount: correlation.submitted,
+
     pushMessage: function(text, images) {
       if (iterEnded || (worker.process && (worker.process.killed || worker.process.exitCode != null))) return false;
       var content = [];
@@ -1210,8 +1260,10 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool,
         }
       }
       if (text) content.push({ type: "text", text: text });
-      var userMsg = { type: "user", message: { role: "user", content: content } };
-      return worker.send({ type: "push_message", content: userMsg }) === true;
+      var userMsg = correlation.message(content);
+      var accepted = worker.send({ type: "push_message", content: userMsg }) === true;
+      if (accepted) correlation.accepted(userMsg);
+      return accepted;
     },
 
     setModel: function(model) {
@@ -1250,8 +1302,8 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool,
       return Promise.resolve(null);
     },
 
-    getContextUsage: function() {
-      return Promise.resolve(null);
+    getContextUsage: function(options) {
+      return iterEnded ? Promise.resolve(null) : contextRequests.request(options);
     },
 
     supportedModels: function() {
@@ -1389,7 +1441,7 @@ function createClaudeAdapter(opts) {
         abortController: ac,
         settings: { disableAllHooks: true },
       };
-      warmupOptions.plugins = getSharedSkillPlugins(initOpts && initOpts.originalHome);
+      warmupOptions.plugins = getSharedSkillPlugins(initOpts && initOpts.originalHome, null, initOpts && initOpts.cwd, initOpts && initOpts.env);
       if (_claudeBinaryPath) warmupOptions.pathToClaudeCodeExecutable = _claudeBinaryPath;
 
       if (initOpts && initOpts.dangerouslySkipPermissions) {
@@ -1603,8 +1655,9 @@ 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 = queryOpts.skipSkills ? (co.plugins || []) : getSharedSkillPlugins(co.originalHome, co.plugins);
+      sdkOptions.plugins = queryOpts.skipSkills ? (co.plugins || []) : getSharedSkillPlugins(co.originalHome, co.plugins, queryOpts.cwd || _cwd, queryOpts.env);
 
+      claudeModelSwitch.attach(sdkOptions, queryOpts.onModelSwitch);
       var rawQuery = sdk.query({ prompt: mq, options: sdkOptions });
       return createQueryHandle(rawQuery, mq, ac);
     },
@@ -1742,7 +1795,7 @@ function createClaudeAdapter(opts) {
     // Create the worker query handle (sets up message handler on worker)
     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);
+    var handle = createWorkerQueryHandle(worker, queryOpts.canUseTool, workerElicitationHandler, queryOpts.callMcpTool, queryOpts.onUserDialog, workerUserInputHandler, queryOpts.onModelSwitch);
 
     // Wait for worker to be ready before sending query_start
     if (!reusingWorker) {
@@ -1862,7 +1915,7 @@ function createClaudeAdapter(opts) {
         abortController: ac,
         settings: { disableAllHooks: true },
       };
-      warmupOptions.plugins = getSharedSkillPlugins(initOpts && initOpts.originalHome);
+      warmupOptions.plugins = getSharedSkillPlugins(initOpts && initOpts.originalHome, null, initOpts && initOpts.cwd, initOpts && initOpts.env);
       if (_claudeBinaryPath) warmupOptions.pathToClaudeCodeExecutable = _claudeBinaryPath;
 
       if (initOpts && initOpts.dangerouslySkipPermissions) {
@@ -1944,7 +1997,7 @@ function createClaudeAdapter(opts) {
     }
 
     var warmupOptions = { cwd: workerCwd, settingSources: ["user", "project", "local"], settings: { disableAllHooks: true } };
-    warmupOptions.plugins = getSharedSkillPlugins(initOpts && initOpts.originalHome);
+    warmupOptions.plugins = getSharedSkillPlugins(initOpts && initOpts.originalHome, null, initOpts && initOpts.cwd, initOpts && initOpts.env);
     if (_claudeBinaryPath) warmupOptions.pathToClaudeCodeExecutable = _claudeBinaryPath;
     if (initOpts && initOpts.dangerouslySkipPermissions) {
       warmupOptions.permissionMode = "bypassPermissions";