clay-server 5.2.0-beta.5 → 5.2.0-beta.6

package/lib/session-hygiene.js

@@ -5,7 +5,7 @@
 var sessionProvenance = require("./session-provenance");
 
 var BLANK_SESSION_MAX_AGE_MS = 24 * 60 * 60 * 1000;
-var CLAUDE_INTERRUPTED_TEXT = "[Request interrupted by user]";
+var transcriptHygiene = require("./yoke/claude-transcript-hygiene");
 
 // A session is "blank" when nothing has ever happened in it and nothing is
 // attached to it. Adopted external sessions are never blank (their transcript
@@ -61,43 +61,11 @@ function collectStaleBlankSessions(sessions, activeSessionId, now) {
   return stale;
 }
 
-function extractClaudeUserText(event) {
-  var content = event && event.message && event.message.content;
-  if (typeof content === "string") return content;
-  if (!Array.isArray(content)) return "";
-  var parts = [];
-  for (var i = 0; i < content.length; i++) {
-    if (content[i] && content[i].type === "text" && typeof content[i].text === "string") {
-      parts.push(content[i].text);
-    }
-  }
-  return parts.join("");
-}
-
-// SDK capability probes create a real Claude transcript with a single "hi"
-// prompt. Newer Claude Code versions append an interruption record when Clay
-// aborts the probe, so that bookkeeping record must not make the transcript
-// look like a real two-turn conversation.
-function isClaudeWarmupTranscript(events) {
-  var promptCount = 0;
-  for (var i = 0; i < events.length; i++) {
-    var event = events[i];
-    if (!event || typeof event !== "object") continue;
-    if (event.type === "assistant") return false;
-    if (event.type !== "user" || !event.message || event.message.role !== "user") continue;
-    var text = extractClaudeUserText(event);
-    if (text === CLAUDE_INTERRUPTED_TEXT) continue;
-    if (text !== "hi") return false;
-    promptCount++;
-  }
-  return promptCount === 1;
-}
-
 module.exports = {
   isBlankSession: isBlankSession,
   findReusableBlankSession: findReusableBlankSession,
   collectStaleBlankSessions: collectStaleBlankSessions,
-  extractClaudeUserText: extractClaudeUserText,
-  isClaudeWarmupTranscript: isClaudeWarmupTranscript,
+  extractClaudeUserText: transcriptHygiene.extractClaudeUserText,
+  isClaudeWarmupTranscript: transcriptHygiene.isClaudeWarmupTranscript,
   BLANK_SESSION_MAX_AGE_MS: BLANK_SESSION_MAX_AGE_MS,
 };

package/lib/session-permission-mode.js

@@ -7,11 +7,12 @@ function normalize(mode) {
   return null;
 }
 
