myaidev-method 0.3.3 → 0.3.5

package/src/cli/commands/addon.js

@@ -17,7 +17,7 @@ import inquirer from 'inquirer';
 import fs from 'fs-extra';
 import path from 'path';
 import os from 'os';
-import { execSync } from 'child_process';
+
 import matter from 'gray-matter';
 import { isAuthenticated, getAuthToken, getAuthData, authFetch } from '../../lib/auth-helper.js';
 import { validateSkill, generateSlug } from '../../lib/skill-validator.js';
@@ -215,11 +215,12 @@ async function installSkill(name, options) {
       const { location } = await inquirer.prompt([{
         type: 'list',
         name: 'location',
-        message: 'Install location:',
+        message: 'Where do you want to install this skill?',
         choices: [
-          { name: `Project  ${chalk.gray('.claude/skills/')}`, value: 'project' },
-          { name: `Global   ${chalk.gray('~/.claude/skills/')}`, value: 'global' },
+          { name: `Project ${chalk.gray('— .claude/skills/ (this project only)')}`, value: 'project' },
+          { name: `Global  ${chalk.gray('— ~/.claude/skills/ (available everywhere)')}`, value: 'global' },
         ],
+        default: 'project',
       }]);
       targetDir = location === 'project' ? projectSkillsDir() : globalSkillsDir();
     }
