clay-server 2.47.0-beta.6 → 3.0.0-beta.2

package/lib/ws-request.js

@@ -0,0 +1,14 @@
+var url = require("url");
+
+function parseWsRequestUrl(requestUrl) {
+  var parsed = url.parse(requestUrl || "/", true);
+  var paneSession = Number(parsed.query.session);
+  if (!Number.isSafeInteger(paneSession) || paneSession < 1) paneSession = null;
+  return {
+    path: parsed.pathname || "/",
+    pane: parsed.query.pane === "1",
+    paneSession: paneSession,
+  };
+}
+
+module.exports = { parseWsRequestUrl: parseWsRequestUrl };

package/lib/ws-schema.js

@@ -32,6 +32,12 @@ var schema = {
   "fork_session":             { direction: "c2s", handler: "lib/project-sessions.js", description: "Fork a session from a given message UUID" },
   "input_sync":               { direction: "c2s", handler: "lib/project-sessions.js", description: "Sync the current input field text to other clients" },
   "tui_transcript_request":   { direction: "c2s", handler: "lib/project-sessions.js", description: "Ask for the assistant text index of a Claude TUI session (for hover-to-grab)" },
+  "split_group_create":       { direction: "c2s", handler: "lib/session-split-groups.js", description: "Create a persistent two-session split group" },
+  "split_group_rename":       { direction: "c2s", handler: "lib/session-split-groups.js", description: "Rename a split group" },
+  "split_group_dissolve":     { direction: "c2s", handler: "lib/session-split-groups.js", description: "Separate a split group without deleting its sessions" },
+  "split_group_set_pair":     { direction: "c2s", handler: "lib/session-split-groups.js", description: "Assign Driver/Worker roles on a split group (driverId null clears them)" },
+  "pair_session_options":     { direction: "c2s", handler: "lib/project-session-pair.js", description: "Request vendors/models for the pair-session dialog (response reuses the same type)" },
+  "pair_session_create":      { direction: "c2s", handler: "lib/project-session-pair.js", description: "Create a Driver/Worker session pair as a split group" },
 
   "session_list":             { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Full list of sessions for the sidebar" },
   "session_switched":         { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Confirmation that active session changed" },
@@ -44,6 +50,10 @@ var schema = {
   "fork_complete":            { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Fork succeeded, includes new session ID" },
   "input_sync_broadcast":     { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Broadcast input text from another client" },
   "tui_transcript_state":     { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Assistant text index for a Claude TUI session (full replace; sent on request and after each new assistant message)" },
+  "split_groups":             { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Full persistent split-group list for the current user" },
+  "split_group_result":       { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Result of a split-group mutation" },
+  "pair_session_created":     { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Result of pair_session_create; carries the new group" },
+  "split_delegation":         { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "A pair delegation started or ended (drives the split-view flow indicator)" },
 
   // -----------------------------------------------------------------------
   // History replay
@@ -164,6 +174,9 @@ var schema = {
   "set_server_default_model": { direction: "c2s", handler: "lib/project-sessions.js", description: "Set the server-wide default model" },
   "set_project_default_model": { direction: "c2s", handler: "lib/project-sessions.js", description: "Set the project default model" },
   "set_permission_mode":      { direction: "c2s", handler: "lib/project-sessions.js", description: "Set permission mode for the current session" },
+  "set_session_full_access":  { direction: "c2s", handler: "lib/project-sessions.js", description: "Toggle Clay-managed permission skipping for a GUI session" },
+  "session_full_access_changed": { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "A session's full-access state changed" },
+  "session_full_access_result": { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Result of toggling session full access" },
   "reload_skills":            { direction: "c2s", handler: "lib/project-sessions.js", description: "Hot-reload skills/MCP/agents on the active query without a restart" },
   "set_mcp_permission_mode_override": { direction: "c2s", handler: "lib/project-sessions.js", description: "Override permission mode (default/auto/null) for one MCP server" },
   "set_server_default_mode":  { direction: "c2s", handler: "lib/project-sessions.js", description: "Set the server-wide default permission mode" },

package/lib/yoke/adapters/claude.js

@@ -11,6 +11,7 @@ var net = require("net");
 var crypto = require("crypto");
 var { spawn } = require("child_process");
 var { resolveOsUserInfo } = require("../../os-users");
+var skillDiscovery = require("../skill-discovery");
 
 // SDK-specific knowledge stays in the adapter (not the relay): the host dialog
 // kinds this client can render, declared to the SDK when an onUserDialog
@@ -18,6 +19,13 @@ var { resolveOsUserInfo } = require("../../os-users");
 // emitted. Keep in sync with the client's generic user-dialog renderer.
 var SUPPORTED_DIALOG_KINDS = ["refusal_fallback_prompt"];
 
+function getSharedSkillPlugins(homeDir, existingPlugins) {
+  var plugins = Array.isArray(existingPlugins) ? existingPlugins.slice() : [];
+  var bridgePath = skillDiscovery.ensureClaudeCodexPlugin(homeDir ? { homeDir: homeDir } : null);
+  if (bridgePath) plugins.push({ type: "local", path: bridgePath, skipMcpDiscovery: true });
+  return plugins;
+}
+
 // --- SDK loading ---
 // Async loader (ESM dynamic import, same pattern as current project.js getSDK)
 var _sdkPromise = null;
@@ -1166,6 +1174,7 @@ function createClaudeAdapter(opts) {
         abortController: ac,
         settings: { disableAllHooks: true },
       };
+      warmupOptions.plugins = getSharedSkillPlugins(initOpts && initOpts.originalHome);
       if (_claudeBinaryPath) warmupOptions.pathToClaudeCodeExecutable = _claudeBinaryPath;
 
       if (initOpts && initOpts.dangerouslySkipPermissions) {
@@ -1181,6 +1190,7 @@ function createClaudeAdapter(opts) {
         fastModeState: null,
         capabilities: {
           effort: true,
+          midSessionModelSwitch: true,
           fork: true,
           rollback: false,
           sessionListing: true,
@@ -1193,6 +1203,7 @@ function createClaudeAdapter(opts) {
           elicitation: true,
           fileCheckpointing: true,
           contextCompacting: true,
+          skillSharing: true,
           toolPolicy: ["ask", "allow-all"],
         },
       };
@@ -1328,6 +1339,12 @@ function createClaudeAdapter(opts) {
 
       // YOKE standard options -> SDK options
       if (queryOpts.systemPrompt) sdkOptions.systemPrompt = queryOpts.systemPrompt;
+      // Additive variant: keep the full Claude Code system prompt and append.
+      // A plain-string systemPrompt REPLACES the whole prompt, so pair
+      // presets and other add-ons must come through here instead.
+      if (!queryOpts.systemPrompt && queryOpts.appendSystemPrompt) {
+        sdkOptions.systemPrompt = { type: "preset", preset: "claude_code", append: queryOpts.appendSystemPrompt };
+      }
       if (queryOpts.model) sdkOptions.model = queryOpts.model;
       if (queryOpts.effort) sdkOptions.effort = queryOpts.effort;
       if (queryOpts.toolServers) sdkOptions.mcpServers = queryOpts.toolServers;
@@ -1358,6 +1375,7 @@ function createClaudeAdapter(opts) {
       if (co.allowDangerouslySkipPermissions) sdkOptions.allowDangerouslySkipPermissions = true;
       if (co.resumeSessionAt) sdkOptions.resumeSessionAt = co.resumeSessionAt;
       if (co.settings) sdkOptions.settings = co.settings;
+      sdkOptions.plugins = getSharedSkillPlugins(co.originalHome, co.plugins);
 
       var rawQuery = sdk.query({ prompt: mq, options: sdkOptions });
       return createQueryHandle(rawQuery, mq, ac);
@@ -1510,6 +1528,12 @@ function createClaudeAdapter(opts) {
     if (claudeOpts.permissionMode) queryOptions.permissionMode = claudeOpts.permissionMode;
     if (claudeOpts.allowDangerouslySkipPermissions) queryOptions.allowDangerouslySkipPermissions = true;
     if (claudeOpts.settings) queryOptions.settings = claudeOpts.settings;
+    // Same additive mapping as the in-process path: never pass a plain
+    // string (it would replace the whole Claude Code system prompt).
+    if (queryOpts.appendSystemPrompt) {
+      queryOptions.systemPrompt = { type: "preset", preset: "claude_code", append: queryOpts.appendSystemPrompt };
+    }
+    queryOptions.plugins = getSharedSkillPlugins(claudeOpts.originalHome, claudeOpts.plugins);
 
     if (queryOpts.toolServerDescriptors) queryOptions.mcpServerDescriptors = queryOpts.toolServerDescriptors;
     if (queryOpts.onUserDialog) queryOptions.supportedDialogKinds = SUPPORTED_DIALOG_KINDS;
@@ -1562,6 +1586,7 @@ function createClaudeAdapter(opts) {
             fastModeState: r.fastModeState || null,
             capabilities: {
               effort: true,
+              midSessionModelSwitch: true,
               fork: true,
               rollback: false,
               sessionListing: true,
@@ -1574,6 +1599,7 @@ function createClaudeAdapter(opts) {
               elicitation: true,
               fileCheckpointing: true,
               contextCompacting: true,
+              skillSharing: true,
               toolPolicy: ["ask", "allow-all"],
             },
           });
@@ -1624,6 +1650,7 @@ function createClaudeAdapter(opts) {
         abortController: ac,
         settings: { disableAllHooks: true },
       };
+      warmupOptions.plugins = getSharedSkillPlugins(initOpts && initOpts.originalHome);
       if (_claudeBinaryPath) warmupOptions.pathToClaudeCodeExecutable = _claudeBinaryPath;
 
       if (initOpts && initOpts.dangerouslySkipPermissions) {
@@ -1639,6 +1666,7 @@ function createClaudeAdapter(opts) {
         fastModeState: null,
         capabilities: {
           effort: true,
+          midSessionModelSwitch: true,
           fork: true,
           rollback: false,
           sessionListing: true,
@@ -1651,6 +1679,7 @@ function createClaudeAdapter(opts) {
           elicitation: true,
           fileCheckpointing: true,
           contextCompacting: true,
+          skillSharing: true,
           toolPolicy: ["ask", "allow-all"],
         },
       };
@@ -1703,6 +1732,7 @@ function createClaudeAdapter(opts) {
     }
 
     var warmupOptions = { cwd: workerCwd, settingSources: ["user", "project", "local"], settings: { disableAllHooks: true } };
+    warmupOptions.plugins = getSharedSkillPlugins(initOpts && initOpts.originalHome);
     if (_claudeBinaryPath) warmupOptions.pathToClaudeCodeExecutable = _claudeBinaryPath;
     if (initOpts && initOpts.dangerouslySkipPermissions) {
       warmupOptions.permissionMode = "bypassPermissions";
@@ -1724,6 +1754,7 @@ function createClaudeAdapter(opts) {
             fastModeState: r.fastModeState || null,
             capabilities: {
               effort: true,
+              midSessionModelSwitch: true,
               fork: true,
               rollback: false,
               sessionListing: true,
@@ -1736,6 +1767,7 @@ function createClaudeAdapter(opts) {
               elicitation: true,
               fileCheckpointing: true,
               contextCompacting: true,
+              skillSharing: true,
               toolPolicy: ["ask", "allow-all"],
             },
           });

package/lib/yoke/adapters/codex.js

@@ -6,55 +6,7 @@
 var path = require("path");
 var fs = require("fs");
 var { CodexAppServer } = require("../codex-app-server");
-
-// --- Claude skill discovery ---
-// Finds Claude skills in ~/.claude/skills/ and <cwd>/.claude/skills/
-// so Codex can recognize $<skill-name> in user input.
-function discoverClaudeSkills(cwd) {
-  var skills = {};
-  var REAL_HOME;
-  try { REAL_HOME = require("../../config").REAL_HOME; } catch (e) { REAL_HOME = require("os").homedir(); }
-  var dirs = [
-    path.join(REAL_HOME, ".claude", "skills"),
-    path.join(cwd || "", ".claude", "skills"),
-  ];
-  for (var d = 0; d < dirs.length; d++) {
-    var base = dirs[d];
-    if (!base) continue;
-    var entries;
-    try { entries = fs.readdirSync(base, { withFileTypes: true }); } catch (e) { continue; }
-    for (var i = 0; i < entries.length; i++) {
-      var entry = entries[i];
-      if (!entry.isDirectory() && !entry.isSymbolicLink()) continue;
-      var skillMd = path.join(base, entry.name, "SKILL.md");
-      try {
-        fs.accessSync(skillMd, fs.constants.R_OK);
-        // project skills override global skills
-        skills[entry.name] = skillMd;
-      } catch (e) {}
-    }
-  }
-  return skills;
-}
-
-// Parse user text for $<skill-name> references.
-// Returns { text, skills: [{ name, path }] }
-function parseSkillRefs(text, availableSkills) {
-  if (typeof text !== "string") return { text: text, skills: [] };
-  var skills = [];
-  var seen = {};
-  var re = /\$([a-zA-Z0-9_-]+)/g;
-  var match;
-  while ((match = re.exec(text)) !== null) {
-    var name = match[1];
-    if (seen[name]) continue;
-    if (availableSkills[name]) {
-      seen[name] = true;
-      skills.push({ name: name, path: availableSkills[name] });
-    }
-  }
-  return { text: text, skills: skills };
-}
+var skillDiscovery = require("../skill-discovery");
 
 // --- Event flattening ---
 // Converts app-server JSON-RPC notifications into flat objects with a yokeType field.
@@ -193,11 +145,14 @@ function flattenEvent(notification, state) {
       events.push({ yokeType: "interrupted" });
     }
     var inputTokens = state.lastInputTokens || (usage ? (usage.input_tokens || 0) + (usage.cached_input_tokens || 0) : 0);
-    var outputTokens = usage ? (usage.output_tokens || 0) : 0;
-    var cachedTokens = usage ? (usage.cached_input_tokens || 0) : 0;
+    var outputTokens = (usage ? (usage.output_tokens || 0) : 0) || state.lastOutputTokens || 0;
+    var cachedTokens = (usage ? (usage.cached_input_tokens || 0) : 0) || state.lastCachedTokens || 0;
     var hasTokenData = inputTokens > 0 || outputTokens > 0;
     var resultModelUsage = {};
-    resultModelUsage[state.model] = { contextWindow: null };
+    // Codex reports the real window in thread/tokenUsage/updated. Dropping it
+    // made the client fall back to its model-name table, which has no entry
+    // for codex model ids and defaulted to Claude's 200k denominator.
+    resultModelUsage[state.model] = { contextWindow: state.modelContextWindow || null };
     var assistantUuid = generateUuid();
     events.push({
       yokeType: "result",
@@ -216,6 +171,8 @@ function flattenEvent(notification, state) {
       lastStreamInputTokens: state.lastInputTokens || null,
     });
     state.lastInputTokens = null;
+    state.lastCachedTokens = null;
+    state.lastOutputTokens = null;
     return events;
   }
 
@@ -300,6 +257,41 @@ function flattenEvent(notification, state) {
     return events;
   }
 
+  // Reasoning deltas: streamed summarized thinking. The reasoning ITEM often
+  // carries only encrypted content with no readable text; the human-readable
+  // summary arrives through these delta notifications. Without handling them
+  // Codex sessions show no thinking at all.
+  if (method === "item/reasoning/summaryTextDelta" || method === "item/reasoning/textDelta") {
+    var rDeltaItemId = params.itemId || params.id;
+    if (rDeltaItemId && !state.thinkingBlocks[rDeltaItemId]) {
+      state.blockCounter++;
+      state.thinkingBlocks[rDeltaItemId] = "blk_" + state.blockCounter;
+      events.push({ yokeType: "thinking_start", blockId: state.thinkingBlocks[rDeltaItemId] });
+    }
+    if (params.delta) {
+      events.push({
+        yokeType: "thinking_delta",
+        blockId: rDeltaItemId ? state.thinkingBlocks[rDeltaItemId] : ("blk_" + state.blockCounter),
+        text: params.delta,
+      });
+      // Track streamed length so item/completed doesn't re-send the full text
+      if (rDeltaItemId) {
+        state.thinkingLengths[rDeltaItemId] = (state.thinkingLengths[rDeltaItemId] || 0) + params.delta.length;
+      }
+    }
+    return events;
+  }
+
+  // Separator between reasoning summary sections
+  if (method === "item/reasoning/summaryPartAdded") {
+    var rPartItemId = params.itemId || params.id;
+    if (rPartItemId && state.thinkingBlocks[rPartItemId]) {
+      events.push({ yokeType: "thinking_delta", blockId: state.thinkingBlocks[rPartItemId], text: "\n\n" });
+      state.thinkingLengths[rPartItemId] = (state.thinkingLengths[rPartItemId] || 0) + 2;
+    }
+    return events;
+  }
+
   if (method === "item/plan/delta") {
     var planDeltaItemId = params.itemId || params.id;
     var nextPlanText = (state.planTexts[planDeltaItemId] || "") + (params.delta || "");
@@ -553,11 +545,23 @@ function flattenEvent(notification, state) {
     }
   }
 
-  // Token usage update - track input tokens for context bar
+  // Token usage update - track input tokens for context bar.
+  //
+  // ThreadTokenUsage carries { lastTurn, total, modelContextWindow }. The
+  // context gauge must use the LAST turn, not the running total: each turn's
+  // input already contains the whole conversation, so summing turns
+  // overstates occupancy (a 5k + 8k thread reads as 13k of an 8k context).
+  // `total` is only a fallback for servers that omit lastTurn.
   if (method === "thread/tokenUsage/updated") {
     var tu = params.tokenUsage;
-    if (tu && tu.total) {
-      state.lastInputTokens = tu.total.inputTokens || 0;
+    if (tu) {
+      var turnUsage = tu.lastTurn || tu.total;
+      if (turnUsage) {
+        state.lastInputTokens = (turnUsage.inputTokens || 0) + (turnUsage.cachedInputTokens || 0);
+        state.lastCachedTokens = turnUsage.cachedInputTokens || 0;
+        state.lastOutputTokens = turnUsage.outputTokens || 0;
+      }
+      if (tu.modelContextWindow) state.modelContextWindow = tu.modelContextWindow;
     }
     return events;
   }
@@ -604,6 +608,9 @@ function createEventState(model) {
     turnStarted: false,
     lastUsage: null,
     lastInputTokens: null,
+    lastCachedTokens: null,
+    lastOutputTokens: null,
+    modelContextWindow: null,
     done: false,
     aborted: false,
     loopStarted: false,
@@ -622,7 +629,7 @@ function createEventState(model) {
 
 function createCodexQueryHandle(appServer, queryOpts) {
   var abortController = queryOpts.abortController;
-  var systemPrompt = queryOpts.systemPrompt || "";
+  var systemPrompt = queryOpts.systemPrompt || queryOpts.appendSystemPrompt || "";
   var canUseTool = queryOpts.canUseTool || null;
   var onElicitation = queryOpts.onElicitation || null;
   var onFinished = queryOpts.onFinished || null;
@@ -677,6 +684,7 @@ function createCodexQueryHandle(appServer, queryOpts) {
   var messageQueue = [];
   var messageWaiting = null;
   var messageQueueEnded = false;
+  var handlerEntry = null;
 
   function pushMessageToQueue(msg) {
     if (messageQueueEnded) return;
@@ -863,8 +871,10 @@ function createCodexQueryHandle(appServer, queryOpts) {
     }
 
     try {
-      // Set event handler on app-server
-      appServer.eventHandler = handleServerEvent;
+      handlerEntry = appServer.addHandler(handleServerEvent);
+      if (queryOpts.resumeSessionId) {
+        handlerEntry.threadId = queryOpts.resumeSessionId;
+      }
 
       // Start or resume thread
       var threadParams = {
@@ -896,6 +906,7 @@ function createCodexQueryHandle(appServer, queryOpts) {
 
       if (threadResult && threadResult.thread) {
         state.threadId = threadResult.thread.id;
+        handlerEntry.threadId = state.threadId;
       }
 
       while (!isCancelled()) {
@@ -919,23 +930,24 @@ function createCodexQueryHandle(appServer, queryOpts) {
           input = currentMessage;
         }
 
-        // Detect $<skill-name> references (Claude skills) and inject skill input items
-        var availableSkills = discoverClaudeSkills(queryOpts.cwd);
+        // Explicit references use Codex's native skill input item regardless of
+        // which vendor owns the SKILL.md file.
+        var availableSkills = skillDiscovery.discoverSkills(queryOpts.cwd);
         var skillItemsToInject = [];
         var injected = {};
         for (var ii = 0; ii < input.length; ii++) {
           if (input[ii].type === "text" && input[ii].text) {
-            var parsed = parseSkillRefs(input[ii].text, availableSkills);
-            for (var si = 0; si < parsed.skills.length; si++) {
-              if (!injected[parsed.skills[si].name]) {
-                injected[parsed.skills[si].name] = true;
-                skillItemsToInject.push({ type: "skill", name: parsed.skills[si].name, path: parsed.skills[si].path });
+            var referencedSkills = skillDiscovery.findSkillReferences(input[ii].text, availableSkills);
+            for (var si = 0; si < referencedSkills.length; si++) {
+              if (!injected[referencedSkills[si].name]) {
+                injected[referencedSkills[si].name] = true;
+                skillItemsToInject.push({ type: "skill", name: referencedSkills[si].name, path: referencedSkills[si].path });
               }
             }
           }
         }
         if (skillItemsToInject.length > 0) {
-          console.log("[yoke/codex] injecting Claude skills:", skillItemsToInject.map(function(s) { return s.name; }).join(", "));
+          console.log("[yoke/codex] injecting shared skills:", skillItemsToInject.map(function(s) { return s.name; }).join(", "));
           input = input.concat(skillItemsToInject);
         }
 
@@ -964,6 +976,11 @@ function createCodexQueryHandle(appServer, queryOpts) {
           ? { yokeType: "auth_required", vendor: "codex" }
           : { yokeType: "error", text: loopErrMsg });
       }
+    } finally {
+      if (handlerEntry) {
+        appServer.removeHandler(handlerEntry);
+        handlerEntry = null;
+      }
     }
 
     state.done = true;
@@ -1143,6 +1160,7 @@ function createCodexAdapter(opts) {
       fastModeState: null,
       capabilities: {
         effort: true,
+        midSessionModelSwitch: false,
         fork: true,
         rollback: true,
         sessionListing: false,
@@ -1155,6 +1173,7 @@ function createCodexAdapter(opts) {
         elicitation: true,
         fileCheckpointing: false,
         contextCompacting: false,
+        skillSharing: true,
         toolPolicy: ["ask", "allow-all"],
       },
     };
@@ -1358,17 +1377,21 @@ function createCodexAdapter(opts) {
 
         _cachedModels = CODEX_MODELS.slice();
 
-        // Discover skills: built-in Codex skills + Claude skills
+        // Register foreign vendor roots with Codex so automatic skill
+        // triggering and skills/list use the same merged inventory.
         var skillNames = [];
         try {
-          var REAL_HOME;
-          try { REAL_HOME = require("../../config").REAL_HOME; } catch (e) { REAL_HOME = require("os").homedir(); }
-          var claudeSkillsDir = require("path").join(REAL_HOME, ".claude", "skills");
-          var extraRoots = _cwd ? [{ cwd: _cwd, extraUserRoots: [claudeSkillsDir] }] : [];
+          var roots = skillDiscovery.getSkillRoots(_cwd);
+          var extraRootPaths = [];
+          for (var ri = 0; ri < roots.length; ri++) {
+            if (roots[ri].source !== "codex-user" && path.isAbsolute(roots[ri].path)) extraRootPaths.push(roots[ri].path);
+          }
+          await _appServer.send("skills/extraRoots/set", { extraRoots: extraRootPaths }, 10000).catch(function(e) {
+            console.error("[codex] skills/extraRoots/set failed:", e.message);
+          });
           var skillsResult = await _appServer.send("skills/list", {
             cwds: _cwd ? [_cwd] : [],
             forceReload: true,
-            perCwdExtraUserRoots: extraRoots,
           }, 10000).catch(function(e) {
             console.error("[codex] skills/list failed:", e.message);
             return null;
@@ -1385,11 +1408,11 @@ function createCodexAdapter(opts) {
               }
             }
           }
-          // Also discover Claude skills directly as fallback
-          var claudeSkills = discoverClaudeSkills(_cwd);
-          var claudeSkillNames = Object.keys(claudeSkills);
-          for (var csn = 0; csn < claudeSkillNames.length; csn++) {
-            if (skillNames.indexOf(claudeSkillNames[csn]) === -1) skillNames.push(claudeSkillNames[csn]);
+          // Direct discovery remains the fallback for older Codex app-server
+          // versions and keeps the GUI inventory vendor-neutral.
+          var sharedSkills = skillDiscovery.discoverSkills(_cwd);
+          for (var csn = 0; csn < sharedSkills.length; csn++) {
+            if (skillNames.indexOf(sharedSkills[csn].name) === -1) skillNames.push(sharedSkills[csn].name);
           }
           console.log("[codex] Discovered skills:", skillNames.length, "(" + skillNames.slice(0, 5).join(", ") + (skillNames.length > 5 ? "..." : "") + ")");
         } catch (e) {

package/lib/yoke/adapters/kiro.js

@@ -12,40 +12,33 @@
 //        session/request_permission requests for tool approvals.
 //   session/cancel (notif) -> interrupt the active turn
 
-var path = require("path");
-var fs = require("fs");
 var { execFile } = require("child_process");
 var { KiroAcpServer, findKiroPath } = require("../kiro-acp-server");
+var skillDiscovery = require("../skill-discovery");
 var { KIRO_DEFAULTS } = require("../../kiro-defaults");
 
-// --- Claude skill discovery ---
-// Kiro exposes its own agents/skills, but Clay users share $<skill-name>
-// references from ~/.claude/skills. We mirror the Codex adapter so the same
-// references resolve regardless of runtime.
-function discoverClaudeSkills(cwd) {
-  var skills = {};
-  var REAL_HOME;
-  try { REAL_HOME = require("../../config").REAL_HOME; } catch (e) { REAL_HOME = require("os").homedir(); }
-  var dirs = [
-    path.join(REAL_HOME, ".claude", "skills"),
-    path.join(cwd || "", ".claude", "skills"),
-  ];
-  for (var d = 0; d < dirs.length; d++) {
-    var base = dirs[d];
-    if (!base) continue;
-    var entries;
-    try { entries = fs.readdirSync(base, { withFileTypes: true }); } catch (e) { continue; }
-    for (var i = 0; i < entries.length; i++) {
-      var entry = entries[i];
-      if (!entry.isDirectory() && !entry.isSymbolicLink()) continue;
-      var skillMd = path.join(base, entry.name, "SKILL.md");
-      try {
-        fs.accessSync(skillMd, fs.constants.R_OK);
-        skills[entry.name] = skillMd;
-      } catch (e) {}
+function injectSharedSkillContent(message, skills) {
+  var text = "";
+  if (typeof message === "string") text = message;
+  else if (Array.isArray(message)) {
+    for (var i = 0; i < message.length; i++) {
+      if (message[i] && message[i].type === "text") text += "\n" + (message[i].text || "");
+    }
+  }
+  var content = skillDiscovery.readReferencedSkills(text, skills, 32768);
+  if (!content) return message;
+  var appendix = "\n\nUse the following shared skill instructions for this turn:\n" + content;
+  if (typeof message === "string") return message + appendix;
+  if (!Array.isArray(message)) return message;
+  var cloned = message.slice();
+  for (var ci = 0; ci < cloned.length; ci++) {
+    if (cloned[ci] && cloned[ci].type === "text") {
+      cloned[ci] = Object.assign({}, cloned[ci], { text: (cloned[ci].text || "") + appendix });
+      return cloned;
     }
   }
-  return skills;
+  cloned.unshift({ type: "text", text: appendix.trim() });
+  return cloned;
 }
 
 var _uuidCounter = 0;
@@ -404,7 +397,7 @@ function createEventState(opts) {
 
 function createKiroQueryHandle(acp, queryOpts) {
   var abortController = queryOpts.abortController;
-  var systemPrompt = queryOpts.systemPrompt || "";
+  var systemPrompt = queryOpts.systemPrompt || queryOpts.appendSystemPrompt || "";
   var canUseTool = queryOpts.canUseTool || null;
   var onFinished = queryOpts.onFinished || null;
 
@@ -686,9 +679,10 @@ function createKiroQueryHandle(acp, queryOpts) {
       while (!isCancelled()) {
         resetTurnState();
 
-        var input = typeof currentMessage === "string"
-          ? [{ type: "text", text: currentMessage }]
-          : currentMessage;
+        var messageWithSkills = injectSharedSkillContent(currentMessage, queryOpts.skills || []);
+        var input = typeof messageWithSkills === "string"
+          ? [{ type: "text", text: messageWithSkills }]
+          : messageWithSkills;
 
         // Emit turn_start so the UI records a user turn boundary.
         pushEvent({ yokeType: "turn_start", uuid: generateUuid(), messageType: "user" });
@@ -869,6 +863,7 @@ function createKiroAdapter(opts) {
       fastModeState: null,
       capabilities: {
         effort: false,
+        midSessionModelSwitch: false,
         fork: false,
         rollback: false,
         sessionListing: false,
@@ -881,6 +876,7 @@ function createKiroAdapter(opts) {
         elicitation: false,
         fileCheckpointing: false,
         contextCompacting: true,
+        skillSharing: true,
         toolPolicy: ["ask"],
       },
     };
@@ -1011,8 +1007,7 @@ function createKiroAdapter(opts) {
           _defaultModel = "auto";
         }
 
-        // Discover Claude skills so $<skill-name> references resolve.
-        var skillNames = Object.keys(discoverClaudeSkills(_cwd));
+        var skillNames = skillDiscovery.discoverSkills(_cwd).map(function(skill) { return skill.name; });
         console.log("[yoke/kiro] ACP initialized, models: " + _cachedModels.length + ", skills: " + skillNames.length);
 
         updateLastActiveAt();
@@ -1065,6 +1060,8 @@ function createKiroAdapter(opts) {
       var model = queryOpts.model || _defaultModel || "auto";
       var ac = queryOpts.abortController || new AbortController();
       var kiroOpts = (queryOpts.adapterOptions && queryOpts.adapterOptions.KIRO) || {};
+      var sharedSkills = skillDiscovery.discoverSkills(queryOpts.cwd || _cwd);
+      var skillIndex = skillDiscovery.buildSkillIndex(sharedSkills);
 
       var activeEntry = { abort: function() { try { ac.abort(); } catch (e) {} } };
 
@@ -1074,7 +1071,8 @@ function createKiroAdapter(opts) {
         contextWindow: _modelContextWindows[model] || null,
         mode: kiroOpts.mode || null,
         cwd: queryOpts.cwd || _cwd,
-        systemPrompt: queryOpts.systemPrompt || "",
+        systemPrompt: (queryOpts.systemPrompt || "") + (skillIndex ? "\n\n" + skillIndex : ""),
+        skills: sharedSkills,
         abortController: ac,
         canUseTool: queryOpts.canUseTool || null,
         resumeSessionId: queryOpts.resumeSessionId || null,
@@ -1165,6 +1163,7 @@ module.exports = {
   contractTestKit: {
     createEventState: createEventState,
     createQueryHandle: createKiroQueryHandle,
+    injectSharedSkillContent: injectSharedSkillContent,
     normalizeEvent: flattenUpdate,
   },
 };