-function capabilities(session, defaultVendor) {
+function capabilities(session, defaultVendor, provider) {
   var vendor = session && session.vendor || defaultVendor || "claude";
+  var contract = require("./yoke/session-tool-transport").contract(provider || vendor);
   return {
-    auto: vendor === "claude",
-    mcpOverride: vendor === "claude" && !!(session && session.queryInstance &&
+    auto: Array.isArray(contract.permissionModes) && contract.permissionModes.indexOf("auto") !== -1,
+    mcpOverride: contract.mcpPermissionOverrides === true && !!(session && session.queryInstance &&
       typeof session.queryInstance.setMcpPermissionModeOverride === "function"),
   };
 }

package/lib/session-skill-scope.js

@@ -0,0 +1,11 @@
+// Bind personal instruction reads to the existing live session/query authority.
+function bind(session, sessions, options, valid, multiUser) {
+  var owner = session.ownerId || null;
+  return Object.assign({}, options, { isAvailable: function() {
+    if (!sessions || typeof sessions.get !== "function" || sessions.get(session.localId) !== session || !valid() || (session.ownerId || null) !== owner || session.youCurator || session.sessionVisibility === "shared" || session._mcpForeignInput) return false;
+    if (owner) return require("./mcp-session-access").canUsePersonalConnections(session, sessions);
+    return !multiUser && !session.delegated && !session._delegatedBy && !session._pairDelegation
+      && !(session.history || []).some(function(entry) { return entry.type === "user_message" && entry.from && entry.from !== "default"; });
+  } });
+}
+module.exports = { bind: bind };

package/lib/sessions.js

@@ -3,7 +3,7 @@ var path = require("path");
 var config = require("./config");
 var utils = require("./utils");
 var users = require("./users");
-var { CODEX_DEFAULTS } = require("./codex-defaults");
+var providerDefaults = require("./yoke/settings").defaults();
 var hygiene = require("./session-hygiene");
 var backgroundTaskTiming = require("./background-task-timing");
 var sessionProvenance = require("./session-provenance");
@@ -39,16 +39,16 @@ function createSessionManager(opts) {
   var permissionRequestIndex = {}; // requestId -> sessionLocalId (O(1) lookup)
   var capabilitiesByVendor = null; // set by sdk-bridge after adapter init
   var defaultVendor = null;        // set by sdk-bridge
-  var codexApproval = CODEX_DEFAULTS.approval;
-  var codexSandbox = CODEX_DEFAULTS.sandbox;
-  var codexWebSearch = CODEX_DEFAULTS.webSearch;
+  var codexApproval = providerDefaults.codexApproval;
+  var codexSandbox = providerDefaults.codexSandbox;
+  var codexWebSearch = providerDefaults.codexWebSearch;
 
   // --- Session persistence (centralized in ~/.clay/sessions/{encoded-cwd}/) ---
   var sessionsBase = opts.sessionsBase || path.join(config.CONFIG_DIR, "sessions");
   var encodedCwd = utils.resolveEncodedDir(sessionsBase, cwd);
   var sessionsDir = path.join(sessionsBase, encodedCwd);
   fs.mkdirSync(sessionsDir, { recursive: true });
-  var cliSessionsDir = opts.cliSessionsDir || path.join(config.REAL_HOME, ".claude", "projects", utils.encodeCwd(cwd));
+  var cliSessionsDir = opts.cliSessionsDir || require("./yoke/legacy-sessions").directory(config.REAL_HOME, cwd);
   var deletedCliSessionsPath = path.join(sessionsDir, "deleted-cli-sessions.json");
   var deletedCliSessionIds = new Set();
   try {
@@ -77,29 +77,6 @@ function createSessionManager(opts) {
     }
   }
 
-  function readCliTranscriptHead(filePath) {
-    var MAX_READ = 64 * 1024;
-    try {
-      var stat = fs.statSync(filePath);
-      var fd = fs.openSync(filePath, "r");
-      var bytesToRead = Math.min(stat.size, MAX_READ);
-      var buf = Buffer.alloc(bytesToRead);
-      fs.readSync(fd, buf, 0, bytesToRead, 0);
-      fs.closeSync(fd);
-      var lines = buf.toString("utf8").split("\n");
-      var events = [];
-      for (var i = 0; i < lines.length; i++) {
-        if (!lines[i]) continue;
-        try {
-          var event = JSON.parse(lines[i]);
-          if (event && typeof event === "object") events.push(event);
-        } catch (e) {}
-      }
-      return events;
-    } catch (e) {
-      return null;
-    }
-  }
 
   // Auto-migrate sessions from legacy locations:
   //   v1: {cwd}/.claude-relay/sessions/
@@ -470,9 +447,6 @@ function createSessionManager(opts) {
   //   - Warmup shape: 1 real "hi" prompt, optional automatic interruption,
   //     and 0 assistant messages (covered by daemon cleanup but defensive)
   function adoptOrphanedCliSessions() {
-    var files;
-    try { files = fs.readdirSync(cliSessionsDir); } catch (e) { return; }
-
     // Build set of cliSessionIds Clay already tracks
     var knownCliIds = new Set();
     sessions.forEach(function (s) {
@@ -481,56 +455,10 @@ function createSessionManager(opts) {
 
     var adopted = 0;
 
-    for (var i = 0; i < files.length; i++) {
-      if (!files[i].endsWith(".jsonl")) continue;
-      var cliSid = files[i].slice(0, -".jsonl".length);
-      if (knownCliIds.has(cliSid)) continue;
-      if (deletedCliSessionIds.has(cliSid)) continue;
-
-      var fp = path.join(cliSessionsDir, files[i]);
-      var events = readCliTranscriptHead(fp);
-      if (!events) continue;
-      var userCount = 0;
-      var firstUserText = null;
-      var createdAtIso = null;
-      for (var li = 0; li < events.length; li++) {
-        var ev = events[li];
-        if (ev.type === "user" && ev.message && ev.message.role === "user") {
-          userCount++;
-          if (firstUserText == null) {
-            var c = ev.message.content;
-            if (typeof c === "string") {
-              firstUserText = c;
-            } else if (Array.isArray(c)) {
-              var parts = [];
-              for (var ci = 0; ci < c.length; ci++) {
-                if (c[ci] && c[ci].type === "text" && typeof c[ci].text === "string") parts.push(c[ci].text);
-              }
-              firstUserText = parts.join("");
-            }
-            if (ev.timestamp && !createdAtIso) createdAtIso = ev.timestamp;
-          }
-        }
-      }
-
-      if (userCount === 0) continue;
-      // Defensive warmup skip (daemon also cleans these)
-      if (hygiene.isClaudeWarmupTranscript(events)) continue;
-
-      // Title: first user message trimmed/truncated. Fall back to a
-      // neutral label so the sidebar entry is identifiable.
-      var title = (firstUserText || "").trim().replace(/\s+/g, " ");
-      if (title.length > 60) title = title.slice(0, 57) + "...";
-      if (!title) title = "Imported CLI session";
-
-      var createdAt = Date.now();
-      if (createdAtIso) {
-        var t = Date.parse(createdAtIso);
-        if (!isNaN(t)) createdAt = t;
-      }
-      var lastActivity = createdAt;
-      try { lastActivity = fs.statSync(fp).mtimeMs; } catch (e) {}
-
+    var candidates = require("./yoke/legacy-sessions").candidates(cliSessionsDir, knownCliIds, deletedCliSessionIds);
+    for (var i = 0; i < candidates.length; i++) {
+      var candidate = candidates[i], cliSid = candidate.id;
+      var title = candidate.title, createdAt = candidate.createdAt, lastActivity = candidate.lastActivity;
       var localId = nextLocalId++;
       var session = {
         localId: localId,
@@ -548,7 +476,7 @@ function createSessionManager(opts) {
         history: [],
         messageUUIDs: [],
         lastRewindUuid: null,
-        vendor: "claude",
+        vendor: candidate.vendor,
         mode: "tui",
         // Adopted from an external `claude` run in this cwd, not started by
         // Clay. Notification emitters must stay silent for these until the
@@ -580,10 +508,7 @@ function createSessionManager(opts) {
     var stale = [];
     sessions.forEach(function (session) {
       if (!session.adopted || !session.cliSessionId) return;
-      var transcriptPath = path.join(cliSessionsDir, session.cliSessionId + ".jsonl");
-      var events = readCliTranscriptHead(transcriptPath);
-      var missingEmptySource = !fs.existsSync(transcriptPath) && (!session.history || session.history.length === 0);
-      if (missingEmptySource || (events && hygiene.isClaudeWarmupTranscript(events))) stale.push(session.localId);
+      if (require("./yoke/legacy-sessions").obsolete(cliSessionsDir, session)) stale.push(session.localId);
     });
     for (var i = 0; i < stale.length; i++) deleteSessionQuiet(stale[i]);
     if (stale.length > 0) {
@@ -877,7 +802,8 @@ function createSessionManager(opts) {
       if (_item && (_item.type === "mention_user" || _item.type === "mention_response")) {
         console.log("[DEBUG replayHistory] sending mention at index=" + i + " from=" + fromIndex + " total=" + total + " type=" + _item.type + " mate=" + (_item.mateName || ""));
       }
-      var replayItem = transform ? transform(_item) : _item;
+      var normalizedItem = require("./yoke/usage").clientEvent(_item, session.vendor || "claude");
+      var replayItem = transform ? transform(normalizedItem) : normalizedItem;
       if (replayItem && typeof replayItem === "object") replayItem = Object.assign({}, replayItem, { _historyIndex: i });
       _send(replayItem);
     }
@@ -887,9 +813,11 @@ function createSessionManager(opts) {
     var lastModelUsage = null;
     var lastCost = null;
     var lastStreamInputTokens = null;
+    var lastContext = null;
     for (var j = total - 1; j >= 0; j--) {
       if (session.history[j].type === "result") {
-        var r = session.history[j];
+        var r = require("./yoke/usage").clientEvent(session.history[j], session.vendor || "claude");
+        lastContext = r.context || null;
         lastUsage = r.usage || null;
         lastModelUsage = r.modelUsage || null;
         lastCost = r.cost != null ? r.cost : null;
@@ -898,7 +826,7 @@ function createSessionManager(opts) {
       }
     }
 
-    _send({ type: "history_done", lastUsage: lastUsage, lastModelUsage: lastModelUsage, lastCost: lastCost, lastStreamInputTokens: lastStreamInputTokens, contextUsage: session.lastContextUsage || null });
+    _send({ type: "history_done", lastUsage: lastUsage, lastModelUsage: lastModelUsage, lastCost: lastCost, lastStreamInputTokens: lastStreamInputTokens, context: lastContext, contextUsage: require("./yoke/usage").context(session.lastContextUsage, session.vendor || "claude") });
     for (var vi = 0; vi < sessionViewedListeners.length; vi++) {
       try { sessionViewedListeners[vi](session, targetWs, _send); } catch (e) {}
     }

package/lib/tool-llm.js

@@ -36,7 +36,7 @@ async function complete(opts) {
       skipProjectInstructions: true,
       skipSkills: true,
       canUseTool: function () { return Promise.resolve({ behavior: "deny", message: "Capsule LLM calls cannot use tools." }); },
-      adapterOptions: { CLAUDE: { linuxUser: opts.linuxUser || undefined, settingSources: ["user"] } },
+      adapterOptions: require("./yoke/query-options").map(adapter, { instructionSources: ["user"], readOnly: true, isolation: { user: opts.linuxUser || undefined } }),
     },
   });
   return result.text;

package/lib/tui-transcript-index.js

@@ -1,132 +1 @@
-// tui-transcript-index.js
-//
-// Build a per-session index of assistant text messages from a Claude Code
-// TUI transcript (~/.claude/projects/{encoded-cwd}/{cliSessionId}.jsonl).
-//
-// The TUI message-grab feature uses this index on the client to map a
-// hovered xterm region back to its original markdown source. We only
-// extract assistant text blocks. Tool calls and tool results render in
-// the terminal in a shape that's quite different from their JSONL form,
-// so matching them would be noisy and not particularly useful.
-//
-// Codex sessions don't write transcripts at all; callers should skip
-// indexing for non-claude vendors.
-
-var fs = require("fs");
-var path = require("path");
-var utils = require("./utils");
-var { REAL_HOME } = require("./config");
-
-var encodeCwd = utils.encodeCwd;
-
-// Min length of a normalized assistant message to bother indexing.
-// Anything shorter ("ok", "sure", "yes") would generate too many false
-// positives when matched against a hovered terminal block.
-var MIN_MATCH_LEN = 20;
-
-// Claude Code writes its JSONL under the *running user's* home, which
-// is not the daemon's home in OS-isolation mode (where each Clay user
-// gets a real Linux account like /home/clay-name). Callers from the
-// project context resolve the session owner's home and pass it in;
-// when no home is provided we fall back to REAL_HOME for single-user
-// installs.
-function transcriptFilePath(home, cwd, cliSessionId) {
-  if (!cwd || !cliSessionId) return null;
-  var base = home || REAL_HOME;
-  return path.join(base, ".claude", "projects", encodeCwd(cwd), cliSessionId + ".jsonl");
-}
-
-// matchKey is just whitespace-normalized raw markdown. We intentionally
-// do NOT strip markdown decoration here.
-//
-// Reasoning: TUI rendering drops markdown markers (**bold** -> bold,
-// `code` -> code, [text](url) -> text, etc.) and the visible text is
-// therefore always a substring of the JSONL source's character stream.
-// If we strip server-side we risk getting the rules wrong on corner
-// cases (double-backtick code spans, list-bullet rendering quirks,
-// nested formatting) and the resulting matchKey diverges from both
-// sides at once. Leaving the source alone and letting the client do a
-// multi-offset substring probe against block text is more robust and
-// much less code.
-function normalizeForMatch(s) {
-  if (!s) return "";
-  return s.replace(/\s+/g, " ").trim();
-}
-
-// Stable per-message id. Claude's JSONL usually carries one of these but
-// fall back to the parsed line index so the client always has a handle.
-function messageId(obj, index) {
-  if (obj && obj.uuid) return String(obj.uuid);
-  if (obj && obj.message && obj.message.id) return String(obj.message.id);
-  return "msg-" + index;
-}
-
-// Parse a single JSONL line into one assistant-text record, or null
-// when the line isn't one we index (user prompts, tool_use blocks,
-// tool_result records, etc.). Text-only assistant blocks get joined
-// in order so a multi-block response surfaces as a single grabbable
-// message.
-function parseAssistantTextLine(line, index) {
-  var obj;
-  try { obj = JSON.parse(line); } catch (e) { return null; }
-  if (!obj || !obj.message) return null;
-  if (obj.message.role !== "assistant") return null;
-  if (!Array.isArray(obj.message.content)) return null;
-
-  var text = "";
-  for (var i = 0; i < obj.message.content.length; i++) {
-    var block = obj.message.content[i];
-    if (block && block.type === "text" && typeof block.text === "string") {
-      text += block.text;
-    }
-  }
-  text = text.trim();
-  if (!text) return null;
-
-  var normalized = normalizeForMatch(text);
-  if (normalized.length < MIN_MATCH_LEN) return null;
-
-  return {
-    id: messageId(obj, index),
-    text: text,
-    matchKey: normalized,
-  };
-}
-
-// Read the whole transcript and return the assistant text index. The
-// transcripts are small enough (KB to a few MB) that a sync read on
-// session open or on a watcher-driven update is fine. We also return
-// the mtime/size so callers can short-circuit re-reads when nothing
-// changed.
-function readAssistantIndex(home, cwd, cliSessionId) {
-  var file = transcriptFilePath(home, cwd, cliSessionId);
-  if (!file) return { messages: [], mtimeMs: 0, byteLength: 0 };
-  var raw;
-  var stat;
-  try {
-    raw = fs.readFileSync(file, "utf8");
-    stat = fs.statSync(file);
-  } catch (e) {
-    return { messages: [], mtimeMs: 0, byteLength: 0 };
-  }
-  var lines = raw.split("\n");
-  var messages = [];
-  for (var i = 0; i < lines.length; i++) {
-    if (!lines[i]) continue;
-    var entry = parseAssistantTextLine(lines[i], i);
-    if (entry) messages.push(entry);
-  }
-  return {
-    messages: messages,
-    mtimeMs: stat.mtimeMs || 0,
-    byteLength: stat.size || raw.length,
-  };
-}
-
-module.exports = {
-  MIN_MATCH_LEN: MIN_MATCH_LEN,
-  transcriptFilePath: transcriptFilePath,
-  readAssistantIndex: readAssistantIndex,
-  parseAssistantTextLine: parseAssistantTextLine,
-  normalizeForMatch: normalizeForMatch,
-};
+module.exports = require("./yoke/tui-transcript-index");

package/lib/vendor-login-browser.js

@@ -7,17 +7,7 @@ var spawn = require("child_process").spawn;
 var buildUserEnv = require("./build-user-env").buildUserEnv;
 var wrapSpawnAsUser = require("./os-users").wrapSpawnAsUser;
 
-function loginUrl(value, vendor) {
-  try {
-    var url = new URL(value);
-    var hosts = vendor === "codex" ? ["auth.openai.com"] : ["claude.ai", "claude.com", "console.anthropic.com", "platform.claude.com"];
-    if (url.protocol !== "https:" || url.username || url.password || hosts.indexOf(url.hostname) < 0) return null;
-    if (!url.searchParams.get("state") || !url.searchParams.get("code_challenge")) return null;
-    var callback = new URL(url.searchParams.get("redirect_uri"));
-    if (callback.protocol !== "http:" || ["localhost", "127.0.0.1", "[::1]"].indexOf(callback.hostname) < 0) return null;
-    return url.href;
-  } catch (e) { return null; }
-}
+var loginUrl = require("./yoke/login-protocol").loginUrl;
 
 function createLoginBrowser(options) {
   var initial = null;

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

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

@@ -528,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;
   }
 
@@ -1543,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();
@@ -1592,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)
@@ -1678,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
@@ -1993,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 || [],
@@ -2110,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
@@ -2161,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.",
+};

package/lib/yoke/adapters/codex.js

@@ -1682,6 +1682,7 @@ function createCodexAdapter(opts) {
   var adapter = {
     vendor: "codex",
     queryBoundToolCapability: CODEX_QUERY_BOUND_TOOL_CAPABILITY,
+    queryContract: require("./codex-query-contract"),
     userInputCapability: { mode: "native", native: true, transport: "item/tool/requestUserInput" },
 
     init: function(initOpts) {

package/lib/yoke/adapters/kiro.js

@@ -279,7 +279,7 @@ function flattenUpdate(update, state) {
 
   // Token usage
   if (type === "usage_update") {
-    if (typeof update.used === "number") state.lastInputTokens = update.used;
+    if (typeof update.used === "number") { state.lastInputTokens = update.used; state.contextMeasurement = "observed"; }
     if (typeof update.size === "number") state.contextWindow = update.size;
     return events;
   }
@@ -294,6 +294,7 @@ function flattenUpdate(update, state) {
       if (typeof percentage !== "number") percentage = kiroMeta.usagePercentage;
       if (typeof percentage === "number" && state.contextWindow) {
         state.lastInputTokens = Math.round(state.contextWindow * percentage / 100);
+        state.contextMeasurement = "estimated";
       }
     }
     return events;
@@ -782,6 +783,7 @@ function createKiroQueryHandle(acp, queryOpts) {
     getContextUsage: function() {
       return Promise.resolve(state.lastInputTokens != null ? {
         input_tokens: state.lastInputTokens,
+        measurement: state.contextMeasurement || "observed",
         contextWindow: state.contextWindow || null,
       } : null);
     },

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

@@ -0,0 +1,7 @@
+// Muse's sessionMcp configuration is supplied on both start and resume.
+module.exports = {
+  toolTransport: "stdio-mcp",
+  catalogLifetime: "query",
+  permissionModes: ["auto"],
+  interruptionMessage: "Interrupted · What should Muse do instead?",
+};