aawp-ai 1.6.0 → 1.6.2

package/bin/install.js

@@ -8,7 +8,8 @@ const { execSync, spawnSync } = require('child_process');
 
 const VERSION    = require('../package.json').version;
 const SKILL_NAME = 'aawp';
-const RAW_BASE   = 'https://raw.githubusercontent.com/aawp-ai/aawp/main/skills/aawp';
+const REPO_URL   = 'https://github.com/aawp-ai/aawp.git';
+const RAW_BASE   = 'https://raw.githubusercontent.com/aawp-ai/aawp/main';
 const FALLBACK   = 'https://aawp.ai/skill';
 
 // ── ANSI colors ───────────────────────────────────────────────────────────────
@@ -26,96 +27,82 @@ const success = s => console.log(`  ${green('✓')} ${s}`);
 const warn    = s => console.log(`  ${yellow('!')} ${s}`);
 const fail    = s => console.log(`  ${red('✗')} ${s}`);
 
-// ── Fetch helper ──────────────────────────────────────────────────────────────
-async function fetchText(url) {
+// ── Helpers ───────────────────────────────────────────────────────────────────
+const HOME = os.homedir();
+
+function hasCmd(cmd) {
+  try { execSync(`command -v ${cmd}`, { stdio: 'ignore' }); return true; } catch { return false; }
+}
+function dirExists(p) {
+  try { return fs.statSync(p).isDirectory(); } catch { return false; }
+}
+function hasGit() { return hasCmd('git'); }
+
+async function fetchBuffer(url) {
   if (typeof fetch !== 'undefined') {
     const res = await fetch(url);
     if (!res.ok) throw new Error(`HTTP ${res.status}`);
-    return res.text();
+    return Buffer.from(await res.arrayBuffer());
   }
   return new Promise((resolve, reject) => {
     const proto = url.startsWith('https') ? require('https') : require('http');
     proto.get(url, res => {
       if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
-        return fetchText(res.headers.location).then(resolve).catch(reject);
+        return fetchBuffer(res.headers.location).then(resolve).catch(reject);
       }
-      if (res.statusCode !== 200) return reject(new Error(`HTTP ${res.statusCode}`));
+      if (res.statusCode !== 200) return reject(new Error(`HTTP ${res.status}`));
       const chunks = [];
       res.on('data', c => chunks.push(c));
-      res.on('end', () => resolve(Buffer.concat(chunks).toString()));
+      res.on('end', () => resolve(Buffer.concat(chunks)));
       res.on('error', reject);
     }).on('error', reject);
   });
 }
 
