clay-server 4.1.0-beta.8 → 4.1.0

package/lib/public/modules/thinking-lifecycle.js

@@ -1,7 +1,7 @@
 import { escapeHtml } from './utils.js';
 import { iconHtml, refreshIcons } from './icons.js';
 import { store } from './store.js';
-import { addToMessages, scrollToBottom } from './chat-render-runtime.js';
+import { addToMessages, keepActiveThinkingAtTail, scrollToBottom } from './chat-render-runtime.js';
 import { prepareThinkingView, bindThinkingView, updateThinkingView, beginThinkingView, setThinkingViewLive, finishThinkingView } from './thinking-view.js';
 
 function getThinkingState() {
@@ -92,6 +92,7 @@ export function startThinkingSegment() {
     segmentText: "",
     startTime: Date.now(),
   });
+  if (!store.get('replayingHistory')) keepActiveThinkingAtTail();
   beginThinkingView(thinkingState.el, !store.get('replayingHistory') && !isMateThinking());
   showMateActivity(thinkingState.el, true, !!thinkingState.detailsText.trim());
   refreshIcons();
@@ -109,6 +110,7 @@ export function appendThinkingText(text) {
     detailsText: thinkingState.detailsText + separator + text,
     latestText: segmentText.trim() ? segmentText : thinkingState.latestText,
   });
+  if (!store.get('replayingHistory')) keepActiveThinkingAtTail();
   updateThinkingView(thinkingState.el, thinkingState.segmentText || thinkingState.latestText, thinkingState.detailsText);
   maybeScrollToBottom();
 }
@@ -156,6 +158,7 @@ export function restoreThinkingState(saved) {
 export function resumeThinkingAfterReplay(processing) {
   var thinkingState = getThinkingState();
   if (!thinkingState || !thinkingState.active || !processing) return;
+  keepActiveThinkingAtTail();
   setThinkingViewLive(thinkingState.el, !isMateThinking());
   showMateActivity(thinkingState.el, true, !!thinkingState.detailsText.trim());
 }

package/lib/public/modules/tools.js

@@ -6,6 +6,7 @@ import { openFile } from './filebrowser.js';
 import { mateAvatarUrl } from './avatar.js';
 import { getChatLayout } from './theme.js';
 import { store } from './store.js';
+import { applyPermissionHints } from './permission-hints.js';
 import { VENDOR_NAMES } from './app-rendering.js';
 import { startThinkingSegment, appendThinkingText, stopThinkingSegment, resetThinkingTurn, clearThinkingState, saveThinkingState, restoreThinkingState, updateThinkingTokenEstimate } from './thinking-lifecycle.js';
 import { findAskUserCard, getAskUserRequestKey, hasAskUserRequest, rememberAskUserRequest, markAskUserRequestAnswered, saveAskUserState, restoreAskUserState, resetAskUserState } from './ask-user-state.js';
@@ -542,7 +543,7 @@ function permissionInputSummary(toolName, input) {
   }
 }
 
