aawp-ai 1.6.4 → 1.6.5

package/bin/install.js

@@ -34,24 +34,22 @@ function dirExists(p) {
   try { return fs.statSync(p).isDirectory(); } catch { return false; }
 }
 
-// ── Install to a directory ────────────────────────────────────────────────────
+// ── Git clone / pull ──────────────────────────────────────────────────────────
 function install(dest) {
   const absDest = path.resolve(dest);
 
-  // Already installed — pull latest
   if (dirExists(path.join(absDest, '.git'))) {
     info('Updating existing install...');
     const r = spawnSync('git', ['-C', absDest, 'pull', '--ff-only'], { stdio: 'inherit' });
     if (r.status !== 0) { warn('git pull failed'); return false; }
   } else {
-    // Fresh clone
     if (dirExists(absDest)) fs.rmSync(absDest, { recursive: true, force: true });
     fs.mkdirSync(path.dirname(absDest), { recursive: true });
     const r = spawnSync('git', ['clone', '--depth', '1', REPO_URL, absDest], { stdio: 'inherit' });
     if (r.status !== 0) { fail('git clone failed'); return false; }
   }
 
-  // Run bootstrap (downloads binary if missing)
+  // Bootstrap (download binary if missing)
   const bootstrap = path.join(absDest, 'scripts', 'bootstrap.sh');
   if (fs.existsSync(bootstrap)) {
     const r = spawnSync('bash', [bootstrap], { stdio: 'inherit', cwd: absDest });
@@ -61,33 +59,40 @@ function install(dest) {
   return true;
 }
 
-// ── Detect best install location ──────────────────────────────────────────────
+// ── Detect install location (same conventions as clawhub / each AI client) ───
 function detectInstallDir() {
-  // OpenClaw workspace — look for clawd/skills or skills/ in common locations
-  const clawdSkills = [
-    path.join(HOME, 'clawd', 'skills'),
-    path.join(HOME, '.openclaw', 'workspace', 'skills'),
-  ];
-  for (const d of clawdSkills) {
-    if (dirExists(d)) return { dir: path.join(d, SKILL_NAME), client: 'OpenClaw' };
-  }
-  if (hasCmd('openclaw') || hasCmd('clawhub')) {
-    return { dir: path.join(HOME, 'clawd', 'skills', SKILL_NAME), client: 'OpenClaw' };
+  // 1. OpenClaw: ~/.openclaw/workspace/skills/ (new default), or cwd/skills/ (legacy/custom)
+  if (hasCmd('openclaw')) {
+    const ocSkills = path.join(HOME, '.openclaw', 'workspace', 'skills');
+    const cwdSkills = path.join(process.cwd(), 'skills');
+    // Prefer ~/.openclaw/workspace/skills if the workspace exists
+    if (dirExists(path.join(HOME, '.openclaw', 'workspace'))) {
+      return { dir: path.join(ocSkills, SKILL_NAME), client: 'OpenClaw' };
+    }
+    if (dirExists(cwdSkills)) {
+      return { dir: path.join(cwdSkills, SKILL_NAME), client: 'OpenClaw' };
+    }
+    // OpenClaw detected but no workspace yet — use default
+    return { dir: path.join(ocSkills, SKILL_NAME), client: 'OpenClaw' };
   }
 
-  // Other AI clients
+  // 2. Known AI clients — each has a standard skills directory
   const clients = [
-    { name: 'Cursor',      dir: path.join(HOME, '.cursor', 'skills'),                   detect: () => hasCmd('cursor') || dirExists(path.join(HOME, '.cursor')) },
-    { name: 'Claude Code', dir: path.join(HOME, '.claude', 'skills'),                    detect: () => hasCmd('claude') || dirExists(path.join(HOME, '.claude')) },
-    { name: 'Gemini CLI',  dir: path.join(HOME, '.gemini', 'skills'),                    detect: () => hasCmd('gemini') || dirExists(path.join(HOME, '.gemini')) },
-    { name: 'OpenCode',    dir: path.join(HOME, '.config', 'opencode', 'skills'),        detect: () => hasCmd('opencode') || dirExists(path.join(HOME, '.config', 'opencode')) },
-    { name: 'Goose',       dir: path.join(HOME, '.config', 'goose', 'skills'),           detect: () => hasCmd('goose') || dirExists(path.join(HOME, '.config', 'goose')) },
+    { name: 'Cursor',      detect: () => hasCmd('cursor')   || dirExists(path.join(HOME, '.cursor')),                         dirs: [path.join(HOME, '.cursor', 'skills')] },
+    { name: 'Claude Code', detect: () => hasCmd('claude') || dirExists(path.join(HOME, '.claude')),                            dirs: [path.join(HOME, '.claude', 'skills')] },
+    { name: 'Gemini CLI',  detect: () => hasCmd('gemini') || dirExists(path.join(HOME, '.gemini')),                            dirs: [path.join(HOME, '.gemini', 'skills')] },
+    { name: 'Windsurf',    detect: () => hasCmd('windsurf') || dirExists(path.join(HOME, '.windsurf')),                        dirs: [path.join(HOME, '.windsurf', 'skills')] },
+    { name: 'OpenCode',    detect: () => hasCmd('opencode') || dirExists(path.join(HOME, '.config', 'opencode')),              dirs: [path.join(HOME, '.config', 'opencode', 'skills')] },
+    { name: 'Goose',       detect: () => hasCmd('goose') || dirExists(path.join(HOME, '.config', 'goose')),                    dirs: [path.join(HOME, '.config', 'goose', 'skills')] },
   ];
+
   for (const c of clients) {
-    if (c.detect()) return { dir: path.join(c.dir, SKILL_NAME), client: c.name };
+    if (c.detect()) {
+      return { dir: path.join(c.dirs[0], SKILL_NAME), client: c.name };
+    }
   }
 
-  // Fallback: universal
+  // 3. Fallback: universal agentskills.io convention
   return { dir: path.join(HOME, '.agents', 'skills', SKILL_NAME), client: null };
 }
 
@@ -106,9 +111,7 @@ function main() {
   const { dir, client } = detectInstallDir();
   const shortDir = dir.replace(HOME, '~');
 
-  if (client) {
-    info(`Detected ${client}`);
-  }
+  if (client) info(`Detected ${client}`);
   info(`Installing to ${shortDir}`);
   console.log('');
 
@@ -121,7 +124,7 @@ function main() {
   } else {
     console.log('');
     fail('Installation failed.');
-    console.log(`  ${dim('Try manually: git clone https://github.com/aawp-ai/aawp.git ' + shortDir)}`);
+    console.log(`  ${dim('Try: git clone ' + REPO_URL + ' ' + shortDir)}`);
   }
   console.log('');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aawp-ai",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "description": "Install the AAWP skill for any Agent Skills compatible AI client",
   "keywords": [
     "aawp",