makaron-cli 0.13.0 → 0.13.1

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "makaron-cli",
-  "version": "0.11.5",
+  "version": "0.13.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",

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "makaron-cli",
-  "version": "0.11.5",
+  "version": "0.13.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",

package/README.md

@@ -95,7 +95,7 @@ npx makaron-cli chat --project auto --image img1.jpg --image img2.jpg --json -b
 npx makaron-cli chat --project auto --agent-model deepseek-v4-pro --image-model qwen "design a product poster"
 ```
 
-Model flags are role-specific: `--agent-model` controls reasoning and tool use, `--image-model` controls image generation/editing, and `--video-model` controls video generation. `--agent-model` accepts `auto|sonnet-4.6|sonnet-5|opus-4.8|grok-4.5|deepseek-v4-pro`. `MAKARON_AGENT_MODEL` can set the default for automation; the command flag takes precedence. The legacy `--model` flag remains temporarily supported with a deprecation warning.
+Model flags are role-specific: `--agent-model` controls reasoning and tool use, `--image-model` controls image generation/editing, and `--video-model` controls video generation. `--agent-model` accepts `auto|gpt-5.6-terra|gpt-5.6-sol|gpt-5.6-luna|grok-4.5|deepseek-v4-pro`. `auto` currently uses GPT-5.6 Terra. `MAKARON_AGENT_MODEL` can set the default for automation; the command flag takes precedence. The legacy `--model` flag remains temporarily supported with a deprecation warning.
 
 Returns immediately:
 ```json
@@ -451,8 +451,23 @@ Admin commands require an API key with admin privileges. Ask your admin to run `
 
 ```bash
 npx makaron-cli admin skills
+npx makaron-cli admin skills --json
 ```
 
+The human-readable list includes assigned categories plus title/prompt locale completeness.
+
+### Manage marketplace categories
+
+```bash
+npx makaron-cli admin skill-categories
+npx makaron-cli admin skill-categories --json
+npx makaron-cli admin skill-categories add '{"id":"portrait-effects","labels":{"en":"Portrait Effects","zh":"人像特效","zh-Hant":"人像特效","ja":"ポートレート効果"},"icon":"✨","sort_order":10}'
+npx makaron-cli admin skill-categories update portrait-effects '{"icon":"📸"}'
+npx makaron-cli admin skill-categories delete portrait-effects
+```
+
+Deleting a category is blocked while any marketplace skill still uses it.
+
 ### Upload assets to Storage
 
 ```bash
@@ -475,9 +490,10 @@ Storage paths follow this convention:
 
 ```bash
 npx makaron-cli admin skills add '{
-  "labels": {"zh": "中文名", "en": "English Name"},
+  "labels": {"en": "English Name", "zh": "中文名", "zh-Hant": "繁體名稱", "ja": "日本語名"},
   "image": "https://sdyrtztrjgmmpnirswxt.supabase.co/storage/v1/object/public/images/marketplace/covers/skill-name.jpg",
-  "prompt": "Default prompt shown to users",
+  "prompts": {"en": "Default prompt", "zh": "默认提示词", "zh-Hant": "預設提示詞", "ja": "デフォルトプロンプト"},
+  "categories": ["portrait-effects"],
   "skill_path": "https://sdyrtztrjgmmpnirswxt.supabase.co/storage/v1/object/public/images/marketplace/skills/skill-name.zip",
   "image_count": 2,
   "sort_order": 10,
@@ -486,6 +502,8 @@ npx makaron-cli admin skills add '{
 }'
 ```
 
+New skills require all four localized titles, all four localized default prompts, and at least one existing category. Partial `labels` or `prompts` updates are merged with existing locales, so updating one language does not erase the others.
+
 ### Update / delete a skill
 
 ```bash
@@ -520,7 +538,7 @@ npx makaron-cli admin fetch-skill https://www.makaron.app/s/4c4cbd57
    ```
 6. **Add to marketplace**:
    ```bash
-   npx makaron-cli admin skills add '{"labels":{"zh":"...","en":"..."},"image":"<cover_url>","skill_path":"<zip_url>","before_images":["<before_url>"],"image_count":2,"sort_order":10,"is_active":true}'
+   npx makaron-cli admin skills add '{"labels":{"en":"...","zh":"...","zh-Hant":"...","ja":"..."},"prompts":{"en":"...","zh":"...","zh-Hant":"...","ja":"..."},"categories":["portrait-effects"],"image":"<cover_url>","skill_path":"<zip_url>","before_images":["<before_url>"],"image_count":2,"sort_order":10,"is_active":true}'
    ```
 7. **Verify** — visit https://www.makaron.app/home and confirm the skill appears, can be clicked, and works
 

package/bin/makaron.mjs

