clay-server 2.47.0-beta.2 → 2.47.0-beta.4

package/lib/public/modules/mate-sidebar.js

@@ -3,7 +3,6 @@ import { escapeHtml } from './utils.js';
 import { iconHtml, refreshIcons } from './icons.js';
 import { store } from './store.js';
 import { hideKnowledge } from './mate-knowledge.js';
-import { hideMateDatastorePanel } from './mate-datastore-ui.js';
 import { isSchedulerOpen, closeScheduler } from './scheduler.js';
 import { hideNotes } from './sticky-notes.js';
 import { openSearch as openSessionSearch } from './session-search.js';
@@ -135,7 +134,6 @@ export function initMateSidebar(wsGetter) {
 }
 
 export function showMateSidebar(mateId, mateData) {
-  if (hideMateDatastorePanel) hideMateDatastorePanel();
   currentMateId = mateId;
   currentMate = mateData;
   cachedSessions = [];
@@ -359,7 +357,6 @@ export function getMateSessions() {
 }
 
 export function hideMateSidebar() {
-  if (hideMateDatastorePanel) hideMateDatastorePanel();
   currentMateId = null;
   currentMate = null;
   cachedSessions = [];

package/lib/public/modules/tui-grab.js

@@ -24,6 +24,8 @@
 // Codex sessions never receive a transcript_state (no JSONL), so the
 // overlay stays disabled — selection copy still works normally.
 
+import { store } from './store.js';
+
 import { copyToClipboard, showToast } from './utils.js';
 import { getWs } from './ws-ref.js';
 
@@ -629,9 +631,16 @@ function requestTranscript(localId) {
 export function attachTuiGrab(xterm, containerEl, localId, opts) {
   if (!xterm || !containerEl || !localId) return;
   clearActive();
-  // For non-claude vendors (e.g. Codex) we don't even bother — no
-  // transcript exists on disk, so there's nothing to match against.
-  if (opts && opts.vendor && opts.vendor !== "claude") return;
+  // Vendors without TUI sessions have no transcript to match against.
+  if (opts && opts.vendor) {
+    var vendors = store.get('vendorInfo') || {};
+    var info = vendors[opts.vendor];
+    var legacyTuiVendors = ["claude"];
+    var supportsTui = info
+      ? Array.isArray(info.sessionModes) && info.sessionModes.indexOf("tui") !== -1
+      : legacyTuiVendors.indexOf(opts.vendor) !== -1;
+    if (!supportsTui) return;
+  }
 
   var overlayEl = buildOverlay(containerEl);
   active = {

package/lib/sdk-bridge.js

@@ -10,6 +10,7 @@ var { splitShellSegments, attachSkillDiscovery } = require("./sdk-skill-discover
 var { isSafeBashSegment } = require("./safe-bash-commands");
 var { createMessageQueue } = require("./sdk-message-queue");
 var { attachMessageProcessor } = require("./sdk-message-processor");
+var yoke = require("./yoke");
 
 // Extract serializable tool descriptors from MCP server instances.
 // Used for IPC to worker processes (McpSdkServerConfigWithInstance is not serializable).
@@ -112,10 +113,11 @@ function createSDKBridge(opts) {
   var dangerouslySkipPermissions = opts.dangerouslySkipPermissions || false;
   // mcpServers may be either a static object or a getter function. The
   // getter form lets callers gate individual servers at call time (e.g.
-  // clay-browser is only exposed while the Chrome extension is connected).
+  // clay-browser is only exposed while the Chrome extension is connected)
+  // and bind session-scoped servers (clay-sessions) to the querying session.
   var _mcpServersSrc = opts.mcpServers || null;
-  function getMcpServers() {
-    if (typeof _mcpServersSrc === "function") return _mcpServersSrc() || null;
+  function getMcpServers(forSession) {
+    if (typeof _mcpServersSrc === "function") return _mcpServersSrc(forSession) || null;
     return _mcpServersSrc;
   }
   var getRemoteMcpServers = opts.getRemoteMcpServers || null;
@@ -127,7 +129,6 @@ function createSDKBridge(opts) {
   var _cachedFreshAuthAt = 0;
 
   function getFreshAuthState(force) {
-    var yoke = require("./yoke");
     var now = Date.now();
     if (!force && _cachedFreshAuthState && now - _cachedFreshAuthAt < 15000) {
       return _cachedFreshAuthState;
@@ -150,10 +151,13 @@ function createSDKBridge(opts) {
   }
 
   function getLoginCommand(vendor) {
-    if (vendor === "codex") return "codex login --device-auth";
-    if (vendor === "claude") return "claude login";
-    if (vendor === "kiro") return "kiro-cli login";
-    return (vendor || "claude") + " login";
+    var info = yoke.getVendorInfo(vendor);
+    return (info && info.loginCommand) || "claude login";
+  }
+
+  function supportsOsUserIsolation(vendor) {
+    var info = yoke.getVendorInfo(vendor);
+    return !info || info.osUserIsolation !== false;
   }
 
   function notifyAuthRequired(session, title, body, authLinuxUser, canAutoLogin, loginCommand) {
@@ -220,15 +224,25 @@ function createSDKBridge(opts) {
   }
 
   function sendModelInfoForVendor(vendor, model) {
+    var resolvedVendor = vendor || (adapter && adapter.vendor) || "claude";
     send({
       type: "model_info",
       model: model || "",
-      models: getModelsForVendor(vendor),
-      vendor: vendor || (adapter && adapter.vendor) || "claude",
+      models: getModelsForVendor(resolvedVendor),
+      vendor: resolvedVendor,
+      capabilities: (sm.capabilitiesByVendor && sm.capabilitiesByVendor[resolvedVendor]) || {},
       availableVendors: sm.availableVendors || [],
       installedVendors: sm.installedVendors || [],
     });
   }
+
+  function rememberAdapterReady(vendor, result) {
+    if (!vendor || !result) return;
+    sm.modelsByVendor = sm.modelsByVendor || {};
+    sm.capabilitiesByVendor = sm.capabilitiesByVendor || {};
+    if (Array.isArray(result.models)) sm.modelsByVendor[vendor] = result.models;
+    sm.capabilitiesByVendor[vendor] = result.capabilities || {};
+  }
   var onTurnDone = opts.onTurnDone || null;
 
   // --- Idle session reaper ---
@@ -534,12 +548,6 @@ function createSDKBridge(opts) {
       }
     }
 
-    // Auto-approve Mate datastore tools. These are scoped to the active Mate
-    // project and already enforce SQL policy server-side.
-    if (toolName.indexOf("mcp__clay-datastore__") === 0) {
-      return { behavior: "allow", updatedInput: input };
-    }
-
     // Auto-approve clay-history tools. Mounted only on Clay (host agent)
     // sessions and strictly read-only by design — search and read across
     // the user's own workspace data.
@@ -869,7 +877,8 @@ function createSDKBridge(opts) {
               var canAutoLogin = !usersModule.isMultiUser()
                 || !!authLinuxUser
                 || (authUser && authUser.role === "admin");
-              var authVendorLabel = session.vendor === "codex" ? "Codex" : (session.vendor === "kiro" ? "Kiro CLI" : "Claude Code");
+              var authInfo = yoke.getVendorInfo(session.vendor);
+              var authVendorLabel = (authInfo && authInfo.displayName) || "Claude Code";
               var authTitle = authVendorLabel + " is not logged in.";
               var authMsg = {
                 type: "auth_required",
@@ -1070,10 +1079,9 @@ function createSDKBridge(opts) {
   async function startQuery(session, text, images, linuxUser) {
     async function ensureVendorReady(vendor) {
       if (!vendor) return null;
-      if (linuxUser && vendor === "kiro") return null;
+      if (linuxUser && !supportsOsUserIsolation(vendor)) return null;
       var vendorAdapter = adapters[vendor] || null;
       if (!vendorAdapter) {
-        var yoke = require("./yoke");
         vendorAdapter = await yoke.lazyCreateAdapter(adapters, vendor, {
           cwd: cwd,
           dangerouslySkipPermissions: dangerouslySkipPermissions,
@@ -1083,8 +1091,11 @@ function createSDKBridge(opts) {
           clayAuthToken: clayAuthToken,
           slug: slug,
         });
-      } else if ((!sm.modelsByVendor || !sm.modelsByVendor[vendor]) && typeof vendorAdapter.init === "function") {
-        await vendorAdapter.init({
+      }
+      var needsReadyMetadata = !sm.capabilitiesByVendor || !sm.capabilitiesByVendor[vendor]
+        || !sm.modelsByVendor || !sm.modelsByVendor[vendor];
+      if (vendorAdapter && needsReadyMetadata && typeof vendorAdapter.init === "function") {
+        var readyResult = await vendorAdapter.init({
           cwd: cwd,
           dangerouslySkipPermissions: dangerouslySkipPermissions,
           linuxUser: linuxUser || undefined,
@@ -1093,6 +1104,7 @@ function createSDKBridge(opts) {
           clayAuthToken: clayAuthToken,
           slug: slug,
         });
+        rememberAdapterReady(vendor, readyResult);
       }
       if (vendorAdapter) {
         sm.availableVendors = getAvailableVendors(linuxUser);
@@ -1100,6 +1112,11 @@ function createSDKBridge(opts) {
         if (!sm.modelsByVendor[vendor] && typeof vendorAdapter.supportedModels === "function") {
           sm.modelsByVendor[vendor] = await vendorAdapter.supportedModels();
         }
+        var vendorModels = getModelsForVendor(vendor);
+        var modelForVendor = resolveModelInList(vendorModels, sm.currentModel)
+          || modelEntryValue(vendorModels[0])
+          || "";
+        sendModelInfoForVendor(vendor, modelForVendor);
       }
       return vendorAdapter;
     }
@@ -1108,11 +1125,13 @@ function createSDKBridge(opts) {
     // OS-isolated session would expose the daemon user's HOME and Kiro
     // credentials to another user, so refuse until the adapter has a
     // per-user worker path.
-    if (linuxUser && session.vendor === "kiro") {
-      console.error("[sdk-bridge] Refusing Kiro for OS-isolated user " + linuxUser + ": per-user ACP spawning is not implemented");
+    if (linuxUser && !supportsOsUserIsolation(session.vendor)) {
+      var isolatedVendorInfo = yoke.getVendorInfo(session.vendor);
+      var isolatedVendorName = (isolatedVendorInfo && isolatedVendorInfo.displayName) || session.vendor || "This vendor";
+      console.error("[sdk-bridge] Refusing " + isolatedVendorName + " for OS-isolated user " + linuxUser + ": per-user spawning is not implemented");
       sendAndRecord(session, {
         type: "error",
-        text: "Kiro is not available for OS-isolated users yet.",
+        text: isolatedVendorName + " is not available for OS-isolated users yet.",
       });
       sendAndRecord(session, { type: "done", code: 1 });
       return;
@@ -1139,7 +1158,9 @@ function createSDKBridge(opts) {
     }
     // If still not available after lazy check, send auth_required
     if (session.vendor && !adapters[session.vendor]) {
-      var vendorName = session.vendor.charAt(0).toUpperCase() + session.vendor.slice(1);
+      var missingVendorInfo = yoke.getVendorInfo(session.vendor);
+      var vendorName = (missingVendorInfo && missingVendorInfo.displayName)
+        || session.vendor.charAt(0).toUpperCase() + session.vendor.slice(1);
       var authUser = session.ownerId ? usersModule.findUserById(session.ownerId) : null;
       var authLinuxUser = authUser && authUser.linuxUser ? authUser.linuxUser : null;
       var canAutoLogin = !usersModule.isMultiUser()
@@ -1311,7 +1332,7 @@ function createSDKBridge(opts) {
 
     var codexConfig = getCodexConfig(sm);
     var kiroConfig = getKiroConfig(sm);
-    var mergedMcpServers = mergeMcpServers(getMcpServers(), getRemoteMcpServers) || undefined;
+    var mergedMcpServers = mergeMcpServers(getMcpServers(session), getRemoteMcpServers) || undefined;
 
     // Derive an explicit session title for fresh queries so the SDK records
     // it at session creation and skips its own auto-generation. This also
@@ -1520,25 +1541,26 @@ function createSDKBridge(opts) {
     }
 
     // Claude: check if binary is in PATH
-    if (tryLookup("claude")) result.push("claude");
+    if (tryLookup(yoke.getVendorInfo("claude").binaryName)) result.push("claude");
 
     // Codex: check bundled binary or PATH
     var codexBin = null;
     try {
       codexBin = require("./yoke/codex-app-server").findCodexPath();
     } catch (e) {}
-    if ((codexBin && fs.existsSync(codexBin)) || tryLookup("codex")) result.push("codex");
+    if ((codexBin && fs.existsSync(codexBin)) || tryLookup(yoke.getVendorInfo("codex").binaryName)) result.push("codex");
 
     // Kiro has no per-user ACP spawn path yet. Do not advertise the daemon's
     // binary to an OS-isolated user, even if that user also has Kiro installed.
-    if (!linuxUser) {
+    var kiroInfo = yoke.getVendorInfo("kiro");
+    if (!linuxUser || kiroInfo.osUserIsolation) {
       var kiroBin = null;
       try {
         kiroBin = require("./yoke/kiro-acp-server").findKiroPath();
       } catch (e) {}
-      if ((kiroBin && fs.existsSync(kiroBin)) || tryLookup("kiro-cli")) result.push("kiro");
+      if ((kiroBin && fs.existsSync(kiroBin)) || tryLookup(kiroInfo.binaryName)) result.push("kiro");
     } else {
-      console.log("[sdk-bridge] Kiro hidden for OS-isolated user " + linuxUser + ": per-user ACP spawning is not implemented");
+      console.log("[sdk-bridge] " + kiroInfo.displayName + " hidden for OS-isolated user " + linuxUser + ": per-user spawning is not implemented");
     }
 
     return result;
@@ -1546,7 +1568,7 @@ function createSDKBridge(opts) {
 
   function getAvailableVendors(linuxUser) {
     return Object.keys(adapters).filter(function(vendor) {
-      return !(linuxUser && vendor === "kiro");
+      return !(linuxUser && !supportsOsUserIsolation(vendor));
     });
   }
 
@@ -1591,10 +1613,7 @@ function createSDKBridge(opts) {
         }
         sm.availableModels = result.models || [];
         // Store per-vendor models and capabilities
-        sm.modelsByVendor = sm.modelsByVendor || {};
-        sm.modelsByVendor[defaultVendor] = result.models || [];
-        sm.capabilitiesByVendor = sm.capabilitiesByVendor || {};
-        sm.capabilitiesByVendor[defaultVendor] = result.capabilities || {};
+        rememberAdapterReady(defaultVendor, result);
       } catch (e) {
         if (e && e.name !== "AbortError" && !(e.message && e.message.indexOf("aborted") !== -1)) {
           send({ type: "error", text: "Failed to load " + defaultVendor + " SDK: " + (e.message || e) });

package/lib/sdk-message-processor.js

@@ -1,4 +1,5 @@
 var usersModule = require("./users");
+var yoke = require("./yoke");
 
 function attachMessageProcessor(ctx) {
   var sm = ctx.sm;
@@ -50,12 +51,9 @@ function attachMessageProcessor(ctx) {
     var canAutoLogin = !usersModule.isMultiUser()
       || !!authLinuxUser
       || (authUser && authUser.role === "admin");
-    var authTitle = session.vendor === "codex"
-      ? "Codex is not logged in."
-      : (session.vendor === "kiro" ? "Kiro CLI is not logged in." : "Claude Code is not logged in.");
-    var loginCommand = session.vendor === "codex"
-      ? "codex login --device-auth"
-      : (session.vendor === "kiro" ? "kiro-cli login" : "claude login");
+    var vendorInfo = yoke.getVendorInfo(session.vendor);
+    var authTitle = ((vendorInfo && vendorInfo.displayName) || "Claude Code") + " is not logged in.";
+    var loginCommand = (vendorInfo && vendorInfo.loginCommand) || "claude login";
     var _nmLogin = getNotificationsModule();
     sendAndRecord(session, {
       type: "auth_required",

package/lib/session-spawn-mcp-server.js

@@ -0,0 +1,56 @@
+// Session Spawn MCP Server for Clay
+// Provides SDK-free tool definitions for agent-driven session fan-out.
+
+var z;
+try { z = require("zod"); } catch (e) { z = null; }
+
+function buildShape(props, required) {
+  if (!z) return {};
+  var shape = {};
+  var keys = Object.keys(props);
+  for (var i = 0; i < keys.length; i++) {
+    var key = keys[i];
+    var prop = props[key];
+    var field;
+    if (prop.type === "number") field = z.number();
+    else if (prop.type === "boolean") field = z.boolean();
+    else if (prop.enum) field = z.enum(prop.enum);
+    else field = z.string();
+    if (prop.description) field = field.describe(prop.description);
+    if (!required || required.indexOf(key) === -1) field = field.optional();
+    shape[key] = field;
+  }
+  return shape;
+}
+
+function getToolDefs(handlers) {
+  return [
+    {
+      name: "spawn_sessions",
+      description: "Create sibling work sessions in this project. Set forkFromCurrent to copy this session's full conversation context into every child. Children share the project's working directory, so prefer parallel analysis or other non-conflicting work over concurrent edits. Results can be polled with check_spawned_sessions; spawned children cannot spawn further sessions.",
+      inputSchema: buildShape({
+        sessions: { type: "string", description: "JSON array of objects: [{\"title\":\"Task title\",\"prompt\":\"Task instructions\"}]" },
+        vendor: { type: "string", description: "Optional vendor id. Defaults to the parent session vendor, then the project default." },
+        forkFromCurrent: { type: "boolean", description: "Children start with a copy of this session's full conversation context. Defaults to false." },
+      }, ["sessions"]),
+      handler: function (args) {
+        return handlers.spawn(args || {});
+      },
+    },
+    {
+      name: "check_spawned_sessions",
+      description: "Check the status of sessions spawned by this session. By default only direct children of the calling session are returned.",
+      inputSchema: buildShape({
+        parentOnly: { type: "boolean", description: "When false, return all spawned sessions in this project. Defaults to true." },
+      }),
+      handler: function (args) {
+        return handlers.check(args || {});
+      },
+    },
+  ];
+}
+
+module.exports = {
+  buildShape: buildShape,
+  getToolDefs: getToolDefs,
+};

package/lib/sessions.js

@@ -108,6 +108,7 @@ function createSessionManager(opts) {
       if (typeof session.favoriteOrder === "number") metaObj.favoriteOrder = session.favoriteOrder;
       if (session.lastRewindUuid) metaObj.lastRewindUuid = session.lastRewindUuid;
       if (session.loop) metaObj.loop = session.loop;
+      if (session.spawn) metaObj.spawn = session.spawn;
       if (session.debateState) metaObj.debateState = session.debateState;
       if (session.debateSetupMode) metaObj.debateSetupMode = true;
       var meta = JSON.stringify(metaObj);
@@ -207,6 +208,7 @@ function createSessionManager(opts) {
       };
       if (m.vendor) session.vendor = m.vendor;
       if (m.loop) session.loop = m.loop;
+      if (m.spawn) session.spawn = m.spawn;
       if (m.debateState) session.debateState = m.debateState;
       if (m.debateSetupMode) session.debateSetupMode = true;
       if (m.ownerId) session.ownerId = m.ownerId;
@@ -394,6 +396,7 @@ function createSessionManager(opts) {
       isProcessing: s.isProcessing,
       lastActivity: s.lastActivity || s.createdAt || 0,
       loop: loop,
+      spawn: s.spawn || null,
       ownerId: s.ownerId || null,
       sessionVisibility: s.sessionVisibility || "shared",
       bookmarked: !!s.bookmarked,

package/lib/ws-schema.js

@@ -473,20 +473,6 @@ var schema = {
   "memory_delete":            { direction: "c2s", handler: "lib/project.js", description: "Delete a memory entry by index" },
   "memory_deleted":           { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Memory entry was deleted" },
 
-  // -----------------------------------------------------------------------
-  // Mate datastore
-  // -----------------------------------------------------------------------
-  "mate_db_tables":           { direction: "c2s", handler: "lib/project-mate-datastore.js", description: "List schema objects in the current Mate datastore" },
-  "mate_db_describe":         { direction: "c2s", handler: "lib/project-mate-datastore.js", description: "Describe a table or view in the current Mate datastore" },
-  "mate_db_query":            { direction: "c2s", handler: "lib/project-mate-datastore.js", description: "Run read-only SQL against the current Mate datastore" },
-  "mate_db_exec":             { direction: "c2s", handler: "lib/project-mate-datastore.js", description: "Run schema or write SQL against the current Mate datastore" },
-  "mate_db_tables_result":    { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Schema objects returned from a Mate datastore" },
-  "mate_db_describe_result":  { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Table description returned from a Mate datastore" },
-  "mate_db_query_result":     { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Query results from a Mate datastore" },
-  "mate_db_exec_result":      { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Execution summary from a Mate datastore" },
-  "mate_db_error":            { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Mate datastore error" },
-  "mate_db_change":           { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Mate datastore changed" },
-
   // -----------------------------------------------------------------------
   // Loop (automated task runner)
   // -----------------------------------------------------------------------

package/lib/yoke/adapters/claude.js

@@ -1180,6 +1180,11 @@ function createClaudeAdapter(opts) {
         slashCommands: [],
         fastModeState: null,
         capabilities: {
+          effort: true,
+          fork: true,
+          rollback: false,
+          sessionListing: true,
+          sessionRename: true,
           thinking: true,
           betas: true,
           rewind: true,
@@ -1556,6 +1561,11 @@ function createClaudeAdapter(opts) {
             slashCommands: r.slashCommands || [],
             fastModeState: r.fastModeState || null,
             capabilities: {
+              effort: true,
+              fork: true,
+              rollback: false,
+              sessionListing: true,
+              sessionRename: true,
               thinking: true,
               betas: true,
               rewind: true,
@@ -1628,6 +1638,11 @@ function createClaudeAdapter(opts) {
         slashCommands: [],
         fastModeState: null,
         capabilities: {
+          effort: true,
+          fork: true,
+          rollback: false,
+          sessionListing: true,
+          sessionRename: true,
           thinking: true,
           betas: true,
           rewind: true,
@@ -1708,6 +1723,11 @@ function createClaudeAdapter(opts) {
             slashCommands: r.slashCommands || [],
             fastModeState: r.fastModeState || null,
             capabilities: {
+              effort: true,
+              fork: true,
+              rollback: false,
+              sessionListing: true,
+              sessionRename: true,
               thinking: true,
               betas: true,
               rewind: true,
@@ -1737,4 +1757,9 @@ function createClaudeAdapter(opts) {
 module.exports = {
   createClaudeAdapter: createClaudeAdapter,
   createMessageQueue: createMessageQueue,
+  contractTestKit: {
+    createMessageQueue: createMessageQueue,
+    createQueryHandle: createQueryHandle,
+    normalizeEvent: flattenEvent,
+  },
 };

package/lib/yoke/adapters/codex.js

@@ -597,6 +597,27 @@ function flattenEvent(notification, state) {
   return events;
 }
 
+function createEventState(model) {
+  return {
+    blockCounter: 0,
+    threadId: null,
+    turnStarted: false,
+    lastUsage: null,
+    lastInputTokens: null,
+    done: false,
+    aborted: false,
+    loopStarted: false,
+    model: model || "gpt-5.6-terra",
+    textBlocks: {},
+    textLengths: {},
+    thinkingBlocks: {},
+    thinkingLengths: {},
+    toolBlocks: {},
+    commandInputs: {},
+    planTexts: {},
+  };
+}
+
 // --- QueryHandle ---
 
 function createCodexQueryHandle(appServer, queryOpts) {
@@ -611,25 +632,7 @@ function createCodexQueryHandle(appServer, queryOpts) {
     return state.aborted || (abortController && abortController.signal && abortController.signal.aborted);
   }
 
-  var state = {
-    blockCounter: 0,
-    threadId: null,
-    turnStarted: false,
-    lastUsage: null,
-    lastInputTokens: null, // from thread/tokenUsage/updated
-    done: false,
-    aborted: false,
-    loopStarted: false,
-    model: queryOpts.model || "gpt-5.6-terra",
-    // Track incremental text deltas
-    textBlocks: {},     // itemId -> true (text_start sent)
-    textLengths: {},    // itemId -> last sent length
-    thinkingBlocks: {}, // itemId -> blockId
-    thinkingLengths: {}, // itemId -> last sent length
-    toolBlocks: {},     // itemId -> blockId (for tool_start dedup)
-    commandInputs: {},  // itemId -> command captured from approval/start events
-    planTexts: {},      // itemId -> streamed plan text
-  };
+  var state = createEventState(queryOpts.model);
 
   // Internal event buffer for async iterator
   var eventBuffer = [];
@@ -867,7 +870,7 @@ function createCodexQueryHandle(appServer, queryOpts) {
       var threadParams = {
         model: queryOpts.model || "gpt-5.6-terra",
         sandbox: queryOpts.sandboxMode || "workspace-write",
-        approvalPolicy: queryOpts.approvalPolicy || "on-failure",
+        approvalPolicy: queryOpts.approvalPolicy || "on-request",
         cwd: queryOpts.cwd,
         skipGitRepoCheck: true,
       };
@@ -1139,6 +1142,11 @@ function createCodexAdapter(opts) {
       slashCommands: skillNames || [],
       fastModeState: null,
       capabilities: {
+        effort: true,
+        fork: true,
+        rollback: true,
+        sessionListing: false,
+        sessionRename: false,
         thinking: true,
         betas: false,
         rewind: false,
@@ -1463,7 +1471,7 @@ function createCodexAdapter(opts) {
       if (queryOpts.toolPolicy === "allow-all") {
         handleOpts.approvalPolicy = "never";
       } else {
-        handleOpts.approvalPolicy = codexOpts.approvalPolicy || "on-failure";
+        handleOpts.approvalPolicy = codexOpts.approvalPolicy || "on-request";
       }
 
       // Sandbox mode
@@ -1590,4 +1598,9 @@ function createCodexAdapter(opts) {
 
 module.exports = {
   createCodexAdapter: createCodexAdapter,
+  contractTestKit: {
+    createEventState: createEventState,
+    createQueryHandle: createCodexQueryHandle,
+    normalizeEvent: flattenEvent,
+  },
 };

package/lib/yoke/adapters/kiro.js

@@ -377,30 +377,19 @@ function finalToolContent(state, callId, update) {
   return extractRawOutput(update.rawOutput);
 }
 
-// --- QueryHandle ---
-
-function createKiroQueryHandle(acp, queryOpts) {
-  var abortController = queryOpts.abortController;
-  var systemPrompt = queryOpts.systemPrompt || "";
-  var canUseTool = queryOpts.canUseTool || null;
-  var onFinished = queryOpts.onFinished || null;
-
-  function isCancelled() {
-    return state.aborted || (abortController && abortController.signal && abortController.signal.aborted);
-  }
-
-  var state = {
+function createEventState(opts) {
+  opts = opts || {};
+  return {
     blockCounter: 0,
-    sessionId: queryOpts.resumeSessionId || null,
-    model: queryOpts.model || "auto",
-    engine: queryOpts.engine || KIRO_DEFAULTS.engine,
+    sessionId: opts.resumeSessionId || null,
+    model: opts.model || "auto",
+    engine: opts.engine || KIRO_DEFAULTS.engine,
     lastInputTokens: null,
-    contextWindow: queryOpts.contextWindow || null,
+    contextWindow: opts.contextWindow || null,
     done: false,
     aborted: false,
     loopStarted: false,
     loadingSession: false,
-    // per-turn block tracking (reset each turn)
     textBlockOpen: false,
     textBlockId: null,
     thinkBlockOpen: false,
@@ -409,6 +398,21 @@ function createKiroQueryHandle(acp, queryOpts) {
     toolMeta: {},
     toolContent: {},
   };
+}
+
+// --- QueryHandle ---
+
+function createKiroQueryHandle(acp, queryOpts) {
+  var abortController = queryOpts.abortController;
+  var systemPrompt = queryOpts.systemPrompt || "";
+  var canUseTool = queryOpts.canUseTool || null;
+  var onFinished = queryOpts.onFinished || null;
+
+  function isCancelled() {
+    return state.aborted || (abortController && abortController.signal && abortController.signal.aborted);
+  }
+
+  var state = createEventState(queryOpts);
 
   // Async iterator plumbing
   var eventBuffer = [];
@@ -864,6 +868,11 @@ function createKiroAdapter(opts) {
       slashCommands: skillNames || [],
       fastModeState: null,
       capabilities: {
+        effort: false,
+        fork: false,
+        rollback: false,
+        sessionListing: false,
+        sessionRename: false,
         thinking: true,
         betas: false,
         rewind: false,
@@ -872,7 +881,7 @@ function createKiroAdapter(opts) {
         elicitation: false,
         fileCheckpointing: false,
         contextCompacting: true,
-        toolPolicy: ["ask", "allow-all"],
+        toolPolicy: ["ask"],
       },
     };
   }
@@ -1153,4 +1162,9 @@ function createKiroAdapter(opts) {
 
 module.exports = {
   createKiroAdapter: createKiroAdapter,
+  contractTestKit: {
+    createEventState: createEventState,
+    createQueryHandle: createKiroQueryHandle,
+    normalizeEvent: flattenUpdate,
+  },
 };