@wingman-ai/gateway 0.4.0 → 0.4.2

package/dist/cli/core/agentInvoker.cjs

@@ -59,6 +59,8 @@ const hooks_cjs_namespaceObject = require("../../agent/middleware/hooks.cjs");
 const media_compat_cjs_namespaceObject = require("../../agent/middleware/media-compat.cjs");
 const terminal_session_manager_cjs_namespaceObject = require("../../agent/tools/terminal_session_manager.cjs");
 const uiRegistry_cjs_namespaceObject = require("../../agent/uiRegistry.cjs");
+const activation_cjs_namespaceObject = require("../../skills/activation.cjs");
+const overlay_cjs_namespaceObject = require("../../skills/overlay.cjs");
 const agentLoader_cjs_namespaceObject = require("../../agent/config/agentLoader.cjs");
 const loader_cjs_namespaceObject = require("../config/loader.cjs");
 function _define_property(obj, key, value) {
@@ -322,6 +324,7 @@ class AgentInvoker {
         let activeToolName = null;
         let lastToolName = null;
         let rootLangGraphRunId;
+        const skillOverlayDirectories = [];
         const isCancelled = ()=>options?.signal?.aborted === true;
         try {
             const hookSessionId = sessionId || (0, external_uuid_namespaceObject.v4)();
@@ -329,7 +332,9 @@ class AgentInvoker {
             const effectiveWorkdir = this.workdir ? executionWorkspace : null;
             const loader = new agentLoader_cjs_namespaceObject.AgentLoader(this.configDir, this.workspace, this.wingmanConfig, executionWorkspace, {
                 terminalOwnerId: `${agentName}:${hookSessionId}`,
-                terminalSessionManager: this.terminalSessionManager
+                terminalSessionManager: this.terminalSessionManager,
+                nodeInvoker: this.nodeInvoker,
+                nodeDefaultTargetClientId: this.nodeDefaultTargetClientId
             });
             const targetAgent = await loader.loadAgent(agentName);
             if (!targetAgent) throw new Error(`Agent "${agentName}" not found`);
@@ -375,7 +380,10 @@ class AgentInvoker {
                     defaultOutputDir: this.defaultOutputDir,
                     outputVirtualPath: outputMount.virtualPath,
                     dynamicUiEnabled: this.wingmanConfig?.gateway?.dynamicUiEnabled !== false,
-                    skillsDirectory
+                    skillsDirectory,
+                    nodeConnectedIdsProvider: this.nodeConnectedIdsProvider,
+                    nodeConnectedTargetsProvider: this.nodeConnectedTargetsProvider,
+                    defaultNodeTargetClientId: this.nodeDefaultTargetClientId
                 })
             ];
             const summarizationSettings = resolveSummarizationMiddlewareSettings(this.wingmanConfig);
@@ -407,9 +415,8 @@ class AgentInvoker {
             }
             const checkpointer = this.sessionManager?.getCheckpointer();
             const bundledSkillsPath = (0, uiRegistry_cjs_namespaceObject.getBundledSkillsPath)();
+            const workspaceSkillsPath = (0, external_node_path_namespaceObject.join)(this.workspace, normalizedSkillsDirectory);
             const skillsSources = [];
-            if ((0, external_node_fs_namespaceObject.existsSync)(bundledSkillsPath)) skillsSources.push("/skills-bundled/");
-            skillsSources.push(skillsVirtualPath);
             const backendOverrides = {
                 "/memories/": new external_deepagents_namespaceObject.FilesystemBackend({
                     rootDir: (0, external_node_path_namespaceObject.join)(this.workspace, this.configDir, "memories"),
@@ -425,15 +432,46 @@ class AgentInvoker {
                 rootDir: executionWorkspace,
                 virtualMode: true
             });
-            const workspaceSkillsPath = (0, external_node_path_namespaceObject.join)(this.workspace, normalizedSkillsDirectory);
-            if ((0, external_node_fs_namespaceObject.existsSync)(workspaceSkillsPath)) backendOverrides[skillsVirtualPath] = new external_deepagents_namespaceObject.FilesystemBackend({
-                rootDir: workspaceSkillsPath,
-                virtualMode: true
-            });
-            if ((0, external_node_fs_namespaceObject.existsSync)(bundledSkillsPath)) backendOverrides["/skills-bundled/"] = new external_deepagents_namespaceObject.FilesystemBackend({
-                rootDir: bundledSkillsPath,
-                virtualMode: true
-            });
+            if ((0, external_node_fs_namespaceObject.existsSync)(workspaceSkillsPath)) {
+                const workspaceActivation = await (0, activation_cjs_namespaceObject.resolveSkillActivation)(workspaceSkillsPath);
+                if (workspaceActivation.inactiveSkills.length > 0) {
+                    const summary = workspaceActivation.inactiveSkills.map((entry)=>`${entry.name} (missing: ${entry.missingBins.join(", ")})`).join("; ");
+                    this.logger.info(`Inactive workspace skills: ${summary}`);
+                }
+                let workspaceOverlayRoot = workspaceSkillsPath;
+                try {
+                    const workspaceOverlay = await (0, overlay_cjs_namespaceObject.createSkillOverlayDirectory)(workspaceSkillsPath, workspaceActivation.activeSkillNames);
+                    workspaceOverlayRoot = workspaceOverlay;
+                    skillOverlayDirectories.push(workspaceOverlay);
+                } catch (error) {
+                    this.logger.debug("Failed to build workspace skill overlay; falling back to unfiltered skills directory", error);
+                }
+                backendOverrides[skillsVirtualPath] = new external_deepagents_namespaceObject.FilesystemBackend({
+                    rootDir: workspaceOverlayRoot,
+                    virtualMode: true
+                });
+                skillsSources.push(skillsVirtualPath);
+            }
+            if ((0, external_node_fs_namespaceObject.existsSync)(bundledSkillsPath)) {
+                const bundledActivation = await (0, activation_cjs_namespaceObject.resolveSkillActivation)(bundledSkillsPath);
+                if (bundledActivation.inactiveSkills.length > 0) {
+                    const summary = bundledActivation.inactiveSkills.map((entry)=>`${entry.name} (missing: ${entry.missingBins.join(", ")})`).join("; ");
+                    this.logger.info(`Inactive bundled skills: ${summary}`);
+                }
+                let bundledOverlayRoot = bundledSkillsPath;
+                try {
+                    const bundledOverlay = await (0, overlay_cjs_namespaceObject.createSkillOverlayDirectory)(bundledSkillsPath, bundledActivation.activeSkillNames);
+                    bundledOverlayRoot = bundledOverlay;
+                    skillOverlayDirectories.push(bundledOverlay);
+                } catch (error) {
+                    this.logger.debug("Failed to build bundled skill overlay; falling back to unfiltered skills directory", error);
+                }
+                backendOverrides["/skills-bundled/"] = new external_deepagents_namespaceObject.FilesystemBackend({
+                    rootDir: bundledOverlayRoot,
+                    virtualMode: true
+                });
+                skillsSources.push("/skills-bundled/");
+            }
             if (outputMount.virtualPath && outputMount.absolutePath) backendOverrides[outputMount.virtualPath] = new external_deepagents_namespaceObject.FilesystemBackend({
                 rootDir: outputMount.absolutePath,
                 virtualMode: true
@@ -571,6 +609,11 @@ class AgentInvoker {
             this.outputManager.emitAgentError(errorWithToolContext);
             throw error;
         } finally{
+            for (const overlayDirectory of skillOverlayDirectories)try {
+                await (0, overlay_cjs_namespaceObject.removeSkillOverlayDirectory)(overlayDirectory);
+            } catch (error) {
+                this.logger.debug(`Failed to cleanup skill overlay directory ${overlayDirectory}`, error);
+            }
             if (this.mcpManager) {
                 this.logger.debug("Cleaning up MCP client");
                 await this.mcpManager.cleanup();
@@ -602,6 +645,10 @@ class AgentInvoker {
         _define_property(this, "workdir", null);
         _define_property(this, "defaultOutputDir", null);
         _define_property(this, "mcpProxyConfig", void 0);
+        _define_property(this, "nodeInvoker", void 0);
+        _define_property(this, "nodeDefaultTargetClientId", void 0);
+        _define_property(this, "nodeConnectedIdsProvider", void 0);
+        _define_property(this, "nodeConnectedTargetsProvider", void 0);
         this.outputManager = options.outputManager;
         this.logger = options.logger;
         this.workspace = options.workspace || process.cwd();
@@ -611,9 +658,18 @@ class AgentInvoker {
         this.workdir = options.workdir || null;
         this.defaultOutputDir = options.defaultOutputDir || null;
         this.mcpProxyConfig = options.mcpProxyConfig;
+        this.nodeInvoker = options.nodeInvoker;
+        this.nodeDefaultTargetClientId = options.nodeDefaultTargetClientId;
+        this.nodeConnectedIdsProvider = options.nodeConnectedIdsProvider;
+        this.nodeConnectedTargetsProvider = options.nodeConnectedTargetsProvider;
         const configLoader = new loader_cjs_namespaceObject.WingmanConfigLoader(this.configDir, this.workspace);
         this.wingmanConfig = configLoader.loadConfig();
-        this.loader = new agentLoader_cjs_namespaceObject.AgentLoader(this.configDir, this.workspace, this.wingmanConfig);
+        this.loader = new agentLoader_cjs_namespaceObject.AgentLoader(this.configDir, this.workspace, this.wingmanConfig, this.workspace, {
+            terminalOwnerId: "default",
+            terminalSessionManager: this.terminalSessionManager,
+            nodeInvoker: this.nodeInvoker,
+            nodeDefaultTargetClientId: this.nodeDefaultTargetClientId
+        });
     }
 }
 function buildUserContent(prompt, attachments, model) {

package/dist/cli/core/agentInvoker.d.ts

@@ -1,6 +1,8 @@
 import type { WingmanAgentConfig } from "@/agent/config/agentConfig.js";
 import { type MCPProxyConfig } from "@/agent/config/mcpClientManager.js";
+import { type ConnectedNodeTarget } from "@/agent/middleware/additional-messages.js";
 import { type TerminalSessionManager } from "@/agent/tools/terminal_session_manager.js";
+import type { NodeInvokeRequest, NodeInvokeResult } from "@/agent/tools/node_invoke.js";
 import type { WingmanAgent } from "@/types/agents.js";
 import type { Logger } from "../../logger.js";
 import type { WingmanConfigType } from "../config/schema.js";
@@ -16,6 +18,10 @@ export interface AgentInvokerOptions {
     workdir?: string | null;
     defaultOutputDir?: string | null;
     mcpProxyConfig?: MCPProxyConfig;
+    nodeInvoker?: (request: NodeInvokeRequest) => Promise<NodeInvokeResult>;
+    nodeDefaultTargetClientId?: string;
+    nodeConnectedIdsProvider?: () => string[] | Promise<string[]>;
+    nodeConnectedTargetsProvider?: () => ConnectedNodeTarget[] | Promise<ConnectedNodeTarget[]>;
 }
 export interface InvokeAgentOptions {
     signal?: AbortSignal;
@@ -152,6 +158,10 @@ export declare class AgentInvoker {
     private workdir;
     private defaultOutputDir;
     private mcpProxyConfig;
+    private nodeInvoker;
+    private nodeDefaultTargetClientId;
+    private nodeConnectedIdsProvider;
+    private nodeConnectedTargetsProvider;
     constructor(options: AgentInvokerOptions);
     findAllAgents(): WingmanAgentConfig[];
     /**

package/dist/cli/core/agentInvoker.js

@@ -10,6 +10,8 @@ import { createHooksMiddleware } from "../../agent/middleware/hooks.js";
 import { mediaCompatibilityMiddleware } from "../../agent/middleware/media-compat.js";
 import { getSharedTerminalSessionManager } from "../../agent/tools/terminal_session_manager.js";
 import { getBundledSkillsPath } from "../../agent/uiRegistry.js";
+import { resolveSkillActivation } from "../../skills/activation.js";
+import { createSkillOverlayDirectory, removeSkillOverlayDirectory } from "../../skills/overlay.js";
 import { AgentLoader } from "../../agent/config/agentLoader.js";
 import { WingmanConfigLoader } from "../config/loader.js";
 function _define_property(obj, key, value) {
@@ -273,6 +275,7 @@ class AgentInvoker {
         let activeToolName = null;
         let lastToolName = null;
         let rootLangGraphRunId;
+        const skillOverlayDirectories = [];
         const isCancelled = ()=>options?.signal?.aborted === true;
         try {
             const hookSessionId = sessionId || v4();
@@ -280,7 +283,9 @@ class AgentInvoker {
             const effectiveWorkdir = this.workdir ? executionWorkspace : null;
             const loader = new AgentLoader(this.configDir, this.workspace, this.wingmanConfig, executionWorkspace, {
                 terminalOwnerId: `${agentName}:${hookSessionId}`,
-                terminalSessionManager: this.terminalSessionManager
+                terminalSessionManager: this.terminalSessionManager,
+                nodeInvoker: this.nodeInvoker,
+                nodeDefaultTargetClientId: this.nodeDefaultTargetClientId
             });
             const targetAgent = await loader.loadAgent(agentName);
             if (!targetAgent) throw new Error(`Agent "${agentName}" not found`);
@@ -326,7 +331,10 @@ class AgentInvoker {
                     defaultOutputDir: this.defaultOutputDir,
                     outputVirtualPath: outputMount.virtualPath,
                     dynamicUiEnabled: this.wingmanConfig?.gateway?.dynamicUiEnabled !== false,
-                    skillsDirectory
+                    skillsDirectory,
+                    nodeConnectedIdsProvider: this.nodeConnectedIdsProvider,
+                    nodeConnectedTargetsProvider: this.nodeConnectedTargetsProvider,
+                    defaultNodeTargetClientId: this.nodeDefaultTargetClientId
                 })
             ];
             const summarizationSettings = resolveSummarizationMiddlewareSettings(this.wingmanConfig);
@@ -358,9 +366,8 @@ class AgentInvoker {
             }
             const checkpointer = this.sessionManager?.getCheckpointer();
             const bundledSkillsPath = getBundledSkillsPath();
+            const workspaceSkillsPath = join(this.workspace, normalizedSkillsDirectory);
             const skillsSources = [];
-            if (existsSync(bundledSkillsPath)) skillsSources.push("/skills-bundled/");
-            skillsSources.push(skillsVirtualPath);
             const backendOverrides = {
                 "/memories/": new FilesystemBackend({
                     rootDir: join(this.workspace, this.configDir, "memories"),
@@ -376,15 +383,46 @@ class AgentInvoker {
                 rootDir: executionWorkspace,
                 virtualMode: true
             });
-            const workspaceSkillsPath = join(this.workspace, normalizedSkillsDirectory);
-            if (existsSync(workspaceSkillsPath)) backendOverrides[skillsVirtualPath] = new FilesystemBackend({
-                rootDir: workspaceSkillsPath,
-                virtualMode: true
-            });
-            if (existsSync(bundledSkillsPath)) backendOverrides["/skills-bundled/"] = new FilesystemBackend({
-                rootDir: bundledSkillsPath,
-                virtualMode: true
-            });
+            if (existsSync(workspaceSkillsPath)) {
+                const workspaceActivation = await resolveSkillActivation(workspaceSkillsPath);
+                if (workspaceActivation.inactiveSkills.length > 0) {
+                    const summary = workspaceActivation.inactiveSkills.map((entry)=>`${entry.name} (missing: ${entry.missingBins.join(", ")})`).join("; ");
+                    this.logger.info(`Inactive workspace skills: ${summary}`);
+                }
+                let workspaceOverlayRoot = workspaceSkillsPath;
+                try {
+                    const workspaceOverlay = await createSkillOverlayDirectory(workspaceSkillsPath, workspaceActivation.activeSkillNames);
+                    workspaceOverlayRoot = workspaceOverlay;
+                    skillOverlayDirectories.push(workspaceOverlay);
+                } catch (error) {
+                    this.logger.debug("Failed to build workspace skill overlay; falling back to unfiltered skills directory", error);
+                }
+                backendOverrides[skillsVirtualPath] = new FilesystemBackend({
+                    rootDir: workspaceOverlayRoot,
+                    virtualMode: true
+                });
+                skillsSources.push(skillsVirtualPath);
+            }
+            if (existsSync(bundledSkillsPath)) {
+                const bundledActivation = await resolveSkillActivation(bundledSkillsPath);
+                if (bundledActivation.inactiveSkills.length > 0) {
+                    const summary = bundledActivation.inactiveSkills.map((entry)=>`${entry.name} (missing: ${entry.missingBins.join(", ")})`).join("; ");
+                    this.logger.info(`Inactive bundled skills: ${summary}`);
+                }
+                let bundledOverlayRoot = bundledSkillsPath;
+                try {
+                    const bundledOverlay = await createSkillOverlayDirectory(bundledSkillsPath, bundledActivation.activeSkillNames);
+                    bundledOverlayRoot = bundledOverlay;
+                    skillOverlayDirectories.push(bundledOverlay);
+                } catch (error) {
+                    this.logger.debug("Failed to build bundled skill overlay; falling back to unfiltered skills directory", error);
+                }
+                backendOverrides["/skills-bundled/"] = new FilesystemBackend({
+                    rootDir: bundledOverlayRoot,
+                    virtualMode: true
+                });
+                skillsSources.push("/skills-bundled/");
+            }
             if (outputMount.virtualPath && outputMount.absolutePath) backendOverrides[outputMount.virtualPath] = new FilesystemBackend({
                 rootDir: outputMount.absolutePath,
                 virtualMode: true
@@ -522,6 +560,11 @@ class AgentInvoker {
             this.outputManager.emitAgentError(errorWithToolContext);
             throw error;
         } finally{
+            for (const overlayDirectory of skillOverlayDirectories)try {
+                await removeSkillOverlayDirectory(overlayDirectory);
+            } catch (error) {
+                this.logger.debug(`Failed to cleanup skill overlay directory ${overlayDirectory}`, error);
+            }
             if (this.mcpManager) {
                 this.logger.debug("Cleaning up MCP client");
                 await this.mcpManager.cleanup();
@@ -553,6 +596,10 @@ class AgentInvoker {
         _define_property(this, "workdir", null);
         _define_property(this, "defaultOutputDir", null);
         _define_property(this, "mcpProxyConfig", void 0);
+        _define_property(this, "nodeInvoker", void 0);
+        _define_property(this, "nodeDefaultTargetClientId", void 0);
+        _define_property(this, "nodeConnectedIdsProvider", void 0);
+        _define_property(this, "nodeConnectedTargetsProvider", void 0);
         this.outputManager = options.outputManager;
         this.logger = options.logger;
         this.workspace = options.workspace || process.cwd();
@@ -562,9 +609,18 @@ class AgentInvoker {
         this.workdir = options.workdir || null;
         this.defaultOutputDir = options.defaultOutputDir || null;
         this.mcpProxyConfig = options.mcpProxyConfig;
+        this.nodeInvoker = options.nodeInvoker;
+        this.nodeDefaultTargetClientId = options.nodeDefaultTargetClientId;
+        this.nodeConnectedIdsProvider = options.nodeConnectedIdsProvider;
+        this.nodeConnectedTargetsProvider = options.nodeConnectedTargetsProvider;
         const configLoader = new WingmanConfigLoader(this.configDir, this.workspace);
         this.wingmanConfig = configLoader.loadConfig();
-        this.loader = new AgentLoader(this.configDir, this.workspace, this.wingmanConfig);
+        this.loader = new AgentLoader(this.configDir, this.workspace, this.wingmanConfig, this.workspace, {
+            terminalOwnerId: "default",
+            terminalSessionManager: this.terminalSessionManager,
+            nodeInvoker: this.nodeInvoker,
+            nodeDefaultTargetClientId: this.nodeDefaultTargetClientId
+        });
     }
 }
 function buildUserContent(prompt, attachments, model) {

package/dist/cli/services/skillRepository.cjs

@@ -27,6 +27,7 @@ __webpack_require__.d(__webpack_exports__, {
     SkillRepository: ()=>SkillRepository
 });
 const external_logger_cjs_namespaceObject = require("../../logger.cjs");
+const metadata_cjs_namespaceObject = require("../../skills/metadata.cjs");
 function _define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
         value: value,
@@ -63,7 +64,8 @@ class SkillRepository {
     async listAvailableSkills() {
         try {
             if ("clawhub" === this.provider) return await this.listSkillsFromClawhub();
-            return await this.listSkillsFromGitHub();
+            if ("github" === this.provider) return await this.listSkillsFromGitHub();
+            return await this.listSkillsFromHybrid();
         } catch (error) {
             if (error instanceof Error) throw new Error(`Failed to list skills: ${error.message}`);
             throw error;
@@ -85,19 +87,39 @@ class SkillRepository {
         return Buffer.from(arrayBuffer);
     }
     async getSkillMetadata(skillName) {
-        if ("clawhub" === this.provider) return await this.getClawhubSkillMetadata(skillName);
         try {
-            const skillMdPath = `/repos/${this.owner}/${this.repo}/contents/skills/${skillName}/SKILL.md`;
-            const skillMd = await this.fetchGitHub(skillMdPath);
-            if ("file" !== skillMd.type || !skillMd.content) throw new Error("SKILL.md not found or invalid");
-            const content = Buffer.from(skillMd.content, "base64").toString("utf-8");
-            const metadata = this.parseSkillMetadata(content);
-            return metadata;
+            if ("clawhub" === this.provider) return await this.getClawhubSkillMetadata(skillName);
+            if ("github" === this.provider) {
+                const repository = await this.resolveGitHubRepositoryForSkill(skillName);
+                return await this.getGitHubSkillMetadata(skillName, repository);
+            }
+            return await this.getHybridSkillMetadata(skillName);
         } catch (error) {
             if (error instanceof Error) throw new Error(`Failed to fetch skill metadata for ${skillName}: ${error.message}`);
             throw error;
         }
     }
+    async getGitHubSkillMetadata(skillName, repository) {
+        const skillMdPath = `/repos/${repository.owner}/${repository.name}/contents/skills/${skillName}/SKILL.md`;
+        const skillMd = await this.fetchGitHub(skillMdPath);
+        if ("file" !== skillMd.type || !skillMd.content) throw new Error(`SKILL.md not found or invalid in ${repository.owner}/${repository.name}`);
+        const content = Buffer.from(skillMd.content, "base64").toString("utf-8");
+        return this.parseSkillMetadata(content);
+    }
+    async resolveGitHubRepositoryForSkill(skillName) {
+        const repositories = this.getGitHubRepositories();
+        for(let index = repositories.length - 1; index >= 0; index -= 1){
+            const repository = repositories[index];
+            try {
+                await this.fetchGitHub(`/repos/${repository.owner}/${repository.name}/contents/skills/${skillName}/SKILL.md`);
+                return repository;
+            } catch (error) {
+                if (error instanceof Error && error.message.includes("Resource not found")) continue;
+                throw error;
+            }
+        }
+        throw new Error(`Skill '${skillName}' not found in configured GitHub repositories: ${repositories.map((repository)=>`${repository.owner}/${repository.name}`).join(", ")}`);
+    }
     async getClawhubSkillMetadata(skillName) {
         try {
             const detail = await this.fetchJson(`${this.clawhubBaseUrl}/api/v1/skills/${encodeURIComponent(skillName)}`, {
@@ -127,51 +149,50 @@ class SkillRepository {
             throw error;
         }
     }
+    async getHybridSkillMetadata(skillName) {
+        let githubError;
+        try {
+            const repository = await this.resolveGitHubRepositoryForSkill(skillName);
+            return await this.getGitHubSkillMetadata(skillName, repository);
+        } catch (error) {
+            githubError = error;
+            logger.debug(`Falling back to ClawHub metadata lookup for '${skillName}' after GitHub error: ${error instanceof Error ? error.message : String(error)}`);
+        }
+        try {
+            return await this.getClawhubSkillMetadata(skillName);
+        } catch (clawhubError) {
+            throw new Error(`GitHub error: ${githubError instanceof Error ? githubError.message : String(githubError)}; ClawHub error: ${clawhubError instanceof Error ? clawhubError.message : String(clawhubError)}`);
+        }
+    }
     parseSkillMetadata(content) {
-        const frontmatterRegex = /^---\s*\n([\s\S]*?)\n---/;
-        const match = content.match(frontmatterRegex);
-        if (!match) throw new Error("Invalid SKILL.md format: missing YAML frontmatter");
-        const frontmatter = match[1];
-        const metadata = {
-            name: "",
-            description: ""
+        const parsed = (0, metadata_cjs_namespaceObject.parseSkillFrontmatter)(content);
+        return {
+            name: parsed.name,
+            description: parsed.description,
+            ...parsed.license ? {
+                license: parsed.license
+            } : {},
+            ...parsed.compatibility ? {
+                compatibility: parsed.compatibility
+            } : {},
+            ...parsed.allowedTools.length > 0 ? {
+                allowedTools: parsed.allowedTools
+            } : {},
+            ...parsed.metadata ? {
+                metadata: parsed.metadata
+            } : {}
         };
-        const lines = frontmatter.split("\n");
-        for (const line of lines){
-            const colonIndex = line.indexOf(":");
-            if (-1 === colonIndex) continue;
-            const key = line.substring(0, colonIndex).trim();
-            const value = line.substring(colonIndex + 1).trim();
-            switch(key){
-                case "name":
-                    metadata.name = value;
-                    break;
-                case "description":
-                    metadata.description = value;
-                    break;
-                case "license":
-                    metadata.license = value;
-                    break;
-                case "compatibility":
-                    metadata.compatibility = value;
-                    break;
-                case "allowed-tools":
-                    metadata.allowedTools = value;
-                    break;
-            }
-        }
-        if (!metadata.name) throw new Error("Invalid SKILL.md: missing required field 'name'");
-        if (!metadata.description) throw new Error("Invalid SKILL.md: missing required field 'description'");
-        const nameRegex = /^[a-z0-9]+(-[a-z0-9]+)*$/;
-        if (!nameRegex.test(metadata.name)) throw new Error(`Invalid skill name '${metadata.name}': must be lowercase alphanumeric with hyphens only`);
-        return metadata;
     }
     async downloadSkill(skillName) {
-        if ("clawhub" === this.provider) return await this.downloadSkillFromClawhub(skillName);
         try {
-            const files = new Map();
-            await this.downloadDirectory(`skills/${skillName}`, files, skillName);
-            return files;
+            if ("clawhub" === this.provider) return await this.downloadSkillFromClawhub(skillName);
+            if ("github" === this.provider) {
+                const repository = await this.resolveGitHubRepositoryForSkill(skillName);
+                const files = new Map();
+                await this.downloadDirectory(`skills/${skillName}`, files, skillName, repository);
+                return files;
+            }
+            return await this.downloadHybridSkill(skillName);
         } catch (error) {
             if (error instanceof Error) throw new Error(`Failed to download skill ${skillName}: ${error.message}`);
             throw error;
@@ -214,8 +235,25 @@ class SkillRepository {
             throw error;
         }
     }
-    async downloadDirectory(path, files, skillName) {
-        const contents = await this.fetchGitHub(`/repos/${this.owner}/${this.repo}/contents/${path}`);
+    async downloadHybridSkill(skillName) {
+        let githubError;
+        try {
+            const repository = await this.resolveGitHubRepositoryForSkill(skillName);
+            const files = new Map();
+            await this.downloadDirectory(`skills/${skillName}`, files, skillName, repository);
+            return files;
+        } catch (error) {
+            githubError = error;
+            logger.debug(`Falling back to ClawHub download for '${skillName}' after GitHub error: ${error instanceof Error ? error.message : String(error)}`);
+        }
+        try {
+            return await this.downloadSkillFromClawhub(skillName);
+        } catch (clawhubError) {
+            throw new Error(`GitHub error: ${githubError instanceof Error ? githubError.message : String(githubError)}; ClawHub error: ${clawhubError instanceof Error ? clawhubError.message : String(clawhubError)}`);
+        }
+    }
+    async downloadDirectory(path, files, skillName, repository) {
+        const contents = await this.fetchGitHub(`/repos/${repository.owner}/${repository.name}/contents/${path}`);
         for (const item of contents)if ("file" === item.type) if (item.content) {
             const content = Buffer.from(item.content, "base64");
             const relativePath = item.path.replace(`skills/${skillName}/`, "");
@@ -228,7 +266,7 @@ class SkillRepository {
                 files.set(relativePath, content);
             }
         }
-        else if ("dir" === item.type) await this.downloadDirectory(item.path, files, skillName);
+        else if ("dir" === item.type) await this.downloadDirectory(item.path, files, skillName, repository);
     }
     async listSkillsFromClawhub() {
         const allSkills = [];
@@ -257,32 +295,80 @@ class SkillRepository {
         }while (cursor);
         return allSkills;
     }
-    async listSkillsFromGitHub() {
-        const contents = await this.fetchGitHub(`/repos/${this.owner}/${this.repo}/contents/skills`);
-        const skills = [];
-        for (const item of contents)if ("dir" === item.type) try {
-            const metadata = await this.getSkillMetadata(item.name);
-            skills.push({
-                name: item.name,
-                description: metadata.description || "No description",
-                path: item.path,
-                metadata
-            });
+    async listSkillsFromHybrid() {
+        let clawhubSkills = [];
+        let githubSkills = [];
+        let clawhubError;
+        let githubError;
+        try {
+            clawhubSkills = await this.listSkillsFromClawhub();
         } catch (error) {
-            logger.warn(`Could not read skill ${item.name}`, error instanceof Error ? error.message : String(error));
+            clawhubError = error;
+            logger.warn(`Failed to list ClawHub skills in hybrid mode: ${error instanceof Error ? error.message : String(error)}`);
         }
-        return skills;
+        try {
+            githubSkills = await this.listSkillsFromGitHub();
+        } catch (error) {
+            githubError = error;
+            logger.warn(`Failed to list GitHub skills in hybrid mode: ${error instanceof Error ? error.message : String(error)}`);
+        }
+        if (0 === clawhubSkills.length && 0 === githubSkills.length) throw new Error(`No skill sources available. ClawHub error: ${clawhubError instanceof Error ? clawhubError.message : "none"}; GitHub error: ${githubError instanceof Error ? githubError.message : "none"}`);
+        const mergedSkills = new Map();
+        for (const skill of clawhubSkills)mergedSkills.set(skill.name, skill);
+        for (const skill of githubSkills){
+            if (mergedSkills.has(skill.name)) mergedSkills.delete(skill.name);
+            mergedSkills.set(skill.name, skill);
+        }
+        return [
+            ...mergedSkills.values()
+        ];
+    }
+    async listSkillsFromGitHub() {
+        const mergedSkills = new Map();
+        for (const repository of this.getGitHubRepositories()){
+            const contents = await this.fetchGitHub(`/repos/${repository.owner}/${repository.name}/contents/skills`);
+            for (const item of contents)if ("dir" === item.type) try {
+                const metadata = await this.getGitHubSkillMetadata(item.name, repository);
+                if (mergedSkills.has(item.name)) mergedSkills.delete(item.name);
+                mergedSkills.set(item.name, {
+                    name: item.name,
+                    description: metadata.description || "No description",
+                    path: item.path,
+                    metadata
+                });
+            } catch (error) {
+                logger.warn(`Could not read skill ${item.name} from ${repository.owner}/${repository.name}`, error instanceof Error ? error.message : String(error));
+            }
+        }
+        return [
+            ...mergedSkills.values()
+        ];
+    }
+    getGitHubRepositories() {
+        if (this.repositories.length > 0) return this.repositories;
+        throw new Error("No GitHub skill repositories configured. Set skills.repositories or the legacy skills.repositoryOwner + skills.repositoryName fields.");
     }
     constructor(options = {}){
         _define_property(this, "githubBaseUrl", "https://api.github.com");
-        _define_property(this, "owner", void 0);
-        _define_property(this, "repo", void 0);
+        _define_property(this, "repositories", void 0);
         _define_property(this, "token", void 0);
         _define_property(this, "provider", void 0);
         _define_property(this, "clawhubBaseUrl", void 0);
-        this.provider = options.provider || "github";
-        this.owner = options.repositoryOwner || "anthropics";
-        this.repo = options.repositoryName || "skills";
+        this.provider = options.provider || "hybrid";
+        const normalizedRepositories = (options.repositories || []).map((repository)=>({
+                owner: repository.owner.trim(),
+                name: repository.name.trim()
+            })).filter((repository)=>repository.owner && repository.name);
+        const legacyOwner = options.repositoryOwner?.trim();
+        const legacyName = options.repositoryName?.trim();
+        if (normalizedRepositories.length > 0) this.repositories = normalizedRepositories;
+        else if (legacyOwner && legacyName) this.repositories = [
+            {
+                owner: legacyOwner,
+                name: legacyName
+            }
+        ];
+        else this.repositories = [];
         this.token = options.githubToken || process.env.GITHUB_TOKEN || void 0;
         this.clawhubBaseUrl = (options.clawhubBaseUrl || "https://clawhub.ai").replace(/\/+$/, "");
     }

package/dist/cli/services/skillRepository.d.ts

@@ -4,8 +4,7 @@ import type { SkillInfo, SkillMetadata, SkillRepositoryOptions } from "../types/
  */
 export declare class SkillRepository {
     private readonly githubBaseUrl;
-    private readonly owner;
-    private readonly repo;
+    private readonly repositories;
     private readonly token?;
     private readonly provider;
     private readonly clawhubBaseUrl;
@@ -24,7 +23,10 @@ export declare class SkillRepository {
      * Get skill metadata by fetching and parsing SKILL.md
      */
     getSkillMetadata(skillName: string): Promise<SkillMetadata>;
+    private getGitHubSkillMetadata;
+    private resolveGitHubRepositoryForSkill;
     private getClawhubSkillMetadata;
+    private getHybridSkillMetadata;
     /**
      * Parse SKILL.md content to extract YAML frontmatter
      */
@@ -34,10 +36,13 @@ export declare class SkillRepository {
      */
     downloadSkill(skillName: string): Promise<Map<string, string | Buffer>>;
     private downloadSkillFromClawhub;
+    private downloadHybridSkill;
     /**
      * Recursively download all files in a directory
      */
     private downloadDirectory;
     private listSkillsFromClawhub;
+    private listSkillsFromHybrid;
     private listSkillsFromGitHub;
+    private getGitHubRepositories;
 }