-export function renderPermissionRequest(requestId, toolName, toolInput, decisionReason, mateId, vendor) {
+export function renderPermissionRequest(requestId, toolName, toolInput, decisionReason, mateId, vendor, hints) {
   if (pendingPermissions[requestId]) return;
   ctx.finalizeAssistantBlock();
   stopThinking();
@@ -551,17 +552,20 @@ export function renderPermissionRequest(requestId, toolName, toolInput, decision
   // ExitPlanMode: render as plan confirmation instead of generic permission
   if (toolName === "ExitPlanMode") {
     renderPlanPermission(requestId);
+    applyPermissionHints(pendingPermissions[requestId], { defaultToNo: hints && hints.defaultToNo });
     return;
   }
 
   // Channel layout or Mate DM: conversational "Can I ...?" style
   if ((ctx.isMateDm && ctx.isMateDm()) || getChatLayout() === "channel") {
     renderConversationalPermission(requestId, toolName, toolInput, mateId, vendor);
+    applyPermissionHints(pendingPermissions[requestId], hints);
     return;
   }
 
   // Bubble layout: formal "Permission Required" dialog
   renderFormalPermission(requestId, toolName, toolInput, decisionReason);
+  applyPermissionHints(pendingPermissions[requestId], hints);
 }
 
 function renderFormalPermission(requestId, toolName, toolInput, decisionReason) {

package/lib/scheduled-run-state.js

@@ -42,9 +42,11 @@ function createScheduledRunState(ctx) {
   }
 
   function complete(id, runId, result) {
-    return mutate(id, function (rec) {
+    var completed = null;
+    var saved = mutate(id, function (rec) {
       if (!rec.activeRun || rec.activeRun.runId !== runId) return false;
       var run = Object.assign({}, rec.activeRun, result || {}, { finishedAt: Date.now() });
+      completed = run;
       rec.lastRunAt = run.startedAt || Date.now();
       rec.lastRunResult = run.outcome || "failed";
       rec.runs = Array.isArray(rec.runs) ? rec.runs : [];
@@ -54,6 +56,8 @@ function createScheduledRunState(ctx) {
       rec.activeRun = null;
       return true;
     });
+    if (saved && completed && ctx.onTerminal) ctx.onTerminal(ctx.getRecord(id), completed);
+    return saved;
   }
 
   function recover(rec) {
@@ -81,7 +85,11 @@ function createScheduledRunState(ctx) {
     return true;
   }
 
-  return { begin: begin, complete: complete, prepareRecord: prepareRecord, recordLegacy: recordLegacy, recover: recover, update: update };
+  function notifyTerminal(rec, run) {
+    if (ctx.onTerminal && rec && run) ctx.onTerminal(rec, run);
+  }
+
+  return { begin: begin, complete: complete, notifyTerminal: notifyTerminal, prepareRecord: prepareRecord, recordLegacy: recordLegacy, recover: recover, update: update };
 }
 
 module.exports = { createScheduledRunState: createScheduledRunState };

package/lib/scheduler.js

@@ -36,6 +36,7 @@ function createLoopRegistry(opts) {
   var scheduledRuns = createScheduledRunState({
     getRecord: getById, save: save,
     onChange: function () { if (onChange) onChange(records); },
+    onTerminal: opts.onRunTerminal,
   });
   var durableOccurrence;
 

package/lib/sdk-bridge.js

@@ -7,12 +7,14 @@ var usersModule = require("./users");
 var { getCodexConfig } = require("./codex-defaults");
 var { getKiroConfig } = require("./kiro-defaults");
 var { splitShellSegments, attachSkillDiscovery } = require("./sdk-skill-discovery");
+var skillDiscovery = require("./yoke/skill-discovery");
 var { isSafeBashSegment } = require("./safe-bash-commands");
 var { createMessageQueue } = require("./sdk-message-queue");
 var { attachMessageProcessor } = require("./sdk-message-processor");
 var homeDebateToolPolicy = require("./home-debate-tool-policy");
 var yoke = require("./yoke");
 var sessionTitlePolicy = require("./session-title-policy");
+var sessionTitleGenerator = require("./session-title-generator");
 var loopInterview = require("./project-loop-interview");
 
 // Extract serializable tool descriptors from MCP server instances.
@@ -130,6 +132,7 @@ function createSDKBridge(opts) {
   var clayPort = opts.clayPort || 2633;
   var clayTls = opts.clayTls || false;
   var clayAuthToken = opts.clayAuthToken || null;
+  var clayBridgeToken = opts.clayBridgeToken || null;
   var getSessionToolDefs = opts.getSessionToolDefs || function () { return []; };
   var canUseSessionTools = opts.canUseSessionTools || function () { return true; };
   var queryToolSnapshots = new WeakMap();
@@ -153,6 +156,7 @@ function createSDKBridge(opts) {
     if (clayTls) bridgeArgs.push("--tls");
     var env = [];
     if (clayAuthToken) env.push({ name: "CLAY_AUTH_TOKEN", value: clayAuthToken });
+    if (clayBridgeToken) env.push({ name: "CLAY_BRIDGE_TOKEN", value: clayBridgeToken });
     return [{
       name: "clay-tools",
       command: process.execPath,
@@ -161,6 +165,23 @@ function createSDKBridge(opts) {
     }];
   }
 
+  function getCodexSessionMcpServer(session, queryGeneration) {
+    if (!session || !Number.isInteger(queryGeneration)) return null;
+    var bridgeArgs = [
+      path.join(__dirname, "yoke", "mcp-bridge-server.js"),
+      "--port", String(clayPort),
+      "--slug", slug,
+      "--session", String(session.localId),
+      "--query-generation", String(queryGeneration),
+      "--session-only",
+    ];
+    if (clayTls) bridgeArgs.push("--tls");
+    var bridgeEnv = {};
+    if (clayAuthToken) bridgeEnv.CLAY_AUTH_TOKEN = clayAuthToken;
+    if (clayBridgeToken) bridgeEnv.CLAY_BRIDGE_TOKEN = clayBridgeToken;
+    return { name: "clay-session-tools", command: process.execPath, args: bridgeArgs, env: bridgeEnv };
+  }
+
   function getFreshAuthState(force) {
     var now = Date.now();
     if (!force && _cachedFreshAuthState && now - _cachedFreshAuthAt < 15000) {
@@ -337,7 +358,7 @@ function createSDKBridge(opts) {
   }
 
   // --- Skill discovery (extracted to sdk-skill-discovery.js) ---
-  var skills = attachSkillDiscovery({ cwd: cwd });
+  var skills = attachSkillDiscovery({ cwd: cwd, getOptions: function () { return { env: getRuntimeEnv() }; } });
   var discoverSkillDirs = skills.discoverSkillDirs;
   var mergeSkills = skills.mergeSkills;
 
@@ -350,50 +371,27 @@ function createSDKBridge(opts) {
     return owner && owner.linuxUser ? owner.linuxUser : null;
   }
 
-  // Auto-generate a session title via YOKE adapter.generateTitle().
-  // Triggered by sdk-message-processor after AUTO_TITLE_TURN_THRESHOLD turns.
-  function autoGenerateTitle(session) {
-    var sessionAdapter = getAdapterForSession(session);
-    if (typeof sessionAdapter.generateTitle !== "function") {
-      console.log("[auto-title] adapter.generateTitle not available for vendor=" + sessionAdapter.vendor);
-      return;
-    }
-    var userMessages = [];
-    for (var i = 0; i < session.history.length; i++) {
-      var entry = session.history[i];
-      if (entry.type === "user_message" && entry.text) {
-        userMessages.push(entry.text.substring(0, 200));
-        if (userMessages.length >= 5) break;
-      }
-    }
-    if (userMessages.length === 0) {
-      console.log("[auto-title] No user messages found in session " + session.localId);
-      return;
+  function getSessionSkillOptions(session) {
+    var runtimeEnv = getRuntimeEnv(session || {});
+    if (!osUsers) return { env: runtimeEnv };
+    var linuxUser = getSessionLinuxUser(session);
+    if (!linuxUser) return { disable: true };
+    try {
+      var info = require("./os-users").resolveOsUserInfo(linuxUser);
+      return Object.assign({}, skillDiscovery.optionsForOsUser(info), { env: runtimeEnv });
+    } catch (e) {
+      return { disable: true };
     }
-    console.log("[auto-title] Calling adapter.generateTitle with " + userMessages.length + " messages for session " + session.localId);
-
-    sessionAdapter.generateTitle(userMessages, {
-      cwd: cwd,
-      linuxUser: getSessionLinuxUser(session) || undefined,
-      env: getRuntimeEnv(session),
-    }).then(function(title) {
-      if (!title || title.length < 2) return;
-      title = title.substring(0, 100);
-      if (!session.titleManuallySet) {
-        session.title = title;
-        session.titleAutoGenerated = true;
-        sm.saveSessionFile(session);
-        sm.broadcastSessionList();
-        if (session.cliSessionId && typeof adapter.renameSession === "function") {
-          adapter.renameSession(session.cliSessionId, title, { dir: cwd }).catch(function () {});
-        }
-        console.log("[auto-title] Generated title for session " + session.localId + ": " + title);
-      }
-    }).catch(function(e) {
-      console.error("[auto-title] Failed:", e.message || e);
-    });
   }
 
+  var titleGenerator = sessionTitleGenerator.attachSessionTitleGenerator({
+    sm: sm,
+    cwd: cwd,
+    getAdapter: getAdapterForSession,
+    getLinuxUser: getSessionLinuxUser,
+    getRuntimeEnv: getRuntimeEnv,
+  });
+
   var msgProcessor = attachMessageProcessor({
     sm: sm,
     send: send,
@@ -407,9 +405,10 @@ function createSDKBridge(opts) {
     adapter: adapter,
     saveImageFile: opts.saveImageFile,
     getSessionLinuxUser: getSessionLinuxUser,
+    getSessionSkillOptions: getSessionSkillOptions,
     onProcessingChanged: onProcessingChanged,
     onTurnDone: onTurnDone,
-    onAutoTitle: function (session) { autoGenerateTitle(session); },
+    onAutoTitle: function (session) { titleGenerator.generate(session); },
     opts: opts,
     discoverSkillDirs: discoverSkillDirs,
     mergeSkills: mergeSkills,
@@ -856,6 +855,8 @@ function createSDKBridge(opts) {
         input: input,
         toolUseId: opts.toolUseID,
         decisionReason: opts.decisionReason || "",
+        defaultToNo: opts.defaultToNo === true,
+        suppressAlwaysAllowRule: opts.suppressAlwaysAllowRule === true,
         signal: opts.signal,
       });
       if (routed) return routed;
@@ -872,6 +873,8 @@ function createSDKBridge(opts) {
         toolInput: input,
         toolUseId: opts.toolUseID,
         decisionReason: opts.decisionReason || "",
+        defaultToNo: opts.defaultToNo === true,
+        suppressAlwaysAllowRule: opts.suppressAlwaysAllowRule === true,
       };
 
       var permMsg = {
@@ -881,6 +884,8 @@ function createSDKBridge(opts) {
         toolInput: input,
         toolUseId: opts.toolUseID,
         decisionReason: opts.decisionReason || "",
+        defaultToNo: opts.defaultToNo === true,
+        suppressAlwaysAllowRule: opts.suppressAlwaysAllowRule === true,
         vendor: session.vendor || (adapter && adapter.vendor) || "claude",
       };
       sendAndRecord(session, permMsg);
@@ -907,6 +912,8 @@ function createSDKBridge(opts) {
           requestId: requestId,
           toolName: toolName,
           toolInput: input,
+          defaultToNo: opts.defaultToNo === true,
+          suppressAlwaysAllowRule: opts.suppressAlwaysAllowRule === true,
         });
       }
 
@@ -1031,7 +1038,8 @@ function createSDKBridge(opts) {
             && Number(session._sdkQueryGeneration || 0) === codexCatalogCandidate.generation
             && session.cliSessionId === msg.sessionId
             && (!sm.sessions || typeof sm.sessions.get !== "function" || sm.sessions.get(session.localId) === session)) {
-          session.codexDynamicToolCatalogVersion = codexCatalogCandidate.version;
+          if (codexCatalogCandidate.version) session.codexDynamicToolCatalogVersion = codexCatalogCandidate.version;
+          if (codexCatalogCandidate.issuesVersion) session.codexIssuesToolCatalogVersion = codexCatalogCandidate.issuesVersion;
           sm.saveSessionFile(session);
           codexCatalogCandidate = null;
         }
@@ -1379,6 +1387,7 @@ function createSDKBridge(opts) {
           clayPort: clayPort,
           clayTls: clayTls,
           clayAuthToken: clayAuthToken,
+          clayBridgeToken: clayBridgeToken,
           slug: slug,
           env: sessionRuntimeEnv,
         });
@@ -1393,6 +1402,7 @@ function createSDKBridge(opts) {
           clayPort: clayPort,
           clayTls: clayTls,
           clayAuthToken: clayAuthToken,
+          clayBridgeToken: clayBridgeToken,
           slug: slug,
           env: sessionRuntimeEnv,
         });
@@ -1601,7 +1611,11 @@ function createSDKBridge(opts) {
     if (linuxUser) {
       claudeOpts.linuxUser = linuxUser;
       claudeOpts.singleTurn = !!session.singleTurn;
-      claudeOpts.originalHome = require("./config").REAL_HOME || null;
+      try {
+        claudeOpts.originalHome = require("./os-users").resolveOsUserInfo(linuxUser).home;
+      } catch (e) {
+        claudeOpts.originalHome = null;
+      }
       claudeOpts.projectPath = session.cwd || null;
       claudeOpts._perfT0 = t0;
       // Pass previous worker state for reuse
@@ -1643,6 +1657,17 @@ function createSDKBridge(opts) {
     // delivered by this provider.
     var sessionToolDefs = getSessionToolDefs(session) || [];
     var queryGeneration = Number(session._sdkQueryGeneration || 0);
+    var hasIssueCatalog = false;
+    for (var issueToolIndex = 0; issueToolIndex < sessionToolDefs.length; issueToolIndex++) {
+      if (sessionToolDefs[issueToolIndex].name === "create_issue") {
+        hasIssueCatalog = true;
+        break;
+      }
+    }
+    var recoverCodexIssueTools = sessionAdapter.vendor === "codex"
+      && !!session.cliSessionId
+      && hasIssueCatalog
+      && Number(session.codexIssuesToolCatalogVersion || 0) < 1;
     function queryContextAvailable() {
       if (Number(session._sdkQueryGeneration || 0) !== queryGeneration) return false;
       if (sm && sm.sessions && typeof sm.sessions.get === "function" && sm.sessions.get(session.localId) !== session) return false;
@@ -1767,10 +1792,22 @@ function createSDKBridge(opts) {
       initialTitleProvisional = initialTitleChoice.provisional;
     }
 
+    var modelSwitchGeneration = session._queryGeneration;
     var queryOpts = {
+      onModelSwitch: function(change) {
+        if (session._queryGeneration !== modelSwitchGeneration || session.taskStopRequested) return;
+        if (!change || !change.fromModel || !change.toModel || change.fromModel === change.toModel) return;
+        sendAndRecord(session, { type: "informational", level: "info", content: "Model changed from " + change.fromModel + " to " + change.toModel + " (" + change.source + ")." });
+      },
       cwd: cwd,
+      slug: slug,
+      clayPort: clayPort,
+      clayTls: clayTls,
+      clayAuthToken: clayAuthToken,
+      clayBridgeToken: clayBridgeToken,
       linuxUser: linuxUser || undefined,
       env: sessionRuntimeEnv,
+      skillOptions: getSessionSkillOptions(session),
       // appendSystemPrompt, NOT systemPrompt: a plain-string systemPrompt
       // REPLACES the entire Claude Code system prompt (sdk.d.ts:2096), which
       // would strip the driver session down to the two-sentence pair preset.
@@ -1792,6 +1829,9 @@ function createSDKBridge(opts) {
       toolServers: mergedMcpServers,
       toolServerDescriptors: extractMcpDescriptors(mergedMcpServers) || undefined,
       dynamicTools: sessionToolDefs,
+      // Codex persists dynamic tools with a thread. A stale authorized Driver
+      // gets this exact-query bridge; its handlers still reauthorize live.
+      sessionMcpServer: recoverCodexIssueTools ? getCodexSessionMcpServer(session, queryGeneration) : undefined,
       callDynamicTool: function (toolName, args) {
         var toolDef = findSessionToolDef(toolName);
         if (toolDef && typeof toolDef.handler === "function") {
@@ -1862,10 +1902,12 @@ function createSDKBridge(opts) {
       // project threshold); seeded titles remain fixed.
       if (initialTitle && !session.title) {
         session.title = initialTitle;
+        session.titleProvisional = initialTitleProvisional;
         session.titleAutoGenerated = !initialTitleProvisional;
         sm.saveSessionFile(session);
         sm.broadcastSessionList();
       } else if (initialTitle && session.title === initialTitle) {
+        session.titleProvisional = initialTitleProvisional;
         session.titleAutoGenerated = !initialTitleProvisional;
         sm.saveSessionFile(session);
       }
@@ -1976,6 +2018,12 @@ function createSDKBridge(opts) {
       if (completeInterviewCatalog || requiredCatalogTools.report_scheduled_task_outcome) {
         codexCatalogCandidate = { generation: queryGeneration, version: yoke.sessionTools.CODEX_CATALOG_VERSION };
       }
+      if (hasIssueCatalog) {
+        codexCatalogCandidate = Object.assign({}, codexCatalogCandidate || {}, {
+          generation: queryGeneration,
+          issuesVersion: 1,
+        });
+      }
     }
     session.streamPromise = processQueryStream(session, codexCatalogCandidate).catch(function(err) {
     });
@@ -2216,24 +2264,12 @@ function createSDKBridge(opts) {
           clayTls: clayTls,
           clayAuthToken: clayAuthToken,
           slug: slug,
+          clayBridgeToken: clayBridgeToken,
         });
 
-        var fsSkills = discoverSkillDirs();
-        sm.skillNames = mergeSkills(result.skills, fsSkills);
-        if (result.slashCommands) {
-          var seen = new Set();
-          var combined = [];
-          var all = result.slashCommands.concat(Array.from(sm.skillNames));
-          for (var k = 0; k < all.length; k++) {
-            if (!seen.has(all[k])) {
-              seen.add(all[k]);
-              combined.push(all[k]);
-            }
-          }
-          sm.slashCommands = combined;
-          sm.setSlashCommandsForVendor(defaultVendor, combined);
-          send({ type: "slash_commands", commands: combined, vendor: defaultVendor });
-        }
+        // Skill and slash-command catalogs are session-owned. The warmup has
+        // no authenticated session target, so never publish its personal
+        // inventory through the project-wide session manager or broadcast.
         if (result.defaultModel) {
           sm.defaultModelByVendor = sm.defaultModelByVendor || {};
           sm.defaultModelByVendor[defaultVendor] = sm.defaultModelByVendor[defaultVendor] || result.defaultModel;

package/lib/sdk-message-processor.js

@@ -1,4 +1,6 @@
 var usersModule = require("./users");
+var turnQueue = require("./sdk-turn-queue");
+var contextUsage = require("./context-usage");
 var yoke = require("./yoke");
 var backgroundTaskTiming = require("./background-task-timing");
 var sessionTitlePolicy = require("./session-title-policy");
@@ -26,6 +28,7 @@ function attachMessageProcessor(ctx) {
   var mergeSkills = ctx.mergeSkills;
   var saveImageFile = ctx.saveImageFile;
   var getSessionLinuxUser = ctx.getSessionLinuxUser || function () { return null; };
+  var getSessionSkillOptions = ctx.getSessionSkillOptions || function () { return {}; };
 
   function getMateIdForNotification() {
     if (!isMate) return null;
@@ -206,21 +209,26 @@ function attachMessageProcessor(ctx) {
       session.activeBackgroundTasks = [];
       sendToSession(session, { type: "active_background_tasks", tasks: [] });
       if (previousBackgroundTaskCount !== 0) sm.broadcastSessionList();
-      var fsSkills = discoverSkillDirs();
-      sm.skillNames = mergeSkills(parsed.skills, fsSkills);
+      var fsSkills = discoverSkillDirs(getSessionSkillOptions(session));
+      session.skillNames = Array.from(mergeSkills(parsed.skills, fsSkills));
       if (parsed.slashCommands) {
         // Union: SDK slash_commands + merged skills (deduplicated)
+        session.vendorSlashCommands = parsed.slashCommands.filter(function (name) {
+          return session.skillNames.indexOf(name) === -1;
+        });
         var seen = new Set();
         var combined = [];
-        var all = parsed.slashCommands.concat(Array.from(sm.skillNames));
+        var all = session.vendorSlashCommands.concat(session.skillNames);
         for (var k = 0; k < all.length; k++) {
           if (!seen.has(all[k])) {
             seen.add(all[k]);
             combined.push(all[k]);
           }
         }
-        sm.slashCommands = combined;
-        send({ type: "slash_commands", commands: sm.slashCommands });
+        session.slashCommands = combined;
+        session.slashCommandsByVendor = session.slashCommandsByVendor || {};
+        session.slashCommandsByVendor[session.vendor || (adapter && adapter.vendor) || "claude"] = combined;
+        sendToSession(session, { type: "slash_commands", commands: combined, vendor: session.vendor || (adapter && adapter.vendor) || "claude" });
       }
       if (parsed.model) {
         var initVendor = session.vendor || (adapter && adapter.vendor) || "claude";
@@ -563,6 +571,7 @@ function attachMessageProcessor(ctx) {
       }
 
       session._lastAdapterError = null;
+      session._queuedTurnCount = turnQueue.pendingSends(session, parsed);
       var hasQueuedTurn = (session._queuedTurnCount || 0) > 0;
       if (hasQueuedTurn) {
         session._queuedTurnCount--;
@@ -580,7 +589,13 @@ function attachMessageProcessor(ctx) {
         && /not logged in/i.test(previewTrimmed) && /\/login/i.test(previewTrimmed);
       // Fetch rich context usage breakdown (fire-and-forget, non-blocking)
       if (session.queryInstance && typeof session.queryInstance.getContextUsage === "function") {
-        session.queryInstance.getContextUsage().then(function(ctxUsage) {
+        var contextQuery = session.queryInstance;
+        var contextTurn = session.turnCount;
+        contextUsage.readUsage(session, "summary").then(function(ctxUsage) {
+          if (session.queryInstance !== contextQuery || session.turnCount !== contextTurn) return;
+          // null means the shared reader suppressed a superseded response;
+          // only an adapter's explicit unavailable object may clear the UI.
+          if (!ctxUsage) return;
           session.lastContextUsage = ctxUsage;
           sendToSession(session, { type: "context_usage", data: ctxUsage });
         }).catch(function(e) {
@@ -597,6 +612,11 @@ function attachMessageProcessor(ctx) {
         modelUsage: parsed.modelUsage || null,
         sessionId: parsed.sessionId,
         lastStreamInputTokens: lastStreamInput,
+        userMessageId: parsed.userMessageId,
+        userMessageIds: parsed.userMessageIds,
+        resultIndex: parsed.resultIndex,
+        resumeReason: parsed.resumeReason,
+        localCommand: parsed.localCommand,
       });
       if (parsed.fastModeState) {
         sendAndRecord(session, { type: "fast_mode_state", state: parsed.fastModeState });
@@ -647,11 +667,13 @@ function attachMessageProcessor(ctx) {
       session.streamedText = false;
       sm.broadcastSessionList();
 
-      // Auto-generate title after N turns (skip if loop or already auto-generated)
-      if (session.turnCount === sessionTitlePolicy.generationTurn(isMate)
+      // Auto-generate after the first completed substantive turn. The title
+      // coordinator handles retries while generation is pending or failed.
+      if (session.turnCount >= sessionTitlePolicy.generationTurn(isMate)
           && !session.titleAutoGenerated
           && !session.titleManuallySet
           && !session.loop
+          && !(session.sessionProvenance && session.sessionProvenance.kind === "worker")
           && onAutoTitle) {
         try { onAutoTitle(session); } catch (e) {
           console.error("[auto-title] onAutoTitle threw:", e.message || e);
@@ -769,10 +791,12 @@ function attachMessageProcessor(ctx) {
       var info = parsed.rateLimitInfo;
       console.log("[sdk-bridge] rate_limit_event for session " + session.localId + ": status=" + info.status + " resetsAt=" + info.resetsAt + " isUsingOverage=" + info.isUsingOverage + " isProcessing=" + session.isProcessing);
 
-      // Broadcast reset time for top-bar usage link
+      // Persist the scoped reset snapshot so reconnect/history restore can reproject it.
       if (info.rateLimitType && info.resetsAt) {
-        send({
+        sendAndRecord(session, {
           type: "rate_limit_usage",
+          sessionId: session.localId,
+          vendor: session.vendor || "claude",
           rateLimitType: info.rateLimitType,
           resetsAt: info.resetsAt * 1000,
           status: info.status,
@@ -783,6 +807,8 @@ function attachMessageProcessor(ctx) {
       if (info.status === "allowed_warning" || info.status === "rejected") {
         sendAndRecord(session, {
           type: "rate_limit",
+          sessionId: session.localId,
+          vendor: session.vendor || "claude",
           status: info.status,
           resetsAt: info.resetsAt ? info.resetsAt * 1000 : null,
           rateLimitType: info.rateLimitType || null,
@@ -879,15 +905,20 @@ function attachMessageProcessor(ctx) {
       // init) and push a full replacement to the client.
       var cmdSeen = new Set();
       var cmdCombined = [];
-      var cmdAll = (parsed.commandNames || []).concat(Array.from(sm.skillNames || []));
+      session.vendorSlashCommands = (parsed.commandNames || []).filter(function (name) {
+        return (session.skillNames || []).indexOf(name) === -1;
+      });
+      var cmdAll = session.vendorSlashCommands.concat(session.skillNames || []);
       for (var ci = 0; ci < cmdAll.length; ci++) {
         if (!cmdSeen.has(cmdAll[ci])) {
           cmdSeen.add(cmdAll[ci]);
           cmdCombined.push(cmdAll[ci]);
         }
       }
-      sm.slashCommands = cmdCombined;
-      send({ type: "slash_commands", commands: sm.slashCommands });
+      session.slashCommands = cmdCombined;
+      session.slashCommandsByVendor = session.slashCommandsByVendor || {};
+      session.slashCommandsByVendor[session.vendor || (adapter && adapter.vendor) || "claude"] = cmdCombined;
+      sendToSession(session, { type: "slash_commands", commands: cmdCombined, vendor: session.vendor || (adapter && adapter.vendor) || "claude" });
 
     } else if (parsed.yokeType === "worker_shutting_down") {
       // Surface non-routine teardown reasons; "host_exit" is the normal close.

package/lib/sdk-skill-discovery.js

@@ -1,5 +1,4 @@
-var fs = require("fs");
-var path = require("path");
+var skillDiscovery = require("./yoke/skill-discovery");
 
 // Split shell command on operators (&&, ||, ;, |) while respecting quotes
 // and parentheses. Returns array of command segments.
@@ -79,34 +78,13 @@ function splitShellSegments(cmd) {
 
 function attachSkillDiscovery(ctx) {
   var cwd = ctx.cwd;
+  var getOptions = ctx.getOptions || function () { return {}; };
 
-  function discoverSkillDirs() {
+  function discoverSkillDirs(options) {
+    var discovered = skillDiscovery.discoverSkills(cwd, options || getOptions());
     var skills = {};
-    var dirs = [
-      path.join(require("./config").REAL_HOME, ".claude", "skills"),
-      path.join(cwd, ".claude", "skills"),
-    ];
-    for (var d = 0; d < dirs.length; d++) {
-      var base = dirs[d];
-      var entries;
-      try {
-        entries = fs.readdirSync(base, { withFileTypes: true });
-      } catch (e) {
-        continue; // directory doesn't exist
-      }
-      for (var i = 0; i < entries.length; i++) {
-        var entry = entries[i];
-        if (!entry.isDirectory() && !entry.isSymbolicLink()) continue;
-        var skillDir = path.join(base, entry.name);
-        var skillMd = path.join(skillDir, "SKILL.md");
-        try {
-          fs.accessSync(skillMd, fs.constants.R_OK);
-          // project skills override global skills with same name
-          skills[entry.name] = skillDir;
-        } catch (e) {
-          // no SKILL.md, skip
-        }
-      }
+    for (var i = 0; i < discovered.length; i++) {
+      skills[discovered[i].name] = discovered[i].path.replace(/\/SKILL\.md$/, "");
     }
     return skills;
   }

package/lib/sdk-turn-queue.js

@@ -0,0 +1,14 @@
+// Results report queued sends, which can merge into fewer model turns.
+function pendingSends(session, event) {
+  if (Number.isInteger(event.queuedTurnCount) && event.queuedTurnCount >= 0) {
+    var query = session.queryInstance;
+    var current = query && typeof query.getSubmittedMessageCount === "function" ? query.getSubmittedMessageCount() : event.submittedMessageCount;
+    var later = Number.isInteger(current) && Number.isInteger(event.submittedMessageCount)
+      ? Math.max(0, current - event.submittedMessageCount) : 0;
+    return event.queuedTurnCount + later;
+  }
+  var answered = Number.isInteger(event.answeredUserMessageCount) && event.answeredUserMessageCount > 0 ? event.answeredUserMessageCount : 1;
+  return Math.max(0, (session._queuedTurnCount || 0) - answered + 1);
+}
+
+module.exports = { pendingSends: pendingSends };