@chakresh/kresh 0.1.1 → 0.1.3

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@chakresh/kresh",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "bin": {
     "kresh": "./src/index.js"
   },
   "type": "module",
   "dependencies": {
-    "commander": "^11.1.0",
+    "@chakresh/kresh": "^0.1.2",
     "axios": "^1.6.8",
     "chalk": "^5.3.0",
-    "ora": "^8.0.1",
-    "inquirer": "^9.2.16"
+    "commander": "^11.1.0",
+    "inquirer": "^9.2.16",
+    "ora": "^8.0.1"
   },
   "publishConfig": {
     "access": "public"

package/src/commands/search.js

@@ -24,6 +24,7 @@ export async function searchSkills(query) {
       if (skill.description) {
         console.log(`   ${skill.description}`);
       }
+      console.log(`   ${logger.dim('Install:')} kresh install ${skill.slug}`);
       console.log();
     });
   } catch (error) {

package/src/services/filesystem.js

@@ -2,13 +2,59 @@ import fs from 'fs/promises';
 import path from 'path';
 
 /**
- * Writes the SKILL.md and metadata.json files directly in a folder named after the skill's slug inside the skills folder.
+ * Helper to find the workspace or project root directory by scanning up.
+ */
+async function getWorkspaceRoot(startDir = process.cwd()) {
+  let currentDir = startDir;
+  while (true) {
+    try {
+      const hasPackageJson = await fs.access(path.join(currentDir, 'package.json')).then(() => true).catch(() => false);
+      const isKreshRoot = await fs.access(path.join(currentDir, 'next.config.mjs')).then(() => true).catch(() => false);
+      
+      if (hasPackageJson && isKreshRoot) {
+        return currentDir;
+      }
+    } catch (e) {
+      // Ignore
+    }
+
+    const parentDir = path.dirname(currentDir);
+    if (parentDir === currentDir) {
+      break;
+    }
+    currentDir = parentDir;
+  }
+  
+  // Secondary check: look for any package.json up the tree
+  currentDir = startDir;
+  while (true) {
+    try {
+      const hasPackageJson = await fs.access(path.join(currentDir, 'package.json')).then(() => true).catch(() => false);
+      if (hasPackageJson) {
+        return currentDir;
+      }
+    } catch (e) {
+      // Ignore
+    }
+    const parentDir = path.dirname(currentDir);
+    if (parentDir === currentDir) {
+      break;
+    }
+    currentDir = parentDir;
+  }
+
+  return startDir;
+}
+
+/**
+ * Writes the SKILL.md and metadata.json files directly in a folder named after the skill's slug (excluding @owner scope folder) inside the skills folder.
  */
 export async function writeLocalSkill(slug, skillContent, metadata) {
   try {
-    // Sanitize folder name, use slug
-    const folderName = slug || metadata.slug;
-    const targetDir = path.join(process.cwd(), 'skills', folderName);
+    const rootDir = await getWorkspaceRoot();
+    const folderName = (slug || metadata.slug).split('/').pop();
+    const targetDir = path.join(rootDir, 'skills', folderName);
+    
     await fs.mkdir(targetDir, { recursive: true });
     await fs.writeFile(path.join(targetDir, 'SKILL.md'), skillContent, 'utf8');
     await fs.writeFile(path.join(targetDir, 'metadata.json'), JSON.stringify(metadata, null, 2), 'utf8');
@@ -24,11 +70,21 @@ export async function writeLocalSkill(slug, skillContent, metadata) {
  */
 export async function readLocalSkillMetadata(slug) {
   try {
-    const metadataPath = path.join(process.cwd(), 'skills', slug, 'metadata.json');
+    const rootDir = await getWorkspaceRoot();
+    const folderName = slug.split('/').pop();
+    const metadataPath = path.join(rootDir, 'skills', folderName, 'metadata.json');
     const data = await fs.readFile(metadataPath, 'utf8');
     return JSON.parse(data);
   } catch (error) {
-    return null;
+    // Also try legacy path for backwards compatibility
+    try {
+      const rootDir = await getWorkspaceRoot();
+      const legacyPath = path.join(rootDir, 'skills', slug, 'metadata.json');
+      const data = await fs.readFile(legacyPath, 'utf8');
+      return JSON.parse(data);
+    } catch (e) {
+      return null;
+    }
   }
 }
 
@@ -37,8 +93,28 @@ export async function readLocalSkillMetadata(slug) {
  */
 export async function removeLocalSkill(slug) {
   try {
-    const targetDir = path.join(process.cwd(), 'skills', slug);
+    const rootDir = await getWorkspaceRoot();
+    const folderName = slug.split('/').pop();
+    const targetDir = path.join(rootDir, 'skills', folderName);
     await fs.rm(targetDir, { recursive: true, force: true });
+    
+    // Also clean up legacy directory if it exists
+    const legacyDir = path.join(rootDir, 'skills', slug);
+    await fs.rm(legacyDir, { recursive: true, force: true });
+    
+    // Clean up empty parent directory (e.g. @username) if it becomes empty
+    if (slug.includes('/')) {
+      const parts = slug.split('/');
+      const parentDir = path.join(rootDir, 'skills', parts[0]);
+      try {
+        const files = await fs.readdir(parentDir);
+        if (files.length === 0) {
+          await fs.rmdir(parentDir);
+        }
+      } catch (e) {
+        // Ignore
+      }
+    }
     return true;
   } catch (error) {
     console.error('Failed to remove skill files from the skills directory:', error);
@@ -51,7 +127,8 @@ export async function removeLocalSkill(slug) {
  */
 export async function listLocalSkills() {
   try {
-    const skillsDir = path.join(process.cwd(), 'skills');
+    const rootDir = await getWorkspaceRoot();
+    const skillsDir = path.join(rootDir, 'skills');
     let entries = [];
     try {
       entries = await fs.readdir(skillsDir, { withFileTypes: true });
@@ -63,15 +140,49 @@ export async function listLocalSkills() {
     const skills = [];
     for (const entry of entries) {
       if (entry.isDirectory()) {
-        const metadata = await readLocalSkillMetadata(entry.name);
-        if (metadata) {
-          skills.push({
-            slug: metadata.slug || entry.name,
-            installed: true,
-            version: metadata.version || metadata.currentVersion || 'unknown',
-            name: metadata.name || 'unknown',
-            description: metadata.description || ''
-          });
+        if (entry.name.startsWith('@')) {
+          // Legacy support: It's a user scope directory, scan subdirectories inside it
+          const scopeDir = path.join(skillsDir, entry.name);
+          let subEntries = [];
+          try {
+            subEntries = await fs.readdir(scopeDir, { withFileTypes: true });
+          } catch (e) {
+            continue;
+          }
+          
+          for (const subEntry of subEntries) {
+            if (subEntry.isDirectory()) {
+              const scopedSlug = `${entry.name}/${subEntry.name}`;
+              const metadata = await readLocalSkillMetadata(scopedSlug);
+              if (metadata) {
+                skills.push({
+                  slug: metadata.slug || scopedSlug,
+                  installed: true,
+                  version: metadata.version || metadata.currentVersion || 'unknown',
+                  name: metadata.name || 'unknown',
+                  description: metadata.description || ''
+                });
+              }
+            }
+          }
+        } else {
+          // New format: Directly under skills/
+          try {
+            const metadataPath = path.join(skillsDir, entry.name, 'metadata.json');
+            const data = await fs.readFile(metadataPath, 'utf8');
+            const metadata = JSON.parse(data);
+            if (metadata) {
+              skills.push({
+                slug: metadata.slug || entry.name,
+                installed: true,
+                version: metadata.version || metadata.currentVersion || 'unknown',
+                name: metadata.name || 'unknown',
+                description: metadata.description || ''
+              });
+            }
+          } catch (e) {
+            // Ignore if metadata is invalid/missing
+          }
         }
       }
     }