@johpaz/hive-skills 1.0.6 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@johpaz/hive-skills",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Hive Skills — Official bundled skills for Hive",
   "main": "./src/index.ts",
   "license": "MIT",
@@ -11,8 +11,7 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@johpaz/hive-core": "^1.0.6",
-    "zod": "latest"
+    "js-yaml": "latest"
   },
   "devDependencies": {
     "typescript": "latest",

package/src/loader.ts

@@ -1,8 +1,35 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import * as yaml from "js-yaml";
-import type { Config } from "../config/loader.ts";
-import { logger } from "../utils/logger.ts";
+
+export interface SkillsConfig {
+  allowBundled?: string[];
+  managedDir?: string;
+  extraDirs?: string[];
+  hotReload?: boolean;
+  maxSkillSizeKB?: number;
+}
+
+export interface Config {
+  skills?: SkillsConfig;
+  workspacePath?: string;
+}
+
+interface Logger {
+  debug: (msg: string, ...args: unknown[]) => void;
+  info: (msg: string, ...args: unknown[]) => void;
+  warn: (msg: string, ...args: unknown[]) => void;
+  error: (msg: string, ...args: unknown[]) => void;
+}
+
+function createLogger(): Logger {
+  return {
+    debug: (msg, ...args) => console.debug(`[skills] ${msg}`, ...args),
+    info: (msg, ...args) => console.info(`[skills] ${msg}`, ...args),
+    warn: (msg, ...args) => console.warn(`[skills] ${msg}`, ...args),
+    error: (msg, ...args) => console.error(`[skills] ${msg}`, ...args),
+  };
+}
 
 export interface SkillMetadata {
   name: string;
@@ -30,6 +57,7 @@ export interface Skill {
   name: string;
   description: string;
   content: string;
+  raw: string;
   metadata: SkillMetadata["metadata"];
   source: "bundled" | "managed" | "workspace";
   path: string;
@@ -37,7 +65,7 @@ export interface Skill {
 
 function parseFrontmatter(content: string): { frontmatter: Record<string, unknown>; body: string } {
   const match = content.match(/^---\n([\s\S]*?)\n---\n([\s\S]*)$/);
-  
+
   if (!match) {
     return { frontmatter: {}, body: content };
   }
@@ -53,11 +81,14 @@ function parseFrontmatter(content: string): { frontmatter: Record<string, unknow
 
 export class SkillLoader {
   private config: Config;
-  private log = logger.child("skills");
+  private log: Logger;
   private cache: Map<string, Skill> = new Map();
+  private bundledDir: string;
 
   constructor(config: Config) {
     this.config = config;
+    this.log = createLogger();
+    this.bundledDir = path.join(__dirname, "bundled");
   }
 
   private expandPath(p: string): string {
@@ -70,7 +101,7 @@ export class SkillLoader {
   loadSkill(skillPath: string, source: Skill["source"]): Skill | null {
     try {
       const skillMdPath = path.join(skillPath, "SKILL.md");
-      
+
       if (!fs.existsSync(skillMdPath)) {
         return null;
       }
@@ -86,6 +117,7 @@ export class SkillLoader {
         name,
         description,
         content: body,
+        raw: content,
         metadata,
         source,
         path: skillPath,
@@ -99,9 +131,41 @@ export class SkillLoader {
     }
   }
 
+  loadBundledSkills(): Skill[] {
+    const skills: Map<string, Skill> = new Map();
+
+    if (!fs.existsSync(this.bundledDir)) {
+      this.log.debug(`Bundled skills directory not found: ${this.bundledDir}`);
+      return [];
+    }
+
+    for (const entry of fs.readdirSync(this.bundledDir, { withFileTypes: true })) {
+      if (entry.isDirectory()) {
+        const skill = this.loadSkill(path.join(this.bundledDir, entry.name), "bundled");
+        if (skill) {
+          skills.set(skill.name, skill);
+        }
+      }
+    }
+
+    this.log.debug(`Loaded ${skills.size} bundled skills`);
+    return Array.from(skills.values());
+  }
+
   loadAllSkills(): Skill[] {
     const skills: Map<string, Skill> = new Map();
+    const allowBundled = this.config.skills?.allowBundled;
+
+    // 1. Load bundled skills (lowest priority)
+    const bundledSkills = this.loadBundledSkills();
+    for (const skill of bundledSkills) {
+      // If allowBundled is undefined, empty, or contains the skill name, include it
+      if (!allowBundled || allowBundled.length === 0 || allowBundled.includes(skill.name)) {
+        skills.set(skill.name, skill);
+      }
+    }
 
+    // 2. Load managed skills (medium priority)
     const managedDir = this.expandPath(this.config.skills?.managedDir ?? "~/.hive/skills");
     if (fs.existsSync(managedDir)) {
       for (const entry of fs.readdirSync(managedDir, { withFileTypes: true })) {
@@ -114,11 +178,29 @@ export class SkillLoader {
       }
     }
 
-    const workspaceDir = "workspace/skills";
-    if (fs.existsSync(workspaceDir)) {
-      for (const entry of fs.readdirSync(workspaceDir, { withFileTypes: true })) {
+    // 3. Load extra directories
+    const extraDirs = this.config.skills?.extraDirs ?? [];
+    for (const extraDir of extraDirs) {
+      const expandedDir = this.expandPath(extraDir);
+      if (fs.existsSync(expandedDir)) {
+        for (const entry of fs.readdirSync(expandedDir, { withFileTypes: true })) {
+          if (entry.isDirectory()) {
+            const skill = this.loadSkill(path.join(expandedDir, entry.name), "managed");
+            if (skill) {
+              skills.set(skill.name, skill);
+            }
+          }
+        }
+      }
+    }
+
+    // 4. Load workspace skills (highest priority)
+    const workspacePath = this.config.workspacePath ?? process.cwd();
+    const workspaceSkillsDir = path.join(workspacePath, "skills");
+    if (fs.existsSync(workspaceSkillsDir)) {
+      for (const entry of fs.readdirSync(workspaceSkillsDir, { withFileTypes: true })) {
         if (entry.isDirectory()) {
-          const skill = this.loadSkill(path.join(workspaceDir, entry.name), "workspace");
+          const skill = this.loadSkill(path.join(workspaceSkillsDir, entry.name), "workspace");
           if (skill) {
             skills.set(skill.name, skill);
           }
@@ -126,6 +208,7 @@ export class SkillLoader {
       }
     }
 
+    this.log.info(`Loaded ${skills.size} total skills`);
     return Array.from(skills.values());
   }
 
@@ -133,6 +216,10 @@ export class SkillLoader {
     return this.cache.get(name);
   }
 
+  listSkills(): string[] {
+    return Array.from(this.cache.keys());
+  }
+
   clearCache(): void {
     this.cache.clear();
   }
@@ -141,3 +228,18 @@ export class SkillLoader {
 export function createSkillLoader(config: Config): SkillLoader {
   return new SkillLoader(config);
 }
+
+// Export all bundled skill names for convenience
+export const BUNDLED_SKILL_NAMES = [
+  "web_search",
+  "shell",
+  "file_manager",
+  "http_client",
+  "memory",
+  "cron_manager",
+  "system_notify",
+  "browser_automation",
+  "context_compact",
+] as const;
+
+export type BundledSkillName = typeof BUNDLED_SKILL_NAMES[number];