@@ -227,17 +228,21 @@ async function installSkill(name, options) {
     const slug = skill.slug || skill.name.toLowerCase().replace(/\s+/g, '-');
     const installPath = path.join(targetDir, slug);
 
-    // Download
+    // Download (request JSON to get supporting files if available)
     const dlSpinner = ora(`Downloading ${chalk.cyan(skill.name)}...`).start();
-    const dlRes = await fetchWithTimeout(`${API_BASE}/${skill.id}/download`);
+    const dlRes = await fetchWithTimeout(`${API_BASE}/${skill.id}/download`, {
+      headers: { 'Accept': 'application/json' },
+    });
     if (!dlRes.ok) throw new Error(`Download failed: ${dlRes.status}`);
 
     // Handle both JSON and raw markdown responses
     const contentType = dlRes.headers.get('content-type') || '';
     let content;
+    let supportingFiles = null;
     if (contentType.includes('application/json')) {
       const dlBody = await dlRes.json();
       content = dlBody.content;
+      supportingFiles = dlBody.supportingFiles || null;
     } else {
       content = await dlRes.text();
     }
@@ -247,10 +252,41 @@ async function installSkill(name, options) {
     await fs.ensureDir(installPath);
     await fs.writeFile(path.join(installPath, 'SKILL.md'), content, 'utf8');
 
+    // Install supporting files (agents, scripts, references, assets)
+    let extraFileCount = 0;
+    if (supportingFiles && typeof supportingFiles === 'object') {
+      for (const [relPath, fileContent] of Object.entries(supportingFiles)) {
+        const filePath = path.join(installPath, relPath);
+        await fs.ensureDir(path.dirname(filePath));
+        await fs.writeFile(filePath, fileContent, 'utf8');
+        extraFileCount++;
+      }
+    }
+
     dlSpinner.succeed(chalk.green(`Installed ${chalk.bold(skill.name)}`));
 
+    // Track installation (non-blocking, best-effort)
+    try {
+      const token = await getAuthToken();
+      if (token) {
+        fetchWithTimeout(`${API_BASE}/${skill.id}/install`, {
+          method: 'POST',
+          headers: {
+            'Authorization': `Bearer ${token}`,
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify({ source: 'cli' }),
+        }).catch(() => {}); // Fire-and-forget
+      }
+    } catch {
+      // Silently ignore tracking failures
+    }
+
     const rel = path.relative(process.cwd(), installPath);
     console.log(chalk.gray(`  → ${rel}/SKILL.md`));
+    if (extraFileCount > 0) {
+      console.log(chalk.gray(`  → ${extraFileCount} supporting file(s) (agents, scripts, etc.)`));
+    }
     console.log(chalk.cyan('\n  Restart Claude Code to load the new skill.\n'));
   } catch (err) {
     if (err.name === 'AbortError') {
@@ -696,26 +732,10 @@ async function scaffoldSkill() {
   return targetDir;
 }
 
-function ghAvailable() {
-  try {
-    execSync('gh auth status', { stdio: 'pipe' });
-    return true;
-  } catch {
-    return false;
-  }
-}
-
 async function submitSkill(opts) {
-  // Step 1: Auth checks
+  // Step 1: Auth check
   if (!(await requireAuth())) return;
 
-  if (!ghAvailable()) {
-    console.log(chalk.red('\n✗ GitHub CLI (gh) is required for submissions.'));
-    console.log(chalk.gray('  Install: https://cli.github.com'));
-    console.log(chalk.gray('  Then: gh auth login\n'));
-    return;
-  }
-
   // Step 2: Detect or scaffold SKILL.md
   let targetPath = opts.dir ? path.resolve(opts.dir) : process.cwd();
   let skillDir = targetPath;
@@ -747,14 +767,13 @@ async function submitSkill(opts) {
 
     const scaffoldedDir = await scaffoldSkill();
     if (!scaffoldedDir) return;
-    // User needs to edit the scaffold first
     return;
   }
 
-  // Step 3: Validate
+  // Step 3: Local validation
   const spinner = ora('Validating skill...').start();
   const result = await validateSkill(skillDir, {
-    checkDuplicates: true,
+    checkDuplicates: false,
     apiBase: API_BASE,
   });
   spinner.stop();
@@ -777,11 +796,11 @@ async function submitSkill(opts) {
   }
 
   // Step 4: Show summary and confirm
-  const slug = result.info.slug;
   console.log(chalk.cyan('\n📤 Submit to MyAIDev Marketplace\n'));
   console.log(`  ${chalk.gray('Name:')}        ${chalk.white.bold(result.info.name)}`);
-  console.log(`  ${chalk.gray('Slug:')}        ${chalk.white(slug)}`);
+  console.log(`  ${chalk.gray('Slug:')}        ${chalk.white(result.info.slug)}`);
   console.log(`  ${chalk.gray('Description:')} ${chalk.white(truncate(result.info.description, 60))}`);
+  console.log(`  ${chalk.gray('Category:')}    ${result.info.category || 'general'}`);
   console.log(`  ${chalk.gray('Sections:')}    ${result.info.sectionCount}`);
   console.log('');
 
@@ -798,116 +817,138 @@ async function submitSkill(opts) {
     }
   }
 
-  // Step 5: Fork, branch, commit, PR
-  const prSpinner = ora('Creating pull request...').start();
-  const tmpDir = path.join(os.tmpdir(), `myaidev-submit-${Date.now()}`);
+  // Step 5: Detect supporting files (agents, scripts, references, assets)
+  const supportingDirs = ['agents', 'scripts', 'references', 'assets', 'evals'];
+  const bundledFiles = {};
+  let hasSupportingFiles = false;
+
+  for (const dir of supportingDirs) {
+    const dirPath = path.join(skillDir, dir);
+    if (await fs.pathExists(dirPath)) {
+      const files = await collectFiles(dirPath, dir);
+      if (files.length > 0) {
+        hasSupportingFiles = true;
+        for (const f of files) {
+          bundledFiles[f.relativePath] = f.content;
+        }
+      }
+    }
+  }
+
+  if (hasSupportingFiles) {
+    const fileCount = Object.keys(bundledFiles).length;
+    console.log(chalk.gray(`  Bundling ${fileCount} supporting file(s) (agents, scripts, etc.)\n`));
+  }
+
+  // Step 6: Submit via API
+  const submitSpinner = ora('Submitting skill for review...').start();
 
   try {
-    // Fork and clone
-    try {
-      execSync(`gh repo fork ${MARKETPLACE_REPO} --clone=false`, { stdio: 'pipe' });
-    } catch {
-      // Fork may already exist, that's fine
-    }
-
-    // Get the user's GitHub username
-    const ghUser = execSync('gh api user --jq .login', { encoding: 'utf8' }).trim();
-
-    // Clone the user's fork
-    execSync(`gh repo clone ${ghUser}/myaidev-marketplace "${tmpDir}" -- --depth 1`, { stdio: 'pipe' });
-
-    // Create branch
-    const branch = `skill/${slug}`;
-    execSync(`git -C "${tmpDir}" checkout -b ${branch}`, { stdio: 'pipe' });
-
-    // Copy skill files
-    const destDir = path.join(tmpDir, 'skills', slug);
-    await fs.ensureDir(destDir);
-    await fs.copy(skillDir, destDir, {
-      filter: (src) => {
-        const ext = path.extname(src).toLowerCase();
-        const base = path.basename(src);
-        // Copy directories and allowed file types
-        if (fs.statSync(src).isDirectory()) return true;
-        return ['.md', '.json', '.yaml', '.yml', '.sh', '.js', '.ts', '.py', '.txt'].includes(ext) || base === '.gitkeep';
-      },
+    const content = await fs.readFile(skillFile, 'utf8');
+
+    const payload = {
+      content,
+      category: result.info.category || undefined,
+    };
+
+    // Include supporting files if present
+    if (hasSupportingFiles) {
+      payload.supportingFiles = bundledFiles;
+    }
+
+    const res = await authFetch(`${API_BASE}/submissions`, {
+      method: 'POST',
+      body: JSON.stringify(payload),
     });
 
-    // Commit
-    execSync(`git -C "${tmpDir}" add skills/${slug}`, { stdio: 'pipe' });
-    execSync(`git -C "${tmpDir}" commit -m "feat: add skill ${result.info.name}"`, { stdio: 'pipe' });
-
-    // Push
-    execSync(`git -C "${tmpDir}" push -u origin ${branch}`, { stdio: 'pipe' });
-
-    // Create PR
-    const prBody = [
-      `## Skill Submission: ${result.info.name}`,
-      '',
-      `**Description**: ${result.info.description || 'N/A'}`,
-      `**Category**: ${result.info.category || 'general'}`,
-      '',
-      '### Checklist',
-      '- [x] SKILL.md has valid YAML frontmatter',
-      '- [x] Passes local validation',
-      '- [ ] Tested locally with Claude Code',
-    ].join('\n');
-
-    const prOutput = execSync(
-      `gh pr create --repo ${MARKETPLACE_REPO} --head ${ghUser}:${branch} --title "feat: add skill ${result.info.name}" --body "${prBody.replace(/"/g, '\\"')}"`,
-      { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }
-    ).trim();
-
-    prSpinner.succeed(chalk.green('Pull request created!'));
-
-    // Extract PR URL from output
-    const prUrl = prOutput.match(/https:\/\/github\.com\S+/)?.[0] || prOutput;
-    console.log(chalk.gray(`  PR: ${prUrl}`));
-
-    // Step 6: Record submission
-    try {
-      await authFetch(`${API_BASE}/submissions`, {
-        method: 'POST',
-        body: JSON.stringify({
-          skillName: result.info.name,
-          slug,
-          description: result.info.description || '',
-          prUrl,
-        }),
-      });
-    } catch {
-      // Non-fatal: submission tracking is optional
+    if (!res.ok) {
+      const body = await res.json().catch(() => ({}));
+      if (body.validation?.errors?.length) {
+        submitSpinner.fail(chalk.red('Server validation failed:'));
+        for (const err of body.validation.errors) {
+          console.log(chalk.red(`  • ${err}`));
+        }
+        return;
+      }
+      throw new Error(body.error || `API error: ${res.status}`);
     }
 
-    console.log(chalk.cyan('\n  Status: awaiting review'));
-    console.log(chalk.gray('  Check: myaidev-method addon status\n'));
+    const body = await res.json();
+    const submission = body.submission;
+
+    submitSpinner.succeed(chalk.green('Skill submitted for review!'));
+
+    console.log('');
+    console.log(`  ${chalk.gray('Submission ID:')} ${chalk.white(submission.id)}`);
+    console.log(`  ${chalk.gray('Status:')}        ${chalk.yellow(submission.status)}`);
+    if (hasSupportingFiles) {
+      console.log(`  ${chalk.gray('Files:')}         ${chalk.white(`SKILL.md + ${Object.keys(bundledFiles).length} supporting files`)}`);
+    }
+    console.log('');
+    console.log(chalk.gray('  AI analysis will run automatically.'));
+    console.log(chalk.gray('  An admin will review and approve your skill.'));
+    console.log(chalk.gray(`  Check status: ${chalk.white('myaidev-method addon status')}\n`));
   } catch (err) {
-    prSpinner.fail(chalk.red(`Submission failed: ${err.message}`));
+    submitSpinner.fail(chalk.red(`Submission failed: ${err.message}`));
     process.exit(1);
-  } finally {
-    // Clean up temp directory
-    await fs.remove(tmpDir).catch(() => {});
   }
 }
 
+/**
+ * Recursively collect files from a directory for bundling.
+ * Skips __pycache__, .pyc, and other artifacts.
+ */
+async function collectFiles(dirPath, prefix) {
+  const results = [];
+  const SKIP_PATTERNS = ['__pycache__', '.pyc', '.DS_Store', 'node_modules'];
+
+  const entries = await fs.readdir(dirPath, { withFileTypes: true });
+  for (const entry of entries) {
+    if (SKIP_PATTERNS.some(p => entry.name.includes(p))) continue;
+
+    const fullPath = path.join(dirPath, entry.name);
+    const relativePath = path.join(prefix, entry.name);
+
+    if (entry.isDirectory()) {
+      const subFiles = await collectFiles(fullPath, relativePath);
+      results.push(...subFiles);
+    } else if (entry.isFile()) {
+      try {
+        const content = await fs.readFile(fullPath, 'utf8');
+        results.push({ relativePath, content });
+      } catch {
+        // Skip binary files
+      }
+    }
+  }
+  return results;
+}
+
 // ── Status Command ─────────────────────────────────────────────────────
 
-async function checkStatus(name) {
+async function checkStatus(nameOrId) {
   if (!(await requireAuth())) return;
 
   const spinner = ora('Fetching submission status...').start();
 
   try {
-    const params = name ? `?name=${encodeURIComponent(name)}` : '';
-    const res = await authFetch(`${API_BASE}/submissions${params}`);
-
-    if (!res.ok) {
-      throw new Error(`API error: ${res.status}`);
+    // If it looks like a UUID, fetch by ID
+    const isUuid = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(nameOrId || '');
+
+    let submissions;
+    if (isUuid) {
+      const res = await authFetch(`${API_BASE}/submissions/${nameOrId}`);
+      if (!res.ok) throw new Error(`API error: ${res.status}`);
+      const body = await res.json();
+      submissions = body.submission ? [body.submission] : [];
+    } else {
+      const params = nameOrId ? `?name=${encodeURIComponent(nameOrId)}` : '';
+      const res = await authFetch(`${API_BASE}/submissions${params}`);
+      if (!res.ok) throw new Error(`API error: ${res.status}`);
+      const body = await res.json();
+      submissions = body.submissions || [];
     }
 
-    const body = await res.json();
-    const submissions = body.submissions || [];
-
     spinner.stop();
 
     if (submissions.length === 0) {
@@ -921,16 +962,36 @@ async function checkStatus(name) {
     for (const sub of submissions) {
       const statusColor = {
         pending_review: chalk.yellow,
+        ai_analyzing: chalk.magenta,
+        ready_for_review: chalk.blue,
         approved: chalk.green,
-        merged: chalk.green.bold,
         rejected: chalk.red,
         changes_requested: chalk.yellow,
       }[sub.status] || chalk.gray;
 
-      console.log(`  ${chalk.white.bold(sub.skillName)} ${statusColor(`[${sub.status}]`)}`);
-      if (sub.prUrl) console.log(chalk.gray(`    PR: ${sub.prUrl}`));
-      if (sub.reviewNotes) console.log(chalk.gray(`    Notes: ${sub.reviewNotes}`));
-      console.log(chalk.gray(`    Submitted: ${new Date(sub.createdAt).toLocaleDateString()}`));
+      const statusLabel = {
+        pending_review: 'pending review',
+        ai_analyzing: 'AI analyzing...',
+        ready_for_review: 'ready for review',
+        approved: 'approved',
+        rejected: 'rejected',
+        changes_requested: 'changes requested',
+      }[sub.status] || sub.status;
+
+      console.log(`  ${chalk.white.bold(sub.skillName)} ${statusColor(`[${statusLabel}]`)}`);
+
+      // Show AI score if available
+      if (sub.aiAnalysis?.overallScore != null) {
+        const score = sub.aiAnalysis.overallScore;
+        const scoreColor = score >= 75 ? chalk.green : score >= 50 ? chalk.yellow : chalk.red;
+        console.log(`    ${chalk.gray('AI Score:')} ${scoreColor(`${score}/100`)} ${chalk.gray(`(${sub.aiAnalysis.recommendation})`)}`);
+      } else if (sub.aiAnalysisStatus === 'running') {
+        console.log(`    ${chalk.gray('AI Score:')} ${chalk.magenta('analyzing...')}`);
+      }
+
+      if (sub.reviewNotes) console.log(`    ${chalk.gray('Review:')} ${sub.reviewNotes}`);
+      console.log(`    ${chalk.gray('Submitted:')} ${new Date(sub.createdAt).toLocaleDateString()}`);
+      if (sub.reviewedAt) console.log(`    ${chalk.gray('Reviewed:')} ${new Date(sub.reviewedAt).toLocaleDateString()}`);
       console.log('');
     }
   } catch (err) {