@wingman-ai/gateway 0.4.1 → 0.4.3

package/dist/cli/core/imagePersistence.cjs

@@ -24,6 +24,8 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
+    removeSessionMediaDirectory: ()=>removeSessionMediaDirectory,
+    getSessionMediaDirectory: ()=>getSessionMediaDirectory,
     persistAssistantImagesToDisk: ()=>persistAssistantImagesToDisk,
     parseBase64DataUrl: ()=>parseBase64DataUrl,
     resolveImageExtension: ()=>resolveImageExtension
@@ -34,7 +36,7 @@ const external_node_path_namespaceObject = require("node:path");
 const DATA_URL_BASE64_PATTERN = /^data:([^;,]+);base64,(.+)$/i;
 function persistAssistantImagesToDisk(input) {
     if (!input.messages.length) return;
-    const mediaRoot = (0, external_node_path_namespaceObject.join)((0, external_node_path_namespaceObject.dirname)(input.dbPath), "media", sanitizePathSegment(input.sessionId));
+    const mediaRoot = getSessionMediaDirectory(input.dbPath, input.sessionId);
     for (const message of input.messages)if ("assistant" === message.role) {
         if (Array.isArray(message.attachments) && 0 !== message.attachments.length) for (const attachment of message.attachments){
             if (!attachment || "image" !== attachment.kind) continue;
@@ -66,6 +68,16 @@ function persistAssistantImagesToDisk(input) {
         }
     }
 }
+function getSessionMediaDirectory(dbPath, sessionId) {
+    return (0, external_node_path_namespaceObject.join)((0, external_node_path_namespaceObject.dirname)(dbPath), "media", sanitizePathSegment(sessionId));
+}
+function removeSessionMediaDirectory(dbPath, sessionId) {
+    const mediaDir = getSessionMediaDirectory(dbPath, sessionId);
+    (0, external_node_fs_namespaceObject.rmSync)(mediaDir, {
+        recursive: true,
+        force: true
+    });
+}
 function parseBase64DataUrl(dataUrl) {
     if ("string" != typeof dataUrl) return null;
     const match = dataUrl.match(DATA_URL_BASE64_PATTERN);
@@ -112,12 +124,16 @@ function sanitizePathSegment(value) {
     const sanitized = normalized.replace(/[^a-zA-Z0-9._-]/g, "_");
     return sanitized.slice(0, 120) || "default-session";
 }
+exports.getSessionMediaDirectory = __webpack_exports__.getSessionMediaDirectory;
 exports.parseBase64DataUrl = __webpack_exports__.parseBase64DataUrl;
 exports.persistAssistantImagesToDisk = __webpack_exports__.persistAssistantImagesToDisk;
+exports.removeSessionMediaDirectory = __webpack_exports__.removeSessionMediaDirectory;
 exports.resolveImageExtension = __webpack_exports__.resolveImageExtension;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "getSessionMediaDirectory",
     "parseBase64DataUrl",
     "persistAssistantImagesToDisk",
+    "removeSessionMediaDirectory",
     "resolveImageExtension"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

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

@@ -19,6 +19,8 @@ export declare function persistAssistantImagesToDisk(input: {
     sessionId: string;
     messages: PersistableMessage[];
 }): void;
+export declare function getSessionMediaDirectory(dbPath: string, sessionId: string): string;
+export declare function removeSessionMediaDirectory(dbPath: string, sessionId: string): void;
 export declare function parseBase64DataUrl(dataUrl: string): ParsedDataUrl | null;
 export declare function resolveImageExtension(mimeType: string): string;
 export {};

package/dist/cli/core/imagePersistence.js

@@ -1,10 +1,10 @@
 import { createHash } from "node:crypto";
-import { existsSync, mkdirSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 const DATA_URL_BASE64_PATTERN = /^data:([^;,]+);base64,(.+)$/i;
 function persistAssistantImagesToDisk(input) {
     if (!input.messages.length) return;
-    const mediaRoot = join(dirname(input.dbPath), "media", sanitizePathSegment(input.sessionId));
+    const mediaRoot = getSessionMediaDirectory(input.dbPath, input.sessionId);
     for (const message of input.messages)if ("assistant" === message.role) {
         if (Array.isArray(message.attachments) && 0 !== message.attachments.length) for (const attachment of message.attachments){
             if (!attachment || "image" !== attachment.kind) continue;
@@ -36,6 +36,16 @@ function persistAssistantImagesToDisk(input) {
         }
     }
 }
+function getSessionMediaDirectory(dbPath, sessionId) {
+    return join(dirname(dbPath), "media", sanitizePathSegment(sessionId));
+}
+function removeSessionMediaDirectory(dbPath, sessionId) {
+    const mediaDir = getSessionMediaDirectory(dbPath, sessionId);
+    rmSync(mediaDir, {
+        recursive: true,
+        force: true
+    });
+}
 function parseBase64DataUrl(dataUrl) {
     if ("string" != typeof dataUrl) return null;
     const match = dataUrl.match(DATA_URL_BASE64_PATTERN);
@@ -82,4 +92,4 @@ function sanitizePathSegment(value) {
     const sanitized = normalized.replace(/[^a-zA-Z0-9._-]/g, "_");
     return sanitized.slice(0, 120) || "default-session";
 }
-export { parseBase64DataUrl, persistAssistantImagesToDisk, resolveImageExtension };
+export { getSessionMediaDirectory, parseBase64DataUrl, persistAssistantImagesToDisk, removeSessionMediaDirectory, resolveImageExtension };

package/dist/cli/core/sessionManager.cjs

@@ -227,6 +227,7 @@ class SessionManager {
         writesStmt.run(sessionId);
         const pendingStmt = this.db.prepare("DELETE FROM session_pending_messages WHERE session_id = ?");
         pendingStmt.run(sessionId);
+        (0, external_imagePersistence_cjs_namespaceObject.removeSessionMediaDirectory)(this.dbPath, sessionId);
     }
     clearSessionMessages(sessionId) {
         if (!this.db || !this.checkpointer) throw new Error("SessionManager not initialized");
@@ -242,6 +243,7 @@ class SessionManager {
 	      WHERE id = ?
 	    `);
         sessionStmt.run(Date.now(), sessionId);
+        (0, external_imagePersistence_cjs_namespaceObject.removeSessionMediaDirectory)(this.dbPath, sessionId);
     }
     persistPendingMessage(input) {
         if (!this.db) throw new Error("SessionManager not initialized");

package/dist/cli/core/sessionManager.js

@@ -1,7 +1,7 @@
 import { SqliteSaver } from "@langchain/langgraph-checkpoint-sqlite";
 import { createDeepAgent } from "deepagents";
 import { v4 } from "uuid";
-import { persistAssistantImagesToDisk } from "./imagePersistence.js";
+import { persistAssistantImagesToDisk, removeSessionMediaDirectory } from "./imagePersistence.js";
 function _define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
         value: value,
@@ -194,6 +194,7 @@ class SessionManager {
         writesStmt.run(sessionId);
         const pendingStmt = this.db.prepare("DELETE FROM session_pending_messages WHERE session_id = ?");
         pendingStmt.run(sessionId);
+        removeSessionMediaDirectory(this.dbPath, sessionId);
     }
     clearSessionMessages(sessionId) {
         if (!this.db || !this.checkpointer) throw new Error("SessionManager not initialized");
@@ -209,6 +210,7 @@ class SessionManager {
 	      WHERE id = ?
 	    `);
         sessionStmt.run(Date.now(), sessionId);
+        removeSessionMediaDirectory(this.dbPath, sessionId);
     }
     persistPendingMessage(input) {
         if (!this.db) throw new Error("SessionManager not initialized");

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