@ghl-ai/aw 0.1.57 → 0.1.58

package/link.mjs

@@ -11,11 +11,29 @@ function forceSymlink(target, linkPath) {
   symlinkSync(target, linkPath);
 }
 
+function linkNestedSkillRoot(target, linkPath, { silent }) {
+  try {
+    forceSymlink(target, linkPath);
+    return true;
+  } catch (error) {
+    if (!silent) {
+      const message = error instanceof Error ? error.message : String(error);
+      throw new Error(`Could not link nested skill ${linkPath} -> ${target}: ${message}`);
+    }
+    return false;
+  }
+}
+
 const IDE_DIRS = ['.claude', '.cursor', '.codex'];
 // Per-file symlink types
 const FILE_TYPES = ['agents'];
 const ALL_KNOWN_TYPES = new Set([...FILE_TYPES, 'skills', 'commands', 'evals', 'references', 'docs']);
 
+function realHomeDir() {
+  const HOME = homedir();
+  try { return realpathSync(HOME); } catch { return HOME; }
+}
+
 /**
  * List namespace directories inside .aw_registry/ (skip dotfiles).
  */
@@ -36,6 +54,32 @@ function listDirs(dir) {
     .map(d => d.name);
 }
 
+/**
+ * Recursively find directories below a skills/ folder that are real skill roots.
+ * A real skill root is a directory containing SKILL.md. Once found, do not
+ * descend further so bundled references/scripts inside that skill are preserved.
+ */
+function findSkillRootDirs(skillsDir) {
+  const results = [];
+  function walk(dir, segments) {
+    if (!existsSync(dir)) return;
+    for (const entry of readdirSync(dir, { withFileTypes: true })) {
+      if (!entry.isDirectory() || entry.name.startsWith('.')) continue;
+
+      const childDir = join(dir, entry.name);
+      const childSegments = [...segments, entry.name];
+      if (existsSync(join(childDir, 'SKILL.md'))) {
+        results.push({ skillDirPath: childDir, segments: childSegments });
+        continue;
+      }
+
+      walk(childDir, childSegments);
+    }
+  }
+  walk(skillsDir, []);
+  return results;
+}
+
 /**
  * Recursively find directories named `typeName` within `nsDir`,
  * skipping other known type directories to avoid false matches.
@@ -77,7 +121,7 @@ function cleanIdeSymlinks(cwd) {
     cleanSymlinksRecursive(ideDir);
   }
   // Also clean .agents/skills/ (global only — Codex reads from ~/.agents/skills/)
-  const HOME = homedir();
+  const HOME = realHomeDir();
   if (cwd === HOME) {
     const agentsSkillsDir = join(cwd, '.agents', 'skills');
     if (existsSync(agentsSkillsDir)) cleanSymlinksRecursive(agentsSkillsDir);
@@ -140,7 +184,8 @@ export function linkWorkspace(cwd, awDirOverride = null, { silent = false } = {}
   // where $HOME may be /var/... but process.cwd() resolves to /private/var/...
   try { cwd = realpathSync(cwd); } catch { /* use as-is */ }
 
-  const GLOBAL_AW_DIR = join(homedir(), '.aw_registry');
+  const HOME = realHomeDir();
+  const GLOBAL_AW_DIR = join(HOME, '.aw_registry');
   let awDir = awDirOverride || getLocalRegistryDir(cwd, GLOBAL_AW_DIR);
   try { awDir = realpathSync(awDir); } catch { /* use as-is if it doesn't exist */ }
   if (!existsSync(awDir)) return 0;
@@ -185,6 +230,19 @@ export function linkWorkspace(cwd, awDirOverride = null, { silent = false } = {}
           try { forceSymlink(relTarget, linkPath); created++; } catch { /* best effort */ }
         }
       }
+
+      for (const { skillDirPath, segments: skillSegments } of findSkillRootDirs(skillsDir)) {
+        if (skillSegments.length <= 1) continue;
+        const flat = [ns, ...segments, ...skillSegments].join('-');
+
+        for (const ide of IDE_DIRS) {
+          const linkDir = join(cwd, ide, 'skills');
+          mkdirSync(linkDir, { recursive: true });
+          const linkPath = join(linkDir, flat);
+          const relTarget = relative(linkDir, skillDirPath);
+          if (linkNestedSkillRoot(relTarget, linkPath, { silent })) created++;
+        }
+      }
     }
   }
 
@@ -246,7 +304,7 @@ export function linkWorkspace(cwd, awDirOverride = null, { silent = false } = {}
   }
 
   // Codex per-skill symlinks: ~/.agents/skills/<name> (global only)
-  if (cwd === homedir()) {
+  if (cwd === HOME) {
     const agentsSkillsDir = join(cwd, '.agents/skills');
     for (const ns of namespaces) {
       for (const { typeDirPath: skillsDir, segments } of findNestedTypeDirs(join(awDir, ns), 'skills')) {
@@ -258,6 +316,14 @@ export function linkWorkspace(cwd, awDirOverride = null, { silent = false } = {}
           const relTarget = relative(agentsSkillsDir, targetPath);
           try { forceSymlink(relTarget, linkPath); created++; } catch { /* best effort */ }
         }
+
+        for (const { skillDirPath, segments: skillSegments } of findSkillRootDirs(skillsDir)) {
+          if (skillSegments.length <= 1) continue;
+          const flat = [ns, ...segments, ...skillSegments].join('-');
+          const linkPath = join(agentsSkillsDir, flat);
+          const relTarget = relative(agentsSkillsDir, skillDirPath);
+          if (linkNestedSkillRoot(relTarget, linkPath, { silent })) created++;
+        }
       }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ghl-ai/aw",
-  "version": "0.1.57",
+  "version": "0.1.58",
   "description": "Agentic Workspace CLI — pull, push & manage agents, skills and commands from the registry",
   "type": "module",
   "bin": {