-async function downloadSkillMd() {
+// ── Git clone (full install) ──────────────────────────────────────────────────
+function gitClone(dest) {
+  if (dirExists(dest) && dirExists(path.join(dest, '.git'))) {
+    info('Existing install found — pulling latest...');
+    const r = spawnSync('git', ['-C', dest, 'pull', '--ff-only'], { stdio: 'inherit' });
+    return r.status === 0;
+  }
+  if (dirExists(dest)) {
+    // Directory exists but not a git repo — remove and re-clone
+    warn(`${dest} exists but is not a git repo — replacing...`);
+    fs.rmSync(dest, { recursive: true, force: true });
+  }
+  fs.mkdirSync(path.dirname(dest), { recursive: true });
+  const r = spawnSync('git', ['clone', '--depth', '1', REPO_URL, dest], { stdio: 'inherit' });
+  return r.status === 0;
+}
+
+// ── Manifest-only fallback (no git) ──────────────────────────────────────────
+async function manifestFallback(dest) {
+  info('git not available — installing SKILL.md manifest only');
+  warn('Full functionality requires git. Install git and re-run: npx aawp-ai');
+  fs.mkdirSync(dest, { recursive: true });
   try {
-    return await fetchText(`${RAW_BASE}/SKILL.md`);
+    const md = await fetchBuffer(`${RAW_BASE}/SKILL.md`);
+    fs.writeFileSync(path.join(dest, 'SKILL.md'), md);
   } catch {
-    return fetchText(`${FALLBACK}/SKILL.md`);
+    const md = await fetchBuffer(`${FALLBACK}/SKILL.md`);
+    fs.writeFileSync(path.join(dest, 'SKILL.md'), md);
   }
+  return true;
 }
 
 // ── Client detection ──────────────────────────────────────────────────────────
-const HOME = os.homedir();
-
-function hasCmd(cmd) {
-  try { execSync(`command -v ${cmd}`, { stdio: 'ignore' }); return true; } catch { return false; }
-}
-function dirExists(p) {
-  try { return fs.statSync(p).isDirectory(); } catch { return false; }
-}
-
 const CLIENTS = [
-  {
-    name: 'OpenClaw',
-    detect: () => hasCmd('clawhub') || dirExists('skills'),
-    install: async () => {
-      if (!hasCmd('git')) return false;
-      const dest = path.join('skills', SKILL_NAME);
-      if (dirExists(dest)) { warn(`${dest} already exists — skipping git clone`); return true; }
-      const r = spawnSync('git', ['clone', '--depth', '1', 'https://github.com/aawp-ai/aawp.git', dest], { stdio: 'inherit' });
-      return r.status === 0;
-    },
-    skillDir: null,
-  },
-  {
-    name: 'Cursor',
-    detect: () => hasCmd('cursor') || dirExists(path.join(HOME, '.cursor')),
-    skillDir: path.join(HOME, '.cursor', 'skills'),
-  },
-  {
-    name: 'Claude Code',
-    detect: () => hasCmd('claude') || dirExists(path.join(HOME, '.claude')),
-    skillDir: path.join(HOME, '.claude', 'skills'),
-  },
-  {
-    name: 'Gemini CLI',
-    detect: () => hasCmd('gemini') || dirExists(path.join(HOME, '.gemini')),
-    skillDir: path.join(HOME, '.gemini', 'skills'),
-  },
-  {
-    name: 'OpenCode',
-    detect: () => hasCmd('opencode') || dirExists(path.join(HOME, '.config', 'opencode')),
-    skillDir: path.join(HOME, '.config', 'opencode', 'skills'),
-  },
-  {
-    name: 'Goose',
-    detect: () => hasCmd('goose') || dirExists(path.join(HOME, '.config', 'goose')),
-    skillDir: path.join(HOME, '.config', 'goose', 'skills'),
-  },
+  { name: 'OpenClaw',   detect: () => hasCmd('clawhub') || hasCmd('openclaw') || dirExists('skills'), skillDir: 'skills' },
+  { name: 'Cursor',     detect: () => hasCmd('cursor') || dirExists(path.join(HOME, '.cursor')),      skillDir: path.join(HOME, '.cursor', 'skills') },
+  { name: 'Claude Code',detect: () => hasCmd('claude') || dirExists(path.join(HOME, '.claude')),      skillDir: path.join(HOME, '.claude', 'skills') },
+  { name: 'Gemini CLI', detect: () => hasCmd('gemini') || dirExists(path.join(HOME, '.gemini')),      skillDir: path.join(HOME, '.gemini', 'skills') },
+  { name: 'OpenCode',   detect: () => hasCmd('opencode') || dirExists(path.join(HOME, '.config', 'opencode')), skillDir: path.join(HOME, '.config', 'opencode', 'skills') },
+  { name: 'Goose',      detect: () => hasCmd('goose') || dirExists(path.join(HOME, '.config', 'goose')),       skillDir: path.join(HOME, '.config', 'goose', 'skills') },
 ];
 
 const UNIVERSAL_DIR = path.join(HOME, '.agents', 'skills');
 
-// ── Install to dir ────────────────────────────────────────────────────────────
-function installToDir(baseDir, skillMd) {
-  const dest = path.join(baseDir, SKILL_NAME);
-  fs.mkdirSync(dest, { recursive: true });
-  fs.writeFileSync(path.join(dest, 'SKILL.md'), skillMd, 'utf8');
-  return dest;
-}
-
 // ── Main ──────────────────────────────────────────────────────────────────────
 async function main() {
   console.log('');
@@ -124,78 +111,80 @@ async function main() {
   console.log('');
 
   const detected = CLIENTS.filter(c => c.detect());
-  const detectedNames = detected.map(c => c.name);
+  const git = hasGit();
 
   if (detected.length === 0) {
     info('No AI clients detected — installing to universal ~/.agents/skills/');
   } else {
-    info(`Detected: ${detectedNames.join(', ')}`);
-  }
-  console.log('');
-
-  info('Downloading SKILL.md...');
-  let skillMd;
-  try {
-    skillMd = await downloadSkillMd();
-    success('SKILL.md fetched');
-  } catch (e) {
-    fail(`Failed to download SKILL.md: ${e.message}`);
-    process.exit(1);
+    info(`Detected: ${detected.map(c => c.name).join(', ')}`);
   }
+  if (!git) warn('git not found — will install manifest only (limited functionality)');
   console.log('');
 
-  let count = 0;
-
-  const openclaw = detected.find(c => c.name === 'OpenClaw');
-  if (openclaw) {
-    info('Installing via git clone (OpenClaw)...');
-    try {
-      const ok = await openclaw.install();
-      if (ok) { success('Installed via git clone'); count++; }
-      else { warn('git clone failed — falling back to file install'); }
-    } catch (e) {
-      warn(`git clone error: ${e.message}`);
-    }
-    console.log('');
-  }
-
+  // Collect unique install dirs
   const seenDirs = new Set();
-  const dirsToInstall = [];
+  const targets = [];
 
   for (const client of detected) {
     if (client.skillDir && !seenDirs.has(client.skillDir)) {
       seenDirs.add(client.skillDir);
-      dirsToInstall.push({ dir: client.skillDir, label: client.name });
+      targets.push({ dir: client.skillDir, label: client.name });
     }
   }
-
   if (!seenDirs.has(UNIVERSAL_DIR)) {
-    dirsToInstall.push({ dir: UNIVERSAL_DIR, label: 'universal (~/.agents/skills)' });
+    targets.push({ dir: UNIVERSAL_DIR, label: 'universal' });
   }
 
-  for (const { dir, label } of dirsToInstall) {
-    const shortDir = dir.replace(HOME, '~');
-    info(`Installing to ${shortDir}/aawp/ ${dim('(' + label + ')')}`);
+  let count = 0;
+
+  for (const { dir, label } of targets) {
+    const dest = path.join(dir, SKILL_NAME);
+    const shortDest = dest.replace(HOME, '~');
+    info(`Installing to ${shortDest} ${dim('(' + label + ')')}`);
+
     try {
-      const dest = installToDir(dir, skillMd);
-      success(`Installed → ${dest.replace(HOME, '~')}/SKILL.md`);
-      count++;
+      let ok = false;
+      if (git) {
+        ok = gitClone(dest);
+        if (!ok) {
+          warn('git clone failed — falling back to manifest-only');
+          ok = await manifestFallback(dest);
+        }
+      } else {
+        ok = await manifestFallback(dest);
+      }
+
+      if (ok) {
+        // Run bootstrap if full install (downloads binary if missing)
+        const bootstrap = path.join(dest, 'scripts', 'bootstrap.sh');
+        if (fs.existsSync(bootstrap)) {
+          info('Running bootstrap (downloading binary artifacts)...');
+          const r = spawnSync('bash', [bootstrap], { stdio: 'inherit', cwd: dest });
+          if (r.status === 0) {
+            success('Bootstrap complete — binary verified');
+          } else {
+            warn('Bootstrap had issues — binary may need manual download');
+          }
+        }
+        success(`Installed → ${shortDest}`);
+        count++;
+      }
     } catch (e) {
       fail(`Failed: ${e.message}`);
     }
+    console.log('');
   }
 
-  console.log('');
   if (count > 0) {
     console.log(`  ${bold(green('AAWP skill installed!'))}`);
     console.log('');
     console.log(`  ${dim('Restart your AI client to load the skill.')}`);
-    console.log(`  ${dim('Then ask: "set up my AAWP wallet"')}`);
-    console.log(`  ${dim('Full autonomy (24/7 daemon): git clone https://github.com/aawp-ai/aawp.git skills/aawp')}`);
-    console.log(`  ${dim('Docs: https://aawp.ai  ·  https://github.com/aawp-ai/aawp')}`);
+    console.log(`  ${dim('Then ask your AI: "set up my AAWP wallet"')}`);
+    console.log('');
+    console.log(`  ${dim('Docs: https://aawp.ai  ·  GitHub: https://github.com/aawp-ai/aawp')}`);
   } else {
-    warn('Nothing was installed.');
-    console.log(`  ${dim('Try manually: copy SKILL.md to your client\'s skills directory.')}`);
+    fail('Nothing was installed.');
+    console.log(`  ${dim('Try: git clone https://github.com/aawp-ai/aawp.git ~/.agents/skills/aawp')}`);
   }
   console.log('');
 }

package/package.json

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