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

package/lib/workspace-assignment-service.js

@@ -19,6 +19,8 @@ function attachWorkspaceAssignmentService(ctx) {
   var records = [];
   var unsubscribers = {};
   var pendingRestartReplay = {};
+  var presentations = new WeakMap();
+  var presentationTargets = new WeakMap();
 
   function recordFile(userId) {
     return storageDir ? path.join(storageDir, userStorageKey(userId)) : null;
@@ -130,7 +132,27 @@ function attachWorkspaceAssignmentService(ctx) {
     return { project: project, manager: manager, session: session };
   }
 
+  function present(record, principal) {
+    try {
+      var display = ctx.getPresentation && ctx.getPresentation(principal), project = exactTarget(record);
+      if (!display || !project) return;
+      var view = { project: project, session: null, origin: null }; presentationTargets.set(record, view);
+      if (record.delivery === 'follow_up') project.getSessionManager().sessions.forEach(function (session) { if (ctx.sessionRef(record.targetProjectSlug, session) === record.targetSessionRef) { view.session = session; view.origin = session.sessionOriginId; } });
+      var projection = require('./clay-control-target-projection');
+      var target = view.session ? { kind: 'session', projectSlug: record.targetProjectSlug, sessionId: view.session.localId, sessionOriginId: view.origin } : { kind: 'project', projectSlug: record.targetProjectSlug, runtimeId: projection.runtime(project.getSessionManager()) };
+      var observer = display.track('assignment', record.delivery === 'follow_up' ? 'follow_up' : 'assign', target, function () {
+        if (exactTarget(record) !== project || view.session && (project.getSessionManager().sessions.get(view.session.localId) !== view.session || view.session.sessionOriginId !== view.origin || (view.session.ownerId || null) !== (record.userId || null))) throw new Error('Assignment target changed.');
+      }, 'review');
+      if (observer) { presentations.set(record, observer); var expiry = setTimeout(function () { presentations.delete(record); }, 300000); expiry.unref(); }
+    } catch (error) { /* Presentation never changes the assignment decision. */ }
+  }
   function emit(record, eventType) {
+    var observer = presentations.get(record);
+    if (observer) {
+      if (record.status === 'starting') observer.phase('queued');
+      else if (record.status === 'running') observer.phase('running');
+      else if (record.status !== 'proposed') { observer.finish({ status: record.status === 'interrupted' ? 'failed' : record.status, outcome: record.status === 'interrupted' ? 'uncertain' : undefined }); presentations.delete(record); }
+    }
     var source = exactSource(record);
     if (!source) return;
     source.manager.sendAndRecord(source.session, {
@@ -193,6 +215,7 @@ function attachWorkspaceAssignmentService(ctx) {
     if (!exactSource(record)) throw new Error("Source conversation is no longer available.");
     records.push(record);
     saveUser(record.userId);
+    present(record, principal);
     emit(record, "project_assignment_proposal");
     return publicRecord(record);
   }
@@ -229,6 +252,7 @@ function attachWorkspaceAssignmentService(ctx) {
     if (!exactSource(record)) throw new Error("Source conversation is no longer available.");
     records.push(record);
     saveUser(record.userId);
+    present(record, principal);
     emit(record, "project_assignment_proposal");
     return publicRecord(record);
   }
@@ -267,6 +291,7 @@ function attachWorkspaceAssignmentService(ctx) {
   }
 
   function watch(record, manager, session) {
+    var view = presentationTargets.get(record); if (view) { view.session = session; view.origin = session.sessionOriginId; var observer = presentations.get(record); if (observer && observer.target) observer.target({ kind: 'session', projectSlug: record.targetProjectSlug, sessionId: session.localId, sessionOriginId: session.sessionOriginId }); }
     var unsubscribe = manager.subscribeSession(session.localId, function (event) {
       if (event.type === "session_id") {
         record.targetSessionRef = ctx.sessionRef(record.targetProjectSlug, session);

package/lib/workspace-query-access.js

@@ -96,7 +96,10 @@ function attachWorkspaceQueryAccess(deps) {
     // as ownership would let a stale status skip the authoritative record.
     var access = record(status);
     if (!access) return denied;
-    if (access.ownerId && access.ownerId === principal.userId) return { owned: true, accessible: true };
+    if (access.ownerId && access.ownerId === principal.userId) {
+      var ownerPermitted = permitted(principal.userId, access);
+      return { owned: ownerPermitted, accessible: ownerPermitted };
+    }
     return { owned: false, accessible: permitted(principal.userId, access) };
   }
 

package/lib/workspace-query-mcp-server.js

@@ -32,7 +32,7 @@ function handler(bound, method) {
   };
 }
 
-var SESSION_CITATION = " When citing a returned session in user-visible text, write [clayos/<sessionRef> — short label] so Clay Studio renders an owner-validated session control.";
+var SESSION_CITATION = " Cite returned sessions as Markdown links: [short human label](session:OPAQUE_REFERENCE), replacing the entire target with the exact returned sessionRef. Do not prepend a project name, change the opaque reference, or wrap citations in backticks/code. For a specific returned entry, append #entry-<entryIndex> using its exact returned entry index. Legacy [clayos/<sessionRef> — short label] remains supported. Labels are presentation only; Clay Studio resolves the exact reference with the authenticated owner's permissions.";
 
 function commonTools(bound) {
   return [

package/lib/workspace-query-service.js

@@ -168,6 +168,13 @@ function attachWorkspaceQueryService(ctx) {
     } else if (source.session.ownerId) {
       return null;
     }
+    if (source.viewerId !== undefined) {
+      var viewerPrincipal = {
+        userId: isMultiUser() ? source.viewerId : null,
+        singleUserOwnerId: isMultiUser() ? null : source.viewerId,
+      };
+      if (!ownsSession(viewerPrincipal, source.session)) return null;
+    }
     return createBound({
       userId: isMultiUser() ? source.session.ownerId : null,
       sourceProjectSlug: source.projectSlug,
@@ -366,11 +373,13 @@ function attachWorkspaceQueryService(ctx) {
 
   function resolveSessionNavigation(principal, ref) {
     if (typeof ref !== "string" || !/^session:[A-Za-z0-9_-]{24}$/.test(ref)) throw new Error("Invalid session reference.");
+    var entryIndex = arguments.length > 2 ? arguments[2] : null;
+    if (entryIndex !== null && entryIndex !== undefined && (!Number.isSafeInteger(entryIndex) || entryIndex < 0)) throw new Error("Invalid session entry reference.");
     var projects = collect(principal);
     for (var p = 0; p < projects.length; p++) {
       var session = findSession(projects[p], ref);
       if (!session) continue;
-      return {
+      var target = {
         projectSlug: projects[p].projectSlug,
         projectTitle: projects[p].projectTitle,
         isMate: projects[p].isMate,
@@ -379,6 +388,8 @@ function attachWorkspaceQueryService(ctx) {
         homeSessionId: session.cliSessionId || "local:" + session.localId,
         title: cleanMetadata(session.title || "New Session", 160),
       };
+      if (entryIndex !== null && entryIndex !== undefined) target.entryIndex = entryIndex;
+      return target;
     }
     throw new Error("Session not found in the owned workspace.");
   }
@@ -450,7 +461,7 @@ function attachWorkspaceQueryService(ctx) {
         if (!principal.isClay) throw new Error("Workspace-wide activity is available only to builtin Clay.");
         return workspaceActivity(principal, args || {});
       },
-      resolveSessionNavigation: function (args) { return resolveSessionNavigation(principal, args && args.sessionRef); },
+      resolveSessionNavigation: function (args) { return resolveSessionNavigation(principal, args && args.sessionRef, args && args.entryIndex); },
       listRecentDecisions: function (args) {
         if (!principal.isClay) throw new Error("Workspace decisions are available only to builtin Clay.");
         return recentDecisions(principal, args || {});

package/lib/ws-request.js

@@ -8,6 +8,7 @@ function parseWsRequestUrl(requestUrl) {
     path: parsed.pathname || "/",
     pane: parsed.query.pane === "1",
     paneSession: paneSession,
+    contextual: parsed.query.pane === "1" && parsed.query.contextual === "1",
   };
 }
 

package/lib/ws-schema.js

@@ -11,6 +11,11 @@
  * Use it as a reference when adding new message types.
  */
 
+// message.contextualSnapshot: version=1, viewId, nullable projectTitle,
+// conversationTitle/projectSlug (160 characters), nullable positive sessionId,
+// screen=Home|Project|Direct message. Private canonical owner delivery only.
+// Persisted user_message metadata is echoed in message_ack only after recording;
+// queued admission ACK has no snapshot. Never part of user text/pastes or authority.
 var schema = {
 
   // -----------------------------------------------------------------------
@@ -62,6 +67,7 @@ var schema = {
   "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" },
+  "home_clay_contextual_session": { direction: "s2c", handler: "lib/public/modules/contextual-search.js", description: "Return the exact fresh canonical session for an idempotent contextual Ask request; does not submit or execute a message" },
   "issues_list": { direction: "c2s", handler: "lib/project-issues.js", description: "Project Issues issues list" },
   "issue_read": { direction: "c2s", handler: "lib/project-issues.js", description: "Project Issues issue read" },
   "issue_create": { direction: "c2s", handler: "lib/project-issues.js", description: "Project Issues issue create" },
@@ -482,6 +488,7 @@ var schema = {
   "term_resized":             { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Terminal was resized" },
   "term_exited":              { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Terminal process exited" },
   "term_closed":              { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Terminal session was closed" },
+  "term_control_projection": { direction: "s2c", handler: "lib/public/modules/terminal.js", description: "Authoritative terminal identity/revision after owner resize without echoing resize input" },
   "term_list":                { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Full list of open terminals" },
   "term_error":               { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Terminal error (e.g. access denied)" },
   "shell_command":            { direction: "c2s", handler: "lib/project-shell-command.js", description: "Run a one-shot shell command for agent context" },
@@ -495,10 +502,11 @@ var schema = {
   "note_written":             { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Agent created or updated a sticky note" },
   "note_update":              { direction: "c2s", handler: "lib/project-user-message.js", description: "Update a sticky note" },
   "note_updated":             { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Sticky note was updated" },
-  "note_close":               { direction: "c2s", handler: "lib/project-user-message.js", description: "Close a sticky note (reversible; never deletes)" },
+  "note_update_result":        { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Correlated sticky note update result" },
+  "note_close":               { direction: "c2s", handler: "lib/project-user-message.js", description: "Close a sticky note; human draft-aware requests remove empty notes, tool and legacy closes stay reversible" },
   "note_reopen":              { direction: "c2s", handler: "lib/project-user-message.js", description: "Reopen a closed sticky note" },
   "note_delete":              { direction: "c2s", handler: "lib/project-user-message.js", description: "Retired: older clients still send this; handled as a non-destructive close" },
-  "note_deleted":             { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Retired: never sent. Closing broadcasts note_updated instead" },
+  "note_deleted":             { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "A sticky note was permanently removed after a human-authorized storage transaction" },
   "note_list_request":        { direction: "c2s", handler: "lib/project-user-message.js", description: "Request the full notes list" },
   "note_bring_front":         { direction: "c2s", handler: "lib/project-user-message.js", description: "Bring a note to front (update z-order)" },
   "notes_list":               { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Full list of sticky notes" },
@@ -784,6 +792,7 @@ var schema = {
   // -----------------------------------------------------------------------
   "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" },
+  "contextual_mate_sessions_result": { direction: "s2c", handler: "lib/public/modules/contextual-mate-sessions.js", description: "Exact owner-private saved Mate conversation list or selection receipt; no transcript tap or underlying navigation" },
   "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" },
@@ -809,6 +818,13 @@ var schema = {
   "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" },
+  "clay_ui_ready":            { direction: "c2s", handler: "lib/server-owner-ui.js", description: "Advertise exact owner UI navigation support on this socket" },
+  "clay_navigation_offer":    { direction: "s2c", handler: "lib/public/modules/clay-owner-navigation.js", description: "Offer one exact reviewed navigation to a selected owner connection" },
+  "clay_navigation_claim":    { direction: "c2s", handler: "lib/server-owner-ui.js", description: "Claim an offered navigation with live source/target revalidation" },
+  "clay_navigation_apply":    { direction: "s2c", handler: "lib/public/modules/clay-owner-navigation.js", description: "Invoke the shared conversation navigator after live claim" },
+  "clay_studio_rendered": { direction: "c2s", handler: "lib/project-studio-presentation.js", description: "Exact source-viewer workbench render receipt; no product effects" },
+  "clay_navigation_rendered": { direction: "c2s", handler: "lib/server-owner-ui.js", description: "Bounded exact-viewer rendered conversation evidence; acceptance alone remains separate" },
+  "clay_navigation_ack":      { direction: "c2s", handler: "lib/server-owner-ui.js", description: "Client invocation acknowledgement; never proof of visible rendering" },
   "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" },

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

@@ -9,8 +9,9 @@ var execFile = require("child_process").execFile;
 var execFileSync = require("child_process").execFileSync;
 
 function findOnPath(binaryName, overrideName) {
-  var overridePath = overrideName && process.env[overrideName];
-  if (overridePath && fs.existsSync(overridePath)) return overridePath;
+  var discovery = require("./discovery");
+  var overridePath = overrideName && discovery.explicitEntry(process.env, overrideName, false);
+  if (overridePath !== undefined && overrideName) return overridePath;
   try {
     var command = process.platform === "win32" ? "where" : "which";
     var out = execFileSync(command, [binaryName], {
@@ -18,7 +19,8 @@ function findOnPath(binaryName, overrideName) {
       encoding: "utf8",
       stdio: ["pipe", "pipe", "pipe"],
     });
-    return out.trim().split(/\r?\n/)[0] || null;
+    var resolved = out.trim().split(/\r?\n/)[0] || null;
+    return discovery.validEntry(resolved, false) ? resolved : null;
   } catch (e) {
     return null;
   }
@@ -50,7 +52,7 @@ function fetchOpenCodeResolvedConfig(binaryPath, cwd, env) {
   return new Promise(function(resolve, reject) {
     execFile(binaryPath, ["debug", "config"], {
       cwd: cwd || process.cwd(),
-      env: Object.assign({}, process.env, env || {}),
+      env: env ? Object.assign({}, env) : process.env,
       timeout: 30000,
       maxBuffer: 4 * 1024 * 1024,
     }, function(err, stdout) {
@@ -141,7 +143,7 @@ var ACP_AGENT_PROFILES = {
       });
     },
     buildProcessOptions: function(ctx, base) {
-      var existing = (base.env && base.env.OPENCODE_CONFIG_CONTENT) || process.env.OPENCODE_CONFIG_CONTENT;
+      var existing = base.env ? base.env.OPENCODE_CONFIG_CONTENT : process.env.OPENCODE_CONFIG_CONTENT;
       var config = {};
       if (existing) config = JSON.parse(existing);
       var agent = Object.assign({}, config.agent || {});

package/lib/yoke/adapters/antigravity.js

@@ -3,19 +3,7 @@ var childProcess = require("child_process");
 var readline = require("readline");
 var skillDiscovery = require("../skill-discovery");
 
-function findBinary() {
-  if (process.env.ANTIGRAVITY_CLI_PATH) return process.env.ANTIGRAVITY_CLI_PATH;
-  try {
-    var command = process.platform === "win32" ? "where" : "which";
-    return childProcess.execFileSync(command, ["agy"], {
-      encoding: "utf8",
-      timeout: 3000,
-      stdio: ["pipe", "pipe", "pipe"],
-    }).trim().split(/\r?\n/)[0] || null;
-  } catch (e) {
-    return null;
-  }
-}
+var findBinary = require("../providers/antigravity-executable").resolve;
 
 function modelValue(model) {
   if (typeof model === "string") return model;
@@ -427,7 +415,8 @@ function createAntigravityAdapter(opts) {
   var adapter = {
     vendor: "antigravity",
     init: async function(initOpts) {
-      if (!binaryPath) binaryPath = findBinary();
+      if (opts.linuxUser || initOpts && initOpts.linuxUser) throw new Error("Antigravity does not support mapped OS-user execution.");
+      if (!binaryPath) binaryPath = findBinary({ env: initOpts && initOpts.env || opts.env || process.env });
       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;

package/lib/yoke/adapters/claude-query-contract.js

@@ -0,0 +1,9 @@
+// Init-free provider transport obligations, shared by the registry and adapter.
+module.exports = {
+  questionInput: function(name, input) { return name === "AskUserQuestion" ? input : null; },
+  toolTransport: "sdk-mcp",
+  catalogLifetime: "query",
+  permissionModes: ["auto"],
+  mcpPermissionOverrides: true,
+  interruptionMessage: "Interrupted · What should Claude do instead?",
+};

package/lib/yoke/adapters/claude.js

@@ -4,6 +4,7 @@
 // This is the ONLY file (besides claude-worker.js) that imports the SDK.
 // Also manages worker processes for OS-level user isolation.
 
+var attachWorkerStartup = require("../claude-worker-startup").attachWorkerStartup;
 var bindQueryAbort = require("../query-abort").bindAbort;
 var path = require("path");
 var fs = require("fs");
@@ -527,7 +528,7 @@ function flattenEvent(raw) {
   // --- rate_limit_event ---
   if (raw.type === "rate_limit_event" && raw.rate_limit_info) {
     base.yokeType = "rate_limit";
-    base.rateLimitInfo = raw.rate_limit_info;
+    base.rateLimitInfo = Object.assign({}, raw.rate_limit_info, { isUsingOverage: raw.rate_limit_info.isUsingOverage === true || raw.rate_limit_info.overageInUse === true });
     return base;
   }
 
@@ -600,6 +601,8 @@ function createQueryHandle(rawQuery, messageQueue, abortController) {
   var correlation = claudeCorrelation.createCorrelation();
   var closed = false;
   var removeAbort = function () {};
+  var resolveStopped;
+  var stopped = new Promise(function(resolve) { resolveStopped = resolve; });
   var handle = {
     // Opaque adapter state (null for in-process queries)
     _adapterState: null,
@@ -610,12 +613,13 @@ function createQueryHandle(rawQuery, messageQueue, abortController) {
       return {
         next: function() {
           return rawIter.next().then(function(result) {
-            if (result.done) { closed = true; removeAbort(); }
+            if (result.done) { closed = true; removeAbort(); resolveStopped(); }
             if (result.done) return result;
             return { value: correlation.result(result.value, flattenEvent(result.value)), done: false };
           }, function(err) {
             closed = true;
             removeAbort();
+            resolveStopped();
             throw err;
           });
         },
@@ -715,6 +719,11 @@ function createQueryHandle(rawQuery, messageQueue, abortController) {
       }
     },
 
+    stopAndWait: function() {
+      handle.abort();
+      return stopped;
+    },
+
     close: function() {
       closed = true;
       removeAbort();
@@ -818,9 +827,7 @@ function spawnWorker(linuxUser, workerScriptPath, cwd) {
     buffer: "",
   };
 
-  worker.readyPromise = new Promise(function(resolve) {
-    worker._readyResolve = resolve;
-  });
+  attachWorkerStartup(worker);
 
   // Resolves when the worker process actually exits.
   // Used to prevent spawning a new worker before the old one finishes
@@ -860,7 +867,15 @@ function spawnWorker(linuxUser, workerScriptPath, cwd) {
     });
     connection.on("error", function(err) {
       console.error("[yoke/claude] Worker connection error:", err.message);
+      if (worker._readyReject) worker._readyReject(err);
     });
+    connection.on("close", function() {
+      if (worker._readyReject) worker._readyReject(new Error("Claude worker connection closed before ready."));
+    });
+  });
+  worker.server.on("error", function(error) {
+    if (worker._readyReject) worker._readyReject(error);
+    cleanupWorker(worker);
   });
 
   worker.server.listen(socketPath, function() {
@@ -892,6 +907,14 @@ function spawnWorker(linuxUser, workerScriptPath, cwd) {
     });
     worker.process = spawn(workerSpawn.command, workerSpawn.args, workerSpawn.options);
 
+    worker.process.on("error", function(error) {
+      if (worker._readyReject) worker._readyReject(error);
+      worker.messageHandlers.forEach(function(handler) { handler({ type: "query_error", error: error.message, _fallback: true }); });
+      cleanupWorker(worker);
+      // Only a spawn failure proves that no child execution exists. Other
+      // ChildProcess errors (for example a failed signal) are not exit evidence.
+      if (!worker.process.pid && worker._exitResolve) { worker._exitResolve(); worker._exitResolve = null; }
+    });
     worker.process.stdout.on("data", function(data) {
       console.log("[sdk-worker:" + linuxUser + "] " + data.toString().trim());
     });
@@ -905,9 +928,8 @@ function spawnWorker(linuxUser, workerScriptPath, cwd) {
     worker.process.on("exit", function(code, signal) {
       console.log("[yoke/claude] Worker for " + linuxUser + " exited (code=" + code + ", signal=" + signal + ")" + (worker._stderrBuf ? " stderr: " + worker._stderrBuf.trim() : ""));
       // Reject readyPromise if worker dies before becoming ready
-      if (!worker.ready && worker._readyResolve) {
-        worker._readyResolve = null;
-        // Let the readyPromise hang; the query_error handler will clean up
+      if (!worker.ready && worker._readyReject) {
+        worker._readyReject(new Error("Claude worker exited before ready (code=" + code + ")."));
       }
       // Notify message handlers about unexpected exit so sessions don't hang.
       // Always dispatch a fallback query_error. The handler is idempotent:
@@ -1082,6 +1104,9 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool,
   var iterWaiting = null;
   var iterEnded = false;
   var iterError = null;
+  var resolveStopped;
+  var stopped = new Promise(function(resolve) { resolveStopped = resolve; });
+  if (worker.exitPromise) worker.exitPromise.then(resolveStopped);
 
   // Pending request/response correlation for handle methods that need a
   // result from the worker (e.g. rewindFiles). Each entry is keyed by a
@@ -1299,6 +1324,8 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool,
       }
 
       case "query_done":
+        if (worker._abortTimeout) { clearTimeout(worker._abortTimeout); worker._abortTimeout = null; }
+        resolveStopped();
         rejectPendingPermissionModes(new Error("Worker query ended while changing permission mode"));
         console.log("[yoke/claude] IPC query_done received, pid=" + (worker.process ? worker.process.pid : "?"));
         worker._queryEnded = true;
@@ -1306,6 +1333,10 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool,
         break;
 
       case "query_error": {
+        if (!msg._fallback) {
+          if (worker._abortTimeout) { clearTimeout(worker._abortTimeout); worker._abortTimeout = null; }
+          resolveStopped();
+        }
         rejectPendingPermissionModes(new Error(msg.error || "Worker exited while changing permission mode"));
         console.log("[yoke/claude] IPC query_error received, pid=" + (worker.process ? worker.process.pid : "?") + " _fallback=" + !!msg._fallback + " _queryEnded=" + worker._queryEnded + " error=" + (msg.error || "").substring(0, 100));
         // Skip fallback errors from exit handler if we already handled the real one
@@ -1472,6 +1503,11 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool,
       }, 5000);
     },
 
+    stopAndWait: function() {
+      handle.abort();
+      return stopped;
+    },
+
     close: function() {
       rejectPendingPermissionModes(new Error("Worker query closed while changing permission mode"));
       // End the iterator
@@ -1507,43 +1543,7 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool,
 
 // --- Adapter factory ---
 
-function resolveClaudeBinaryPath() {
-  // 1. Explicit env var override
-  if (process.env.CLAUDE_CODE_PATH && fs.existsSync(process.env.CLAUDE_CODE_PATH)) {
-    return process.env.CLAUDE_CODE_PATH;
-  }
-
-  // 2. `which claude` in the daemon's PATH
-  try {
-    var result = require("child_process").execSync("which claude", { encoding: "utf8", timeout: 5000 }).trim();
-    if (result && fs.existsSync(result)) return result;
-  } catch (e) {}
-
-  // 3. Common per-user and system locations (best-effort fallback for the daemon user)
-  var home = process.env.HOME || "";
-  var candidates = [];
-  if (home) {
-    candidates.push(home + "/.npm-global/bin/claude");
-    candidates.push(home + "/.local/bin/claude");
-    candidates.push(home + "/.volta/bin/claude");
-    candidates.push(home + "/.bun/bin/claude");
-    candidates.push(home + "/bin/claude");
-  }
-  candidates.push("/usr/local/bin/claude");
-  candidates.push("/usr/bin/claude");
-  candidates.push("/opt/homebrew/bin/claude");
-  for (var i = 0; i < candidates.length; i++) {
-    try { if (fs.existsSync(candidates[i])) return candidates[i]; } catch (e) {}
-  }
-
-  // 4. Bundled CLI entry from the SDK's peer
-  try {
-    var resolved = require.resolve("@anthropic-ai/claude-code/cli.js");
-    if (resolved && fs.existsSync(resolved)) return resolved;
-  } catch (e) {}
-
-  return null;
-}
+var resolveClaudeBinaryPath = require("../providers/claude-executable").resolve;
 
 function createClaudeAdapter(opts) {
   var _cwd = (opts && opts.cwd) || process.cwd();
@@ -1556,6 +1556,7 @@ function createClaudeAdapter(opts) {
 
   var adapter = {
     vendor: "claude",
+    queryContract: require("./claude-query-contract"),
     userInputCapability: { mode: "native", native: true, transport: "AskUserQuestion/onElicitation" },
 
     // Path to worker script (sdk-bridge uses this to spawn worker processes)
@@ -1642,7 +1643,7 @@ function createClaudeAdapter(opts) {
 
             try {
               var models = await stream.supportedModels();
-              result.models = models || [];
+              result.models = require("../providers/claude-model-descriptions").list(models);
               _cachedModels = result.models;
             } catch (e) {
               // supportedModels may fail, models list will be empty
@@ -1909,7 +1910,10 @@ function createClaudeAdapter(opts) {
 
     // Wait for worker to be ready before sending query_start
     if (!reusingWorker) {
-      await worker.readyPromise;
+      try { await worker.readyPromise; } catch (error) {
+        worker.kill();
+        throw error;
+      }
     }
 
     // Build serializable query options (no callbacks, no AbortController).
@@ -1954,7 +1958,7 @@ function createClaudeAdapter(opts) {
           warmupDone = true;
           var r = msg.result || {};
           resolve({
-            models: r.models || [],
+            models: require("../providers/claude-model-descriptions").list(r.models),
             defaultModel: r.model || "",
             skills: r.skills || [],
             slashCommands: r.slashCommands || [],
@@ -2071,7 +2075,7 @@ function createClaudeAdapter(opts) {
 
             try {
               var models = await stream.supportedModels();
-              result.models = models || [];
+              result.models = require("../providers/claude-model-descriptions").list(models);
               _cachedModels = result.models;
             } catch (e) {
               // supportedModels may fail, models list will be empty
@@ -2122,7 +2126,7 @@ function createClaudeAdapter(opts) {
           warmupDone = true;
           var r = msg.result || {};
           resolve({
-            models: r.models || [],
+            models: require("../providers/claude-model-descriptions").list(r.models),
             defaultModel: r.model || "",
             skills: r.skills || [],
             slashCommands: r.slashCommands || [],

package/lib/yoke/adapters/codex-query-contract.js

@@ -0,0 +1,24 @@
+// Codex restores dynamic definitions from the original thread catalog.
+// Keep persisted legacy field names here so old conversations remain readable.
+var fields = {
+  schedules: "codexDynamicToolCatalogVersion",
+  questions: "codexUserInputToolCatalogVersion",
+  browser: "codexSharedBrowserToolCatalogVersion",
+  issues: "codexIssuesToolCatalogVersion",
+  knowledge: "codexYouToolCatalogVersion",
+  linear: "codexLinearToolCatalogVersion",
+};
+module.exports = {
+  toolTransport: "dynamic",
+  catalogLifetime: "conversation",
+  externalToolTransport: "dynamic",
+  defaultUserInputMode: "fallback",
+  questionGuidance: require("../user-input-guidance").codexQuestionGuidance,
+  catalogVersion: function (session, family) { return Number(session[fields[family]] || 0); },
+  recordCatalog: function (session, versions) {
+    Object.keys(versions).forEach(function (family) {
+      if (fields[family]) session[fields[family]] = versions[family];
+    });
+  },
+  staleCatalogReason: "This Codex conversation predates Clay's scheduled-task tool catalog. Start a new conversation to use the assisted interview; manual task creation remains available here.",
+};