claude-relay 2.4.1 → 2.4.3

package/lib/daemon.js

@@ -4,6 +4,10 @@
 if (!Symbol.dispose) Symbol.dispose = Symbol("Symbol.dispose");
 if (!Symbol.asyncDispose) Symbol.asyncDispose = Symbol("Symbol.asyncDispose");
 
+// Remove CLAUDECODE env var so the SDK can spawn Claude Code child processes
+// (prevents "cannot be launched inside another Claude Code session" error)
+delete process.env.CLAUDECODE;
+
 var fs = require("fs");
 var path = require("path");
 var { loadConfig, saveConfig, socketPath, generateSlug, syncClayrc, writeCrashInfo, readCrashInfo, clearCrashInfo } = require("./config");

package/lib/sdk-bridge.js

@@ -1,4 +1,7 @@
 const crypto = require("crypto");
+var fs = require("fs");
+var path = require("path");
+var os = require("os");
 
 // Async message queue for streaming input to SDK
 function createMessageQueue() {
@@ -50,6 +53,53 @@ function createSDKBridge(opts) {
   var getSDK = opts.getSDK;
   var dangerouslySkipPermissions = opts.dangerouslySkipPermissions || false;
 
+  // --- Skill discovery helpers ---
+
+  function discoverSkillDirs() {
+    var skills = {};
+    var dirs = [
+      path.join(os.homedir(), ".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
+        }
+      }
+    }
+    return skills;
+  }
+
+  function mergeSkills(sdkSkills, fsSkills) {
+    var merged = new Set();
+    if (Array.isArray(sdkSkills)) {
+      for (var i = 0; i < sdkSkills.length; i++) {
+        merged.add(sdkSkills[i]);
+      }
+    }
+    var fsNames = Object.keys(fsSkills);
+    for (var i = 0; i < fsNames.length; i++) {
+      merged.add(fsNames[i]);
+    }
+    return merged;
+  }
+
   function sendAndRecord(session, obj) {
     sm.sendAndRecord(session, obj);
   }
@@ -79,13 +129,20 @@ function createSDKBridge(opts) {
 
     // Cache slash_commands and model from CLI init message
     if (parsed.type === "system" && parsed.subtype === "init") {
-      if (parsed.skills) {
-        sm.skillNames = new Set(parsed.skills);
-      }
+      var fsSkills = discoverSkillDirs();
+      sm.skillNames = mergeSkills(parsed.skills, fsSkills);
       if (parsed.slash_commands) {
-        sm.slashCommands = parsed.slash_commands.filter(function(name) {
-          return !sm.skillNames || !sm.skillNames.has(name);
-        });
+        // Union: SDK slash_commands + merged skills (deduplicated)
+        var seen = new Set();
+        var combined = [];
+        var all = parsed.slash_commands.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;
         send({ type: "slash_commands", commands: sm.slashCommands });
       }
       if (parsed.model) {
@@ -649,13 +706,20 @@ function createSDKBridge(opts) {
       });
       for await (var msg of stream) {
         if (msg.type === "system" && msg.subtype === "init") {
-          if (msg.skills) {
-            sm.skillNames = new Set(msg.skills);
-          }
+          var fsSkills = discoverSkillDirs();
+          sm.skillNames = mergeSkills(msg.skills, fsSkills);
           if (msg.slash_commands) {
-            sm.slashCommands = msg.slash_commands.filter(function(name) {
-              return !sm.skillNames || !sm.skillNames.has(name);
-            });
+            // Union: SDK slash_commands + merged skills (deduplicated)
+            var seen = new Set();
+            var combined = [];
+            var all = msg.slash_commands.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;
             send({ type: "slash_commands", commands: sm.slashCommands });
           }
           if (msg.model) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-relay",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "description": "Web UI for Claude Code. Any device. Push notifications.",
   "bin": {
     "claude-relay": "./bin/cli.js"