spritecook-mcp 0.2.11 → 0.2.13

package/src/setup.mjs

@@ -1,160 +1,160 @@
-import chalk from 'chalk';
-import prompts from 'prompts';
-import { printBanner, step, success, info, warn, error } from './ui.mjs';
-import { authenticate } from './auth.mjs';
-import { verifyApiKey } from './verify.mjs';
-import { detectEditors, writeConfigs, readExistingKey } from './editors.mjs';
-import { maybeInstallSkill } from './skill.mjs';
-
-/**
- * Main setup flow orchestrator.
- * Called by bin/cli.mjs as the entry point.
- */
-export async function run() {
-  printBanner();
-
-  // ── Step 1: Authenticate ──────────────────────────────────────────
-  step(1, 'Authentication');
-
-  let apiKey = null;
-
-  // Check if there's already a working SpriteCook key in an editor config
-  const existingKey = readExistingKey();
-  if (existingKey) {
-    info('Found existing SpriteCook API key in your editor config.');
-    const verification = await verifyApiKey(existingKey);
-    if (verification.ok) {
-      const response = await prompts({
-        type: 'select',
-        name: 'action',
-        message: 'Existing key is valid. What would you like to do?',
-        choices: [
-          { title: 'Keep existing key and update configs', value: 'keep' },
-          { title: 'Create a new key (replaces current)', value: 'new' },
-        ],
-        initial: 0,
-      });
-
-      if (response.action === 'keep') {
-        apiKey = existingKey;
-        success('Using existing API key.');
-      }
-    } else {
-      warn('Existing key is no longer valid. Please authenticate again.');
-    }
-  }
-
-  if (!apiKey) {
-    apiKey = await authenticate();
-    if (!apiKey) {
-      console.log();
-      error('Setup cancelled. No API key obtained.');
-      process.exit(1);
-    }
-
-    // ── Step 2: Verify the key works ──────────────────────────────────
-    step(2, 'Verification');
-
-    const verification = await verifyApiKey(apiKey);
-    if (!verification.ok) {
-      error('API key verification failed. Please check your key and try again.');
-      process.exit(1);
-    }
-  }
-
-  // ── Step 3: Detect editors and write configs ──────────────────────
-  step(3, 'Editor Configuration');
-
-  const editors = detectEditors();
-
-  // Let user select which editors to configure
-  const editorResponse = await prompts({
-    type: 'multiselect',
-    name: 'editors',
-    message: 'Configure MCP for:',
-    choices: editors.map((e) => ({
-      title: e.detected ? chalk.white(e.name) : chalk.dim(e.name),
-      value: e.name,
-      selected: e.detected,
-    })),
-    hint: 'Space to toggle, Enter to confirm',
-    instructions: false,
-  });
-
-  const selected = editors.filter((e) => editorResponse.editors?.includes(e.name));
-
-  if (selected.length === 0) {
-    warn('No editors selected. Skipping config.');
-    console.log();
-    info('You can configure manually later. Your API key:');
-    console.log(`  ${chalk.dim(apiKey.slice(0, 16) + '...')}`);
-  } else {
-    // Ask about scope for editors that support both project and global
-    const multiScopeEditors = selected.filter((e) => e.scopes.length > 1);
-    if (multiScopeEditors.length > 0) {
-      console.log();
-      const scopeResponse = await prompts({
-        type: 'select',
-        name: 'scope',
-        message: 'Install MCP config:',
-        choices: [
-          { title: 'This project only (recommended)', value: 'project', description: 'Writes to project config files' },
-          { title: 'Global (all projects)', value: 'global', description: 'Writes to user-level config' },
-        ],
-        initial: 0,
-      });
-
-      const chosenScope = scopeResponse.scope || 'project';
-      for (const e of selected) {
-        if (e.scopes.includes(chosenScope)) {
-          e._chosenScope = chosenScope;
-        }
-        // Editors with only 1 scope keep their default
-      }
-    }
-
-    console.log();
-    info('Writing MCP config...');
-    const written = writeConfigs(selected, apiKey);
-
-    if (written === 0) {
-      warn('No configs were written. You may need to configure manually.');
-    }
-  }
-
-  // ── Step 4: Optional agent skill ─────────────────────────────────
-  step(4, 'Agent Skill (optional)');
-  await maybeInstallSkill(selected);
-
-  // ── Done ──────────────────────────────────────────────────────────
-  const configuredNames = selected.map((e) => e.name);
-  const hasCursor = configuredNames.includes('Cursor');
-  const hasVSCode = configuredNames.includes('VS Code');
-
-  console.log();
-  console.log(chalk.bold.green('  Setup complete!'));
-  console.log();
-
-  if (hasCursor || hasVSCode) {
-    console.log(chalk.bgYellow.black.bold('  ACTION REQUIRED  '));
-    console.log();
-    if (hasCursor) {
-      console.log(chalk.white.bold('  Cursor:'));
-      console.log(chalk.white('    1. Open Settings (Ctrl+Shift+J / Cmd+Shift+J)'));
-      console.log(chalk.white('    2. Go to Tools & MCP'));
-      console.log(chalk.white('    3. Enable "spritecook"'));
-    }
-    if (hasVSCode) {
-      if (hasCursor) console.log();
-      console.log(chalk.white.bold('  VS Code:'));
-      console.log(chalk.white('    Reload the window (Ctrl+Shift+P > "Reload Window")'));
-    }
-    console.log();
-    console.log(chalk.dim('  ─────────────────────────────────────────'));
-  }
-
-  console.log();
-  console.log(chalk.dim('  Then try asking your AI agent:'));
-  console.log(chalk.white('  "Generate a chicken sprite"'));
-  console.log();
-}
+import chalk from 'chalk';
+import prompts from 'prompts';
+import { printBanner, step, success, info, warn, error } from './ui.mjs';
+import { authenticate } from './auth.mjs';
+import { verifyApiKey } from './verify.mjs';
+import { detectEditors, writeConfigs, readExistingKey } from './editors.mjs';
+import { maybeInstallSkill } from './skill.mjs';
+
+/**
+ * Main setup flow orchestrator.
+ * Called by bin/cli.mjs as the entry point.
+ */
+export async function run() {
+  printBanner();
+
+  // ── Step 1: Authenticate ──────────────────────────────────────────
+  step(1, 'Authentication');
+
+  let apiKey = null;
+
+  // Check if there's already a working SpriteCook key in an editor config
+  const existingKey = readExistingKey();
+  if (existingKey) {
+    info('Found existing SpriteCook API key in your editor config.');
+    const verification = await verifyApiKey(existingKey);
+    if (verification.ok) {
+      const response = await prompts({
+        type: 'select',
+        name: 'action',
+        message: 'Existing key is valid. What would you like to do?',
+        choices: [
+          { title: 'Keep existing key and update configs', value: 'keep' },
+          { title: 'Create a new key (replaces current)', value: 'new' },
+        ],
+        initial: 0,
+      });
+
+      if (response.action === 'keep') {
+        apiKey = existingKey;
+        success('Using existing API key.');
+      }
+    } else {
+      warn('Existing key is no longer valid. Please authenticate again.');
+    }
+  }
+
+  if (!apiKey) {
+    apiKey = await authenticate();
+    if (!apiKey) {
+      console.log();
+      error('Setup cancelled. No API key obtained.');
+      process.exit(1);
+    }
+
+    // ── Step 2: Verify the key works ──────────────────────────────────
+    step(2, 'Verification');
+
+    const verification = await verifyApiKey(apiKey);
+    if (!verification.ok) {
+      error('API key verification failed. Please check your key and try again.');
+      process.exit(1);
+    }
+  }
+
+  // ── Step 3: Detect editors and write configs ──────────────────────
+  step(3, 'Editor Configuration');
+
+  const editors = detectEditors();
+
+  // Let user select which editors to configure
+  const editorResponse = await prompts({
+    type: 'multiselect',
+    name: 'editors',
+    message: 'Configure MCP for:',
+    choices: editors.map((e) => ({
+      title: e.detected ? chalk.white(e.name) : chalk.dim(e.name),
+      value: e.name,
+      selected: e.detected,
+    })),
+    hint: 'Space to toggle, Enter to confirm',
+    instructions: false,
+  });
+
+  const selected = editors.filter((e) => editorResponse.editors?.includes(e.name));
+
+  if (selected.length === 0) {
+    warn('No editors selected. Skipping config.');
+    console.log();
+    info('You can configure manually later. Your API key:');
+    console.log(`  ${chalk.dim(apiKey.slice(0, 16) + '...')}`);
+  } else {
+    // Ask about scope for editors that support both project and global
+    const multiScopeEditors = selected.filter((e) => e.scopes.length > 1);
+    if (multiScopeEditors.length > 0) {
+      console.log();
+      const scopeResponse = await prompts({
+        type: 'select',
+        name: 'scope',
+        message: 'Install MCP config:',
+        choices: [
+          { title: 'This project only (recommended)', value: 'project', description: 'Writes to project config files' },
+          { title: 'Global (all projects)', value: 'global', description: 'Writes to user-level config' },
+        ],
+        initial: 0,
+      });
+
+      const chosenScope = scopeResponse.scope || 'project';
+      for (const e of selected) {
+        if (e.scopes.includes(chosenScope)) {
+          e._chosenScope = chosenScope;
+        }
+        // Editors with only 1 scope keep their default
+      }
+    }
+
+    console.log();
+    info('Writing MCP config...');
+    const written = writeConfigs(selected, apiKey);
+
+    if (written === 0) {
+      warn('No configs were written. You may need to configure manually.');
+    }
+  }
+
+  // ── Step 4: Optional agent skill ─────────────────────────────────
+  step(4, 'Agent Skill (optional)');
+  await maybeInstallSkill(selected);
+
+  // ── Done ──────────────────────────────────────────────────────────
+  const configuredNames = selected.map((e) => e.name);
+  const hasCursor = configuredNames.includes('Cursor');
+  const hasVSCode = configuredNames.includes('VS Code');
+
+  console.log();
+  console.log(chalk.bold.green('  Setup complete!'));
+  console.log();
+
+  if (hasCursor || hasVSCode) {
+    console.log(chalk.bgYellow.black.bold('  ACTION REQUIRED  '));
+    console.log();
+    if (hasCursor) {
+      console.log(chalk.white.bold('  Cursor:'));
+      console.log(chalk.white('    1. Open Settings (Ctrl+Shift+J / Cmd+Shift+J)'));
+      console.log(chalk.white('    2. Go to Tools & MCP'));
+      console.log(chalk.white('    3. Enable "spritecook"'));
+    }
+    if (hasVSCode) {
+      if (hasCursor) console.log();
+      console.log(chalk.white.bold('  VS Code:'));
+      console.log(chalk.white('    Reload the window (Ctrl+Shift+P > "Reload Window")'));
+    }
+    console.log();
+    console.log(chalk.dim('  ─────────────────────────────────────────'));
+  }
+
+  console.log();
+  console.log(chalk.dim('  Then try asking your AI agent:'));
+  console.log(chalk.white('  "Generate a chicken sprite"'));
+  console.log();
+}

package/src/skill.mjs

@@ -1,102 +1,124 @@
-import { execSync } from 'node:child_process';
-import { platform } from 'node:os';
-import { mkdirSync, writeFileSync } from 'node:fs';
-import { join } from 'node:path';
-import prompts from 'prompts';
-import { success, info, warn } from './ui.mjs';
-
-const SKILL_RAW_URL =
-  'https://raw.githubusercontent.com/SpriteCook/skills/main/skills/spritecook-generate-sprites/SKILL.md';
-
-/**
- * Download SKILL.md directly from GitHub and write it into each
- * selected editor's skill directory.  Used as a fallback when
- * `npx skills add` fails (e.g. git not installed).
- *
- * @param {Array<{skillDirs:{project:string|null,global:string|null}, _chosenScope?:string}>} editors
- */
-async function fallbackInstall(editors) {
-  info('Trying direct download fallback...');
-
-  let body;
-  try {
-    const res = await fetch(SKILL_RAW_URL);
-    if (!res.ok) throw new Error(`HTTP ${res.status}`);
-    body = await res.text();
-  } catch (e) {
-    warn(`Could not download skill file: ${e.message}`);
-    return false;
-  }
-
-  let wrote = 0;
-  for (const editor of editors) {
-    const dirs = editor.skillDirs;
-    if (!dirs) continue;
-
-    const scope = editor._chosenScope || 'project';
-    const dir = dirs[scope] || dirs.project || dirs.global;
-    if (!dir) continue;
-
-    try {
-      mkdirSync(dir, { recursive: true });
-      writeFileSync(join(dir, 'SKILL.md'), body, 'utf-8');
-      wrote++;
-    } catch {
-      // best-effort, skip on failure
-    }
-  }
-
-  if (wrote > 0) {
-    success(`Agent skill installed to ${wrote} editor(s) via direct download.`);
-    return true;
-  }
-  return false;
-}
-
-/**
- * Install or update the SpriteCook agent skill.
- *
- * Primary: `npx skills add SpriteCook/skills` (requires git).
- * Fallback: download SKILL.md directly from GitHub and place it
- *           in each selected editor's skill directory.
- *
- * @param {Array} [selectedEditors] - editors the user chose in step 3
- */
-export async function maybeInstallSkill(selectedEditors = []) {
-  info('The agent skill teaches your AI how to generate sprites autonomously.');
-  const response = await prompts({
-    type: 'confirm',
-    name: 'install',
-    message: 'Install SpriteCook agent skill? (highly recommended)',
-    initial: true,
-  });
-
-  if (!response.install) {
-    return;
-  }
-
-  info('Installing skill via npx skills add SpriteCook/skills...');
-
-  try {
-    const npxCmd = platform() === 'win32' ? 'npx.cmd' : 'npx';
-    execSync(`${npxCmd} -y skills add SpriteCook/skills`, {
-      stdio: 'inherit',
-      timeout: 60_000,
-    });
-    success('Agent skill installed.');
-    return;
-  } catch {
-    // Primary method failed -- try fallback
-  }
-
-  // ── Fallback: direct download ────────────────────────────────────
-  if (selectedEditors.length > 0) {
-    const ok = await fallbackInstall(selectedEditors);
-    if (ok) return;
-  }
-
-  warn('Skill install failed (git may not be installed).');
-  console.log('  You can install it manually later:');
-  console.log('    npx skills add SpriteCook/skills');
-  console.log('  Or install git and re-run this setup.');
-}
+import { execSync } from 'node:child_process';
+import { platform } from 'node:os';
+import { mkdirSync, writeFileSync } from 'node:fs';
+import { basename, dirname, join } from 'node:path';
+import prompts from 'prompts';
+import { success, info, warn } from './ui.mjs';
+
+const SKILLS = [
+  {
+    name: 'spritecook-workflow-essentials',
+    rawUrl: 'https://raw.githubusercontent.com/SpriteCook/skills/main/skills/spritecook-workflow-essentials/SKILL.md',
+  },
+  {
+    name: 'spritecook-generate-sprites',
+    rawUrl: 'https://raw.githubusercontent.com/SpriteCook/skills/main/skills/spritecook-generate-sprites/SKILL.md',
+  },
+  {
+    name: 'spritecook-animate-assets',
+    rawUrl: 'https://raw.githubusercontent.com/SpriteCook/skills/main/skills/spritecook-animate-assets/SKILL.md',
+  },
+];
+
+/**
+ * Download SKILL.md directly from GitHub and write it into each
+ * selected editor's skill directory.  Used as a fallback when
+ * `npx skills add` fails (e.g. git not installed).
+ *
+ * @param {Array<{skillDirs:{project:string|null,global:string|null}, _chosenScope?:string}>} editors
+ */
+async function fallbackInstall(editors) {
+  info('Trying direct download fallback...');
+
+  const skillBodies = [];
+  try {
+    for (const skill of SKILLS) {
+      const res = await fetch(skill.rawUrl);
+      if (!res.ok) throw new Error(`${skill.name}: HTTP ${res.status}`);
+      skillBodies.push({
+        name: skill.name,
+        body: await res.text(),
+      });
+    }
+  } catch (e) {
+    warn(`Could not download skill files: ${e.message}`);
+    return false;
+  }
+
+  let wrote = 0;
+  for (const editor of editors) {
+    const dirs = editor.skillDirs;
+    if (!dirs) continue;
+
+    const scope = editor._chosenScope || 'project';
+    const dir = dirs[scope] || dirs.project || dirs.global;
+    if (!dir) continue;
+
+    const skillsRoot = basename(dir) === 'spritecook' ? dirname(dir) : dir;
+
+    try {
+      for (const skill of skillBodies) {
+        const skillDir = join(skillsRoot, skill.name);
+        mkdirSync(skillDir, { recursive: true });
+        writeFileSync(join(skillDir, 'SKILL.md'), skill.body, 'utf-8');
+        wrote++;
+      }
+    } catch {
+      // best-effort, skip on failure
+    }
+  }
+
+  if (wrote > 0) {
+    success(`Agent skills installed via direct download (${wrote} files written).`);
+    return true;
+  }
+  return false;
+}
+
+/**
+ * Install or update the SpriteCook agent skill.
+ *
+ * Primary: `npx skills add SpriteCook/skills --skill '*'` (requires git).
+ * Fallback: download SKILL.md directly from GitHub and place it
+ *           in each selected editor's skill directory.
+ *
+ * @param {Array} [selectedEditors] - editors the user chose in step 3
+ */
+export async function maybeInstallSkill(selectedEditors = []) {
+  info('The agent skill teaches your AI how to generate sprites autonomously.');
+  const response = await prompts({
+    type: 'confirm',
+    name: 'install',
+    message: 'Install SpriteCook agent skill? (highly recommended)',
+    initial: true,
+  });
+
+  if (!response.install) {
+    return;
+  }
+
+  info('Installing skills via npx skills add SpriteCook/skills --skill "*" ...');
+
+  try {
+    const npxCmd = platform() === 'win32' ? 'npx.cmd' : 'npx';
+    execSync(`${npxCmd} -y skills add SpriteCook/skills --skill "*"`, {
+      stdio: 'inherit',
+      timeout: 60_000,
+    });
+    success('Agent skills installed.');
+    return;
+  } catch {
+    // Primary method failed -- try fallback
+  }
+
+  // ── Fallback: direct download ────────────────────────────────────
+  if (selectedEditors.length > 0) {
+    const ok = await fallbackInstall(selectedEditors);
+    if (ok) return;
+  }
+
+  warn('Skill install failed (git may not be installed).');
+  console.log('  You can install it manually later:');
+  console.log('    npx skills add SpriteCook/skills --skill "*"');
+  console.log('  Or install git and re-run this setup.');
+}