@@ -27,7 +27,7 @@ const APP_URL = process.env.MAKARON_APP_URL || DEFAULT_URL;
 const NPM_PACKAGE_NAME = 'makaron-cli';
 const UPDATE_CHECK_INTERVAL_MS = 24 * 60 * 60 * 1000;
 const UPDATE_CHECK_TIMEOUT_MS = 400;
-const AGENT_MODELS = ['auto', 'sonnet-4.6', 'sonnet-5', 'opus-4.8', 'grok-4.5', 'deepseek-v4-pro'];
+const AGENT_MODELS = ['auto', 'gpt-5.6-terra', 'gpt-5.6-sol', 'gpt-5.6-luna', 'grok-4.5', 'deepseek-v4-pro'];
 
 // Public anon key (safe to embed — only enables auth, not data access)
 const SUPABASE_URL = 'https://sdyrtztrjgmmpnirswxt.supabase.co';
@@ -292,7 +292,7 @@ Options:
   --skill <id|label|name>   Use an installed skill or auto-install a matched marketplace skill.
   --image-model <name>      Image model: gemini, gemini-lite, qwen, openai, pony, or wai.
   --video-model <name>      Preferred video model: seedance-fast, seedance-mini, seedance, kling, grok, or google-omni.
-  --agent-model <name>      Agent model: auto, sonnet-4.6, sonnet-5, opus-4.8, grok-4.5, or deepseek-v4-pro.
+  --agent-model <name>      Agent model: auto, gpt-5.6-terra, gpt-5.6-sol, gpt-5.6-luna, grok-4.5, or deepseek-v4-pro.
   --video-resolution <res>  Video resolution: auto, 480p, 720p, 1080p, or 4k.
   --background, -b          Submit and print a runId.
   --json                    Output structured JSON.
@@ -990,6 +990,17 @@ function timeSince(date) {
 
 // ─── Skill Marketplace ──────────────────────────────────────────────────────
 
+const MARKETPLACE_LOCALES = ['en', 'zh', 'zh-Hant', 'ja'];
+
+function localizedValues(value) {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return [];
+  return Object.values(value).filter(item => typeof item === 'string' && item.trim());
+}
+
+function localizedCoverage(value) {
+  return MARKETPLACE_LOCALES.filter(locale => typeof value?.[locale] === 'string' && value[locale].trim()).length;
+}
+
 function getSkillLabel(skill) {
   return skill.labels?.en || skill.labels?.zh || skill.label || skill.name || skill.id;
 }
@@ -1032,15 +1043,15 @@ async function fetchMarketplaceSkills(baseUrl, opts = {}) {
 }
 
 function marketplaceSearchText(skill) {
+  const localized = [...localizedValues(skill.labels), ...localizedValues(skill.prompts)];
   return [
     skill.id,
     skill.label,
-    skill.labels?.en,
-    skill.labels?.zh,
+    ...localized,
     skill.prompt,
+    ...(Array.isArray(skill.categories) ? skill.categories : []),
     slugifySkill(skill.label),
-    slugifySkill(skill.labels?.en),
-    slugifySkill(skill.labels?.zh),
+    ...localized.map(slugifySkill),
   ].filter(Boolean).join(' ').toLowerCase();
 }
 
@@ -1048,9 +1059,10 @@ function marketplaceSkillTokens(skill) {
   return [
     skill.id,
     skill.label,
-    skill.labels?.en,
-    skill.labels?.zh,
+    ...localizedValues(skill.labels),
+    ...localizedValues(skill.prompts),
     skill.prompt,
+    ...(Array.isArray(skill.categories) ? skill.categories : []),
   ].filter(Boolean).map(value => String(value).toLowerCase());
 }
 
@@ -1098,8 +1110,13 @@ 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}`);
+  for (const locale of MARKETPLACE_LOCALES) {
+    const label = skill.labels?.[locale];
+    if (label && label !== skill.label) console.log(`${locale}: ${label}`);
+  }
+  if (Array.isArray(skill.categories) && skill.categories.length) console.log(`Categories: ${skill.categories.join(', ')}`);
+  console.log(`i18n: titles ${localizedCoverage(skill.labels)}/4 · prompts ${localizedCoverage(skill.prompts)}/4`);
+  if (skill.prompts?.en || skill.prompt) console.log(`Prompt (en): ${skill.prompts?.en || skill.prompt}`);
   if (skill.image) console.log(`Cover: ${skill.image}`);
   if (skill.hasSkill) console.log(`Install: makaron skills install ${skill.id}`);
 }
@@ -1571,8 +1588,8 @@ Commands:
   admin                              Admin commands (skills, upload, set-admin)
 
 Model selection:
-  --agent-model <name>               Reasoning/tool model: auto, sonnet-4.6, sonnet-5,
-                                     opus-4.8, grok-4.5, or deepseek-v4-pro
+  --agent-model <name>               Reasoning/tool model: auto, gpt-5.6-terra, gpt-5.6-sol,
+                                     gpt-5.6-luna, grok-4.5, or deepseek-v4-pro
   --image-model <name>               Image model: gemini, gemini-lite, qwen, openai,
                                      pony, or wai
   --video-model <name>               Video model: seedance-fast, seedance-mini, seedance,
@@ -1580,7 +1597,7 @@ Model selection:
 
 Examples:
   makaron chat --project auto --agent-model deepseek-v4-pro "plan a launch poster"
-  makaron chat --project <id> --agent-model sonnet-5 --image-model qwen "make it cinematic"
+  makaron chat --project <id> --agent-model gpt-5.6-terra --image-model qwen "make it cinematic"
   makaron chat --project <id> --video-model seedance-fast "turn this into a short video"
 
 Run makaron <command> --help for command-specific options.
@@ -1719,7 +1736,8 @@ Use with chat:
   music status <taskId>                                      Check music status
 `);
   } else if (topic === 'admin') {
-    if (subtopic === 'skills') console.log('Usage: makaron admin skills [add|update|delete] ...');
+    if (subtopic === 'skills') console.log('Usage: makaron admin skills [--json|add|update|delete] ...');
+    else if (subtopic === 'skill-categories') console.log('Usage: makaron admin skill-categories [--json|add|update|delete] ...');
     else if (subtopic === 'upload') console.log('Usage: makaron admin upload <local-file> <storage-path>');
     else if (subtopic === 'fetch-skill') console.log('Usage: makaron admin fetch-skill <share-code|url>');
     else if (subtopic === 'set-admin') console.log('Usage: makaron admin set-admin <email>');
@@ -1728,6 +1746,10 @@ Use with chat:
   admin skills add '<json>'            Add a new skill
   admin skills update <id> '<json>'    Update a skill
   admin skills delete <id>             Delete a skill
+  admin skill-categories               List marketplace categories
+  admin skill-categories add '<json>'  Add a category
+  admin skill-categories update <id> '<json>'
+  admin skill-categories delete <id>   Delete a category
   admin upload <file> <storage-path>   Upload file to Storage
   admin fetch-skill <code|url>         Download skill from share link
   admin set-admin <email>              Grant admin access to a user
@@ -2492,18 +2514,23 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
   const sub = args[1];
 
   if (sub === 'skills') {
-    const action = args[2]; // add, update, delete, or none (list)
+    const action = args[2] === '--json' ? null : args[2]; // add, update, delete, or none (list)
     if (!action) {
       // List all skills
       const res = await fetch(`${baseUrl}/api/admin/home-skills`, { headers });
       if (!res.ok) { console.error(`Error ${res.status}:`, await res.text()); process.exit(1); }
       const skills = await res.json();
+      if (args.includes('--json')) {
+        console.log(JSON.stringify(skills, null, 2));
+        process.exit(0);
+      }
       console.log(`📋 ${skills.length} skills\n`);
       for (const s of skills) {
         const label = s.labels?.en || s.labels?.zh || '(no label)';
         const active = s.is_active ? '✅' : '❌';
         const hasZip = s.skill_path ? '📦' : '  ';
-        console.log(`  ${active} ${hasZip} ${String(s.sort_order).padStart(3)}  ${s.id}  ${label}`);
+        const categories = Array.isArray(s.categories) && s.categories.length ? s.categories.join(',') : 'uncategorized';
+        console.log(`  ${active} ${hasZip} ${String(s.sort_order).padStart(3)}  ${s.id}  ${label}  [${categories}]  title ${localizedCoverage(s.labels)}/4 · prompt ${localizedCoverage(s.prompts)}/4`);
       }
     } else if (action === 'add') {
       const json = args.slice(3).join(' ');
@@ -2541,6 +2568,59 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
       process.exit(1);
     }
 
+  } else if (sub === 'skill-categories') {
+    const action = args[2] === '--json' ? null : args[2];
+    if (!action) {
+      const res = await fetch(`${baseUrl}/api/admin/skill-categories`, { headers });
+      if (!res.ok) { console.error(`Error ${res.status}:`, await res.text()); process.exit(1); }
+      const categories = await res.json();
+      if (args.includes('--json')) {
+        console.log(JSON.stringify(categories, null, 2));
+        process.exit(0);
+      }
+      console.log(`📂 ${categories.length} skill categories\n`);
+      for (const category of categories) {
+        const label = category.labels?.en || category.labels?.zh || category.id;
+        const active = category.is_active ? '✅' : '❌';
+        const icon = category.icon || ' ';
+        console.log(`  ${active} ${icon} ${String(category.sort_order).padStart(3)}  ${category.id}  ${label}  title ${localizedCoverage(category.labels)}/4`);
+      }
+    } else if (action === 'add') {
+      const json = args.slice(3).join(' ');
+      if (!json) { console.error('Usage: makaron admin skill-categories add \'{"id":"...","labels":{...}}\''); process.exit(1); }
+      let body;
+      try { body = JSON.parse(json); } catch { console.error('Invalid JSON'); process.exit(1); }
+      const res = await fetch(`${baseUrl}/api/admin/skill-categories`, {
+        method: 'POST', headers: { 'Content-Type': 'application/json', ...headers }, body: JSON.stringify(body),
+      });
+      if (!res.ok) { console.error(`Error ${res.status}:`, await res.text()); process.exit(1); }
+      const data = await res.json();
+      console.log(`✅ Skill category created: ${data.id}`);
+    } else if (action === 'update') {
+      const id = args[3];
+      const json = args.slice(4).join(' ');
+      if (!id || !json) { console.error('Usage: makaron admin skill-categories update <id> \'{"field":"value"}\''); process.exit(1); }
+      let body;
+      try { body = JSON.parse(json); } catch { console.error('Invalid JSON'); process.exit(1); }
+      body.id = id;
+      const res = await fetch(`${baseUrl}/api/admin/skill-categories`, {
+        method: 'PUT', headers: { 'Content-Type': 'application/json', ...headers }, body: JSON.stringify(body),
+      });
+      if (!res.ok) { console.error(`Error ${res.status}:`, await res.text()); process.exit(1); }
+      console.log(`✅ Skill category ${id} updated`);
+    } else if (action === 'delete') {
+      const id = args[3];
+      if (!id) { console.error('Usage: makaron admin skill-categories delete <id>'); process.exit(1); }
+      const res = await fetch(`${baseUrl}/api/admin/skill-categories`, {
+        method: 'DELETE', headers: { 'Content-Type': 'application/json', ...headers }, body: JSON.stringify({ id }),
+      });
+      if (!res.ok) { console.error(`Error ${res.status}:`, await res.text()); process.exit(1); }
+      console.log(`✅ Skill category ${id} deleted`);
+    } else {
+      console.error(`Unknown action: ${action}. Use: add, update, delete, or omit to list.`);
+      process.exit(1);
+    }
+
   } else if (sub === 'upload') {
     const filePath = args[2];
     const storagePath = args[3];
@@ -2600,6 +2680,10 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
   admin skills add '<json>'            Add a new skill
   admin skills update <id> '<json>'    Update a skill
   admin skills delete <id>             Delete a skill
+  admin skill-categories               List marketplace categories
+  admin skill-categories add '<json>'  Add a category
+  admin skill-categories update <id> '<json>'
+  admin skill-categories delete <id>   Delete a category
   admin upload <file> <storage-path>   Upload file to Storage
   admin fetch-skill <code|url>         Download skill from share link
   admin set-admin <email>              Grant admin access to a user

package/package.json

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

package/skills/makaron/SKILL.md

@@ -82,7 +82,7 @@ npx makaron-cli chat --project auto --image img1.jpg --image img2.jpg --json -b
 npx makaron-cli chat --project auto --agent-model deepseek-v4-pro --image-model qwen "design a product poster"
 ```
 
-Model flags are role-specific: `--agent-model` controls reasoning and tool use, `--image-model` controls image generation/editing, and `--video-model` controls video generation. `--agent-model` accepts `auto|sonnet-4.6|sonnet-5|opus-4.8|grok-4.5|deepseek-v4-pro`. `MAKARON_AGENT_MODEL` can set the default for automation; the command flag takes precedence. The legacy `--model` flag remains temporarily supported with a deprecation warning.
+Model flags are role-specific: `--agent-model` controls reasoning and tool use, `--image-model` controls image generation/editing, and `--video-model` controls video generation. `--agent-model` accepts `auto|gpt-5.6-terra|gpt-5.6-sol|gpt-5.6-luna|grok-4.5|deepseek-v4-pro`. `auto` currently uses GPT-5.6 Terra. `MAKARON_AGENT_MODEL` can set the default for automation; the command flag takes precedence. The legacy `--model` flag remains temporarily supported with a deprecation warning.
 
 Returns immediately:
 ```json
@@ -126,7 +126,9 @@ npx makaron-cli chat --project auto \
   -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.
+`--skill` accepts an installed skill name, a marketplace UUID, or a unique marketplace label. Marketplace search matches every localized title, every localized default prompt, and category ids. 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.
+
+For an explicitly authorized marketplace administrator, `admin skills` shows category assignment and 4-locale title/prompt completeness, while `admin skill-categories` supports list/add/update/delete. New skills must include `en`, `zh`, `zh-Hant`, and `ja` in both `labels` and `prompts`, plus at least one existing `categories` id. Partial localized updates are safely merged server-side.
 
 ### With additional images (existing project)