makaron-cli 0.10.0 → 0.11.1

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "makaron-cli",
-  "version": "0.9.0",
-  "description": "AI image editing, video generation, and music creation via CLI. Agents can self-register, create projects, and produce creative media.",
+  "version": "0.11.1",
+  "description": "AI image editing, video generation, music creation, and marketplace skill workflows via CLI. Agents can self-register, install skills, create projects, and produce creative media.",
   "author": {
     "name": "Makaron AI",
     "url": "https://www.makaron.app"

package/.codex-plugin/plugin.json

@@ -1,10 +1,10 @@
 {
   "name": "makaron-cli",
-  "version": "0.9.0",
-  "description": "AI image editing, video generation, and music creation via CLI. Agents can self-register, create projects, and produce creative media.",
+  "version": "0.11.1",
+  "description": "AI image editing, video generation, music creation, and marketplace skill workflows via CLI. Agents can self-register, install skills, create projects, and produce creative media.",
   "displayName": "Makaron",
   "shortDescription": "AI image/video/music creation from the terminal",
-  "longDescription": "makaron.app is for humans. makaron-cli is for AI agents. Talk to Makaron Agent from the terminal — create projects, edit images, generate videos, and compose music. Zero dependencies, single file, works with npx. Agents can self-register to get an API key without human intervention.",
+  "longDescription": "makaron.app is for humans. makaron-cli is for AI agents. Talk to Makaron Agent from the terminal — list, search, show, and install marketplace skills; create projects; edit images; generate videos; and compose music. Zero dependencies, single file, works with npx. Agents can self-register to get an API key without human intervention.",
   "author": {
     "name": "Makaron AI",
     "url": "https://www.makaron.app"
@@ -12,9 +12,9 @@
   "homepage": "https://www.makaron.app/agent",
   "repository": "https://github.com/vegekyd/ai-image-editor",
   "license": "MIT",
-  "keywords": ["ai", "image-editing", "video", "music", "agent", "creative"],
+  "keywords": ["ai", "image-editing", "video", "music", "agent", "creative", "skills"],
   "category": "Creative Tools",
-  "capabilities": ["image-editing", "video-generation", "music-creation", "text-to-image"],
+  "capabilities": ["image-editing", "video-generation", "music-creation", "text-to-image", "marketplace-skills"],
   "skills": "./skills/",
   "websiteURL": "https://www.makaron.app",
   "brandColor": "#d946ef"

package/README.md

@@ -7,8 +7,10 @@ Makaron is a multimodal AI creative agent. You talk to it via `makaron chat`, an
 ## Setup
 
 ```bash
-npm install -g makaron-cli
-# or use directly: npx makaron-cli
+# Install makaron-cli globally and add the Makaron Agent Skill.
+npx makaron-cli setup
+
+npx makaron-cli --help
 ```
 
 ### Get your API key
@@ -107,6 +109,23 @@ Returns immediately:
 | Add music | `npx makaron-cli chat --project <id> "add calm piano background music"` |
 | Create motion design | `npx makaron-cli chat --project <id> "make an animated Instagram story with this image"` |
 
+### Marketplace skills
+
+External users can browse, install, and use marketplace skills with only `MAKARON_API_KEY`:
+
+```bash
+npx makaron-cli skills list
+npx makaron-cli skills search "football"
+npx makaron-cli skills search "足球"
+npx makaron-cli skills show <marketplace-id-or-label>
+npx makaron-cli skills install <marketplace-id-or-label>
+
+# chat auto-installs matched marketplace skills before starting the run
+npx makaron-cli chat --project auto --image selfie.jpg --skill <marketplace-id-or-label> -b "make this with the selected skill"
+```
+
+`--skill` accepts an installed skill name, a marketplace UUID, or a unique marketplace label. If a marketplace skill is matched, the CLI installs or reuses it and sends `[Active skill: <installed-skill-name>]` to Makaron Agent. Ordinary users do not need admin commands, and the CLI intentionally does not expose skill deletion.
+
 ### With additional images (existing project)
 
 ```bash

package/bin/makaron.mjs

@@ -15,6 +15,7 @@ import fs from 'fs';
 import path from 'path';
 import { createInterface } from 'readline';
 import { execFileSync } from 'child_process';
+import { fileURLToPath } from 'url';
 
 // ─── Config ──────────────────────────────────────────────────────────────────
 
@@ -267,12 +268,13 @@ function printChatHelp() {
   console.log(`Makaron chat — create and edit with Makaron Agent
 
 Usage:
-  makaron chat --project <id|auto> [options] "your message"
+  makaron chat --project <id|auto> [options] [--skill <id|label|name>] "your message"
 
 Options:
   --project <id|auto>       Project to work in. Use "auto" to create one.
   --image <file|url>        Attach a reference image or screenshot. Repeatable.
   --video <file|url>        Attach a video to the project timeline. Repeatable.
+  --skill <id|label|name>   Use an installed skill or auto-install a matched marketplace skill.
   --model <name>            Preferred image/model route.
   --video-model <name>      Preferred video model: seedance-fast, seedance, kling, or grok.
   --video-resolution <res>  Video resolution: auto, 480p, 720p, 1080p, or 4k.
@@ -291,6 +293,9 @@ What you can ask:
   Video from image or timeline
     makaron chat --project <id> "make this into a 5 second cinematic video"
 
+  Marketplace skill
+    makaron chat --project auto --image selfie.jpg --skill "Football Captain" "make this cinematic"
+
   Fix one video moment from a screenshot
     makaron chat --project <id> --image screenshot.png "@4 this frame should be Paris; only fix this moment"
 
@@ -792,6 +797,155 @@ function timeSince(date) {
   return `${Math.floor(s / 86400)}d ago`;
 }
 
+// ─── Skill Marketplace ──────────────────────────────────────────────────────
+
+function getSkillLabel(skill) {
+  return skill.labels?.en || skill.labels?.zh || skill.label || skill.name || skill.id;
+}
+
+function slugifySkill(value) {
+  return String(value || '')
+    .toLowerCase()
+    .normalize('NFKD')
+    .replace(/[\u0300-\u036f]/g, '')
+    .replace(/[^a-z0-9]+/g, '-')
+    .replace(/^-+|-+$/g, '');
+}
+
+function normalizeMarketplaceSkill(skill) {
+  return {
+    ...skill,
+    label: getSkillLabel(skill),
+    skillPath: skill.skillPath || skill.skill_path || null,
+    hasSkill: Boolean(skill.skillPath || skill.skill_path),
+  };
+}
+
+async function fetchMarketplaceSkills(baseUrl, opts = {}) {
+  let res;
+  try {
+    res = await fetch(`${baseUrl}/api/home-skills`);
+  } catch (err) {
+    if (opts.optional) return null;
+    process.stderr.write(`Failed to load marketplace skills: ${err.message || err}\n`);
+    process.exit(1);
+  }
+  if (!res.ok) {
+    if (opts.optional) return null;
+    process.stderr.write(`Error ${res.status}: ${await res.text()}\n`);
+    process.exit(1);
+  }
+  const data = await res.json();
+  const skills = Array.isArray(data) ? data : (data.skills || []);
+  return skills.map(normalizeMarketplaceSkill);
+}
+
+function marketplaceSearchText(skill) {
+  return [
+    skill.id,
+    skill.label,
+    skill.labels?.en,
+    skill.labels?.zh,
+    skill.prompt,
+    slugifySkill(skill.label),
+    slugifySkill(skill.labels?.en),
+    slugifySkill(skill.labels?.zh),
+  ].filter(Boolean).join(' ').toLowerCase();
+}
+
+function marketplaceSkillTokens(skill) {
+  return [
+    skill.id,
+    skill.label,
+    skill.labels?.en,
+    skill.labels?.zh,
+    skill.prompt,
+  ].filter(Boolean).map(value => String(value).toLowerCase());
+}
+
+function findMarketplaceSkill(skills, identifier) {
+  const raw = String(identifier || '').trim();
+  if (!raw) return null;
+  const lower = raw.toLowerCase();
+  const slug = slugifySkill(raw);
+  const exact = skills.filter(skill => {
+    const labels = Object.values(skill.labels || {}).map(v => String(v).toLowerCase());
+    const slugMatches = slug
+      ? slugifySkill(getSkillLabel(skill)) === slug ||
+        Object.values(skill.labels || {}).some(v => slugifySkill(v) === slug)
+      : false;
+    return skill.id === raw ||
+      skill.id?.toLowerCase() === lower ||
+      getSkillLabel(skill).toLowerCase() === lower ||
+      labels.includes(lower) ||
+      slugMatches;
+  });
+  if (exact.length === 1) return exact[0];
+  if (exact.length > 1) {
+    process.stderr.write(`Multiple marketplace skills match "${raw}". Use an id:\n`);
+    exact.forEach(skill => process.stderr.write(`  ${skill.id}  ${skill.label}\n`));
+    process.exit(1);
+  }
+  const prefix = skills.filter(skill => skill.id?.startsWith(raw));
+  if (prefix.length === 1) return prefix[0];
+  return null;
+}
+
+function printMarketplaceSkills(skills) {
+  if (!skills.length) {
+    console.log('No marketplace skills found.');
+    return;
+  }
+  console.log(`📦 ${skills.length} marketplace skills\n`);
+  for (const skill of skills) {
+    const kind = skill.hasSkill ? 'skill' : 'prompt';
+    console.log(`  ${skill.id}  ${skill.label}  [${kind}]`);
+  }
+}
+
+function printMarketplaceSkill(skill) {
+  console.log(`${skill.label}`);
+  console.log(`ID: ${skill.id}`);
+  console.log(`Type: ${skill.hasSkill ? 'installable skill' : 'prompt template'}`);
+  if (skill.labels?.zh && skill.labels.zh !== skill.label) console.log(`ZH: ${skill.labels.zh}`);
+  if (skill.prompt) console.log(`Prompt: ${skill.prompt}`);
+  if (skill.image) console.log(`Cover: ${skill.image}`);
+  if (skill.hasSkill) console.log(`Install: makaron skills install ${skill.id}`);
+}
+
+async function installMarketplaceSkill(baseUrl, headers, skill, opts = {}) {
+  if (!skill.hasSkill) {
+    process.stderr.write(`"${skill.label}" is a prompt-only marketplace item and has no installable skill package.\n`);
+    process.exit(1);
+  }
+  if (!opts.quiet) process.stderr.write(`📦 Installing skill: ${skill.label}\n`);
+  const res = await fetch(`${baseUrl}/api/skills`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json', ...headers },
+    body: JSON.stringify({ skillPath: skill.skillPath, homeSkillId: skill.id }),
+  });
+  const data = await res.json().catch(() => ({}));
+  if (!res.ok || !data.success) {
+    process.stderr.write(`Install failed: ${data.error || res.status}\n`);
+    process.exit(1);
+  }
+  if (!opts.quiet) {
+    const suffix = data.alreadyInstalled ? 'already installed' : 'installed';
+    process.stderr.write(`✅ Skill ${suffix}: ${data.skillName}\n`);
+  }
+  return data;
+}
+
+async function resolveChatSkill(baseUrl, headers, activeSkill) {
+  if (!activeSkill) return undefined;
+  const skills = await fetchMarketplaceSkills(baseUrl, { optional: true });
+  if (!skills) return activeSkill;
+  const marketplaceSkill = findMarketplaceSkill(skills, activeSkill);
+  if (!marketplaceSkill) return activeSkill;
+  const result = await installMarketplaceSkill(baseUrl, headers, marketplaceSkill);
+  return result.skillName;
+}
+
 // ─── MCP Tool Caller ─────────────────────────────────────────────────────────
 
 async function callMcpTool(baseUrl, headers, toolName, args) {
@@ -1048,6 +1202,8 @@ function printRootHelp() {
   console.log(`Makaron CLI — Talk to Makaron Agent from the terminal
 
 Commands:
+  setup                              Install makaron-cli globally and add the Agent Skill
+  install-skill                     Install Makaron Agent Skill into your coding agent
   register --json                    Get challenge for agent self-registration
   register --verify --challenge-id <id> --answer <n>  Verify and save API key
   claim                              Get claim URL for human to link account
@@ -1059,6 +1215,7 @@ Commands:
   create --title "name"              Create empty project (text-to-image)
 
   chat --project <id> "message"      Chat (non-blocking, polls for result)
+  chat --project <id> --skill <id>   Use or auto-install a marketplace skill
   chat --project <id> --video <file> Attach video to conversation
   chat --project <id> -b "message"   Background: submit and print runId
   chat --project <id> --stream "msg" Legacy: stream SSE in real-time
@@ -1068,6 +1225,7 @@ Commands:
   responses get <runId> --wait       Poll until completed
   responses list --project <id>      List runs for a project
   abort <runId>                      Abort a running Agent
+  skills list|search|show|install    Browse and install marketplace skills
 
   edit [--image <file>] "prompt"     AI image edit / text-to-image
   analyze --video <file|url>         Analyze video content
@@ -1082,13 +1240,56 @@ Environment:
 `);
 }
 
+function installAgentSkill(values = []) {
+  if (hasHelpFlag(values)) {
+    console.log('Usage: makaron install-skill [--global] [--agent <agent>] [--yes]');
+    return;
+  }
+
+  const skillDir = fileURLToPath(new URL('../skills/makaron', import.meta.url));
+  const skillFile = path.join(skillDir, 'SKILL.md');
+  if (!fs.existsSync(skillFile)) {
+    console.error(`Makaron Agent Skill not found at ${skillFile}`);
+    process.exit(1);
+  }
+
+  execFileSync('npx', [
+    '-y',
+    'skills',
+    'add',
+    skillDir,
+    '--skill',
+    'makaron',
+    '--copy',
+    ...values,
+  ], { stdio: 'inherit' });
+}
+
+function setupMakaron(values = []) {
+  if (hasHelpFlag(values)) {
+    console.log('Usage: makaron setup [--agent <agent>]');
+    return;
+  }
+
+  const version = getCliVersion();
+  console.error(`Installing ${NPM_PACKAGE_NAME}@${version} globally...`);
+  execFileSync('npm', ['install', '-g', `${NPM_PACKAGE_NAME}@${version}`], { stdio: 'inherit' });
+
+  const skillArgs = [...values];
+  if (!skillArgs.includes('--global') && !skillArgs.includes('-g')) skillArgs.unshift('--global');
+  if (!skillArgs.includes('--yes') && !skillArgs.includes('-y')) skillArgs.push('--yes');
+
+  console.error('Installing Makaron Agent Skill globally...');
+  installAgentSkill(skillArgs);
+}
+
 function printHelp(topic, subtopic) {
   if (topic === 'login') {
     console.log('Usage: makaron login');
   } else if (topic === 'create') {
     console.log('Usage: makaron create --image <file> [--image <file2>] | --image-url <url> | --title "name"');
   } else if (topic === 'chat') {
-    console.log('Usage: makaron chat --project <id|auto> [--image <file>] [--video <file|url>] [--stream] [--background|-b] [--json] "your message"');
+    printChatHelp();
   } else if (topic === 'responses' || topic === 'run') {
     if (subtopic === 'get') console.log('Usage: makaron responses get <runId> [--wait] [--json] [--pick <field>]');
     else if (subtopic === 'watch') console.log('Usage: makaron responses watch <runId> [--jsonl] [--interval <ms>]');
@@ -1109,6 +1310,24 @@ function printHelp(topic, subtopic) {
 `);
   } else if (topic === 'abort') {
     console.log('Usage: makaron abort <runId>');
+  } else if (topic === 'setup') {
+    console.log('Usage: makaron setup [--agent <agent>]');
+  } else if (topic === 'install-skill') {
+    console.log('Usage: makaron install-skill [--global] [--agent <agent>] [--yes]');
+  } else if (topic === 'skills') {
+    if (subtopic === 'list') console.log('Usage: makaron skills list [--json]');
+    else if (subtopic === 'search') console.log('Usage: makaron skills search <query> [--json]');
+    else if (subtopic === 'show') console.log('Usage: makaron skills show <marketplace-id|label> [--json]');
+    else if (subtopic === 'install') console.log('Usage: makaron skills install <marketplace-id|label> [--json]');
+    else console.log(`Skill marketplace commands:
+  skills list                         List marketplace skills
+  skills search <query>               Search marketplace skills
+  skills show <id|label>              Show a marketplace skill
+  skills install <id|label>           Install a marketplace skill to your workspace
+
+Use with chat:
+  makaron chat --project auto --skill <id|label> "your request"
+`);
   } else if (topic === 'edit') {
     console.log('Usage: makaron edit [--image <file|url>] [--model gemini|qwen|openai] [--skill enhance|creative|wild|captions] [--ref <file>] [--out <file>] "prompt"');
   } else if (topic === 'analyze') {
@@ -1168,6 +1387,10 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
   printHelp(command, args[1]);
 } else if (command === '--version' || command === '-v' || command === 'version') {
   console.log(getCliVersion());
+} else if (command === 'setup') {
+  setupMakaron(args.slice(1));
+} else if (command === 'install-skill') {
+  installAgentSkill(args.slice(1));
 } else if (command === 'login') {
   await login();
 } else if (command === 'create') {
@@ -1206,6 +1429,7 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
     else if (args[i] === '--image' && args[i + 1]) chatImages.push(args[++i]);
     else if (args[i] === '--video' && args[i + 1]) chatVideos.push(args[++i]);
     else if (args[i] === '--skill' && args[i + 1]) activeSkill = args[++i];
+    else if (args[i].startsWith('--skill=')) activeSkill = args[i].slice('--skill='.length);
     else if (args[i] === '--stream') useStream = true;
     else if (args[i] === '--background' || args[i] === '-b') background = true;
     else if (args[i] === '--json') jsonOutput = true;
@@ -1297,8 +1521,10 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
     }
   }
 
+  const resolvedSkill = await resolveChatSkill(baseUrl, headers, activeSkill);
+
   // Upload videos to project timeline (via /api/projects/create with videoUrls)
-  let finalPrompt = activeSkill ? `[Active skill: ${activeSkill}]\n${prompt}` : prompt;
+  let finalPrompt = resolvedSkill ? `[Active skill: ${resolvedSkill}]\n${prompt}` : prompt;
   if (chatVideos.length > 0) {
     // Upload local files via signed URL (no size limit, works with API key auth)
     const uploadedVideoUrls = [...prevalidatedVideoUrlList];
@@ -1376,10 +1602,9 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
   if (sub === 'get') {
     const runId = args[2];
     if (!runId) { console.error('Usage: makaron responses get <runId> [--wait] [--json] [--pick <field>]'); process.exit(1); }
-    let wait = false, jsonOutput = false, pick = null;
+    let wait = false, pick = null;
     for (let i = 3; i < args.length; i++) {
       if (args[i] === '--wait') wait = true;
-      if (args[i] === '--json') jsonOutput = true;
       if (args[i] === '--pick' && args[i + 1]) pick = args[++i];
     }
 
@@ -1439,6 +1664,54 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
 } else if (command === 'list' || command === 'ls') {
   const { headers, baseUrl } = getAuth();
   await listProjects(baseUrl, headers);
+} else if (command === 'skills') {
+  const sub = args[1] || 'list';
+  const baseUrl = process.env.MAKARON_URL || DEFAULT_URL;
+  const jsonOutput = args.includes('--json');
+
+  if (sub === 'list') {
+    const skills = await fetchMarketplaceSkills(baseUrl);
+    if (jsonOutput) console.log(JSON.stringify({ skills }, null, 2));
+    else printMarketplaceSkills(skills);
+  } else if (sub === 'search') {
+    const query = args.filter((arg, index) => index > 1 && arg !== '--json').join(' ').trim();
+    if (!query) { console.error('Usage: makaron skills search <query> [--json]'); process.exit(1); }
+    const lowerQuery = query.toLowerCase();
+    const slugQuery = slugifySkill(query);
+    const skills = (await fetchMarketplaceSkills(baseUrl))
+      .filter(skill => {
+        const rawMatch = marketplaceSkillTokens(skill).some(token => token.includes(lowerQuery));
+        const slugMatch = slugQuery ? marketplaceSearchText(skill).includes(slugQuery) : false;
+        return rawMatch || slugMatch;
+      });
+    if (jsonOutput) console.log(JSON.stringify({ skills }, null, 2));
+    else printMarketplaceSkills(skills);
+  } else if (sub === 'show') {
+    const identifier = args[2];
+    if (!identifier) { console.error('Usage: makaron skills show <marketplace-id|label> [--json]'); process.exit(1); }
+    const skills = await fetchMarketplaceSkills(baseUrl);
+    const skill = findMarketplaceSkill(skills, identifier);
+    if (!skill) { console.error(`Skill not found: ${identifier}`); process.exit(1); }
+    if (jsonOutput) console.log(JSON.stringify(skill, null, 2));
+    else printMarketplaceSkill(skill);
+  } else if (sub === 'install') {
+    const identifier = args[2];
+    if (!identifier) { console.error('Usage: makaron skills install <marketplace-id|label> [--json]'); process.exit(1); }
+    const { headers, baseUrl: authedBaseUrl } = getAuth();
+    const skills = await fetchMarketplaceSkills(authedBaseUrl);
+    const skill = findMarketplaceSkill(skills, identifier);
+    if (!skill) { console.error(`Skill not found: ${identifier}`); process.exit(1); }
+    const data = await installMarketplaceSkill(authedBaseUrl, headers, skill, { quiet: jsonOutput });
+    if (jsonOutput) console.log(JSON.stringify({ ...data, marketplaceId: skill.id, label: skill.label }, null, 2));
+    else console.log(data.skillName);
+  } else {
+    console.log(`Skill marketplace commands:
+  skills list                         List marketplace skills
+  skills search <query>               Search marketplace skills
+  skills show <id|label>              Show a marketplace skill
+  skills install <id|label>           Install a marketplace skill to your workspace
+`);
+  }
 } else if (command === 'project' || command === 'projects') {
   const { headers, baseUrl } = getAuth();
   const sub = args[1];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "makaron-cli",
-  "version": "0.10.0",
+  "version": "0.11.1",
   "description": "Talk to Makaron Agent from the terminal — create projects, edit images, generate videos",
   "type": "module",
   "scripts": {

package/skills/makaron/SKILL.md

@@ -96,6 +96,32 @@ Returns immediately:
 | Add music | `npx makaron-cli chat --project <id> "add calm piano background music"` |
 | Create motion design | `npx makaron-cli chat --project <id> "make an animated Instagram story with this image"` |
 
+### Marketplace skills
+
+Use marketplace skills when the user asks for a named Makaron effect, template, or skill such as "Football Captain", "足球队长", "World Cup MVP", or a marketplace UUID.
+
+External users only need `MAKARON_API_KEY`; no admin permissions are required for listing, searching, showing, installing, or using marketplace skills.
+
+```bash
+# Browse public marketplace skills
+npx makaron-cli skills list
+npx makaron-cli skills search "football"
+npx makaron-cli skills search "足球"
+npx makaron-cli skills show <marketplace-id-or-label>
+
+# Install a marketplace skill into the API key owner's workspace
+npx makaron-cli skills install <marketplace-id-or-label>
+
+# Use a marketplace skill. If the skill is not installed yet, chat auto-installs it,
+# then injects the installed skill name into the agent run.
+npx makaron-cli chat --project auto \
+  --image selfie.jpg \
+  --skill <marketplace-id-or-label> \
+  -b "make this with the selected skill"
+```
+
+`--skill` accepts an installed skill name, a marketplace UUID, or a unique marketplace label. If a marketplace skill is matched, the CLI installs or reuses it and sends `[Active skill: <installed-skill-name>]` to Makaron Agent. Do not call admin skill commands for ordinary users. There is intentionally no user-facing CLI delete command for marketplace skills.
+
 ### With additional images (existing project)
 
 ```bash