makaron-cli 0.13.2 → 0.13.3

package/.claude-plugin/plugin.json

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

@@ -96,12 +96,9 @@ npx makaron-cli chat --project <id> --json -b "<prompt>"
 # Auto-create project (with or without images)
 npx makaron-cli chat --project auto --image photo.jpg --json -b "make it cinematic"
 npx makaron-cli chat --project auto --image img1.jpg --image img2.jpg --json -b "combine these"
-
-# Choose each model role explicitly
-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|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.
+`chat` always routes agent, image, and video models automatically. Never pass `--agent-model`, `--image-model`, `--video-model`, or the legacy `--model` flag to `chat`; the CLI rejects them before starting a run. Model flags remain available only on explicit low-level commands such as `edit` and `video create`.
 
 Returns immediately:
 ```json
@@ -118,7 +115,7 @@ Returns immediately:
 | Fix one moment in a video from a screenshot | `npx makaron-cli chat --project <id> --image screenshot.png "@4 this frame should be Paris; only fix this moment"` |
 | Cut or assemble video | `npx makaron-cli chat --project <id> --video clip.mp4 "cut out the dead air and keep the best 20 seconds"` |
 | Add music | `npx makaron-cli chat --project <id> "add calm piano background music"` |
-| Beat-sync video from audio | `npx makaron-cli chat --project auto --audio beat.mp3 --video-model seedance-fast --video-resolution 480p "make a beat-synced video"` |
+| Beat-sync video from audio | `npx makaron-cli chat --project auto --audio beat.mp3 --video-resolution 480p "make a beat-synced video"` |
 | Create motion design | `npx makaron-cli chat --project <id> "make an animated Instagram story with this image"` |
 
 ### Marketplace skills
@@ -219,7 +216,6 @@ Attach a short song, beat, or voice recording when the video should follow audio
 ```bash
 npx makaron-cli chat --project auto \
   --audio beat.mp3 \
-  --video-model seedance-fast \
   --video-resolution 480p \
   -b "make a 15s beat-synced video"
 ```

package/bin/makaron.mjs

@@ -27,7 +27,6 @@ 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', 'gpt-5.6-terra', 'gpt-5.6-sol', 'gpt-5.6-luna', 'grok-4.5', 'deepseek-v4-pro'];
 const AGENT_WAIT_TIMEOUT_SECONDS = Math.max(900, Number(process.env.MAKARON_AGENT_WAIT_TIMEOUT_SECONDS || 10_800));
 
 // Public anon key (safe to embed — only enables auth, not data access)
@@ -56,14 +55,6 @@ function warnLegacyModelFlag(replacement) {
   process.stderr.write(`⚠️  --model is deprecated here; use ${replacement}.\n`);
 }
 
-function validateAgentModel(value) {
-  if (!AGENT_MODELS.includes(value)) {
-    process.stderr.write(`❌ Unknown agent model: ${value}\nChoose one of: ${AGENT_MODELS.join(', ')}\n`);
-    process.exit(1);
-  }
-  return value;
-}
-
 function getCliVersion() {
   try {
     const pkg = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url), 'utf-8'));
@@ -291,15 +282,15 @@ Options:
   --video <file|url>        Attach a video to the project timeline. Repeatable.
   --audio <file|url>        Attach a song, beat, or voice reference. MP3/WAV, repeatable.
   --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, 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.
   --stream                  Legacy live SSE stream.
   --help, -h                Show this help.
 
+Model routing is automatic in chat. Do not pass --agent-model, --image-model,
+--video-model, or the legacy --model flag.
+
 What you can ask:
   Image edit
     makaron chat --project <id> --image photo.jpg "remove the person in the background"
@@ -323,7 +314,7 @@ What you can ask:
     makaron chat --project <id> "add calm piano background music"
 
   Reference audio / beat sync
-    makaron chat --project auto --audio beat.mp3 --video-model seedance-fast --video-resolution 480p "用这个音乐做卡点视频"
+    makaron chat --project auto --audio beat.mp3 --video-resolution 480p "用这个音乐做卡点视频"
     makaron chat --project <id> --audio https://example.com/beat.mp3 "add this as the soundtrack"
 
   Motion design
@@ -360,10 +351,7 @@ async function streamAgent(baseUrl, headers, projectId, prompt, opts = {}) {
       projectId,
       prompt,
       headless: true,
-      ...(opts.preferredModel ? { preferredModel: opts.preferredModel } : {}),
-      ...(opts.videoModel ? { videoModel: opts.videoModel } : {}),
       ...(opts.videoResolution ? { videoResolution: opts.videoResolution } : {}),
-      ...(opts.agentModel && opts.agentModel !== 'auto' ? { agentModel: opts.agentModel } : {}),
       ...(opts.uploadedVideoCount ? { uploadedVideoCount: opts.uploadedVideoCount } : {}),
       ...(opts.turnMediaCount ? { turnMediaCount: opts.turnMediaCount } : {}),
     }),
@@ -472,9 +460,6 @@ async function streamAgent(baseUrl, headers, projectId, prompt, opts = {}) {
 
 async function submitRun(baseUrl, headers, projectId, prompt, opts = {}) {
   const body = { projectId, prompt };
-  if (opts.preferredModel) body.preferredModel = opts.preferredModel;
-  if (opts.agentModel && opts.agentModel !== 'auto') body.agentModel = opts.agentModel;
-  if (opts.videoModel) body.videoModel = opts.videoModel;
   if (opts.videoResolution) body.videoResolution = opts.videoResolution;
   if (opts.currentSnapshotIndex != null) body.currentSnapshotIndex = opts.currentSnapshotIndex;
   if (opts.isNsfw) body.isNsfw = opts.isNsfw;
@@ -1634,26 +1619,17 @@ Commands:
 
   admin                              Admin commands (skills, upload, set-admin)
 
-Model selection:
-  --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,
-                                     kling, grok, or google-omni
-
 Examples:
-  makaron chat --project auto --agent-model deepseek-v4-pro "plan a launch poster"
-  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"
+  makaron chat --project auto "plan a launch poster"
+  makaron chat --project <id> "make it cinematic"
+  makaron chat --project <id> "turn this into a short video"
 
 Run makaron <command> --help for command-specific options.
-The legacy --model flag is deprecated; use the role-specific flags above.
+Chat chooses agent, image, and video models automatically.
 
 Environment:
   MAKARON_API_KEY       API key (mk_live_xxx) — recommended for agents
   MAKARON_URL           API base (default: ${DEFAULT_URL})
-  MAKARON_AGENT_MODEL   Default Agent model; --agent-model takes precedence
 `);
 }
 
@@ -1744,8 +1720,6 @@ function printHelp(topic, subtopic) {
     else if (subtopic === 'install') console.log('Usage: makaron skills install <marketplace-id|label> [--json]');
     else console.log(`Skill commands:
   skills list --built-in              List all built-in Makaron skills and Studio Run recipes
-  skills list --built-in --openmontage
-                                      List OpenMontage-native adapters only
   skills list                         List marketplace skills
   skills search <query>               Search marketplace skills
   skills show <id|label> --built-in   Show a built-in skill
@@ -1888,10 +1862,7 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
   let background = false;
   let jsonOutput = false;
   let activeSkill = undefined;
-  let videoModel = undefined;
   let videoResolution = undefined;
-  let preferredModel = undefined;
-  let agentModel = process.env.MAKARON_AGENT_MODEL || 'auto';
   for (let i = 1; i < args.length; i++) {
     if (args[i] === '--project' && args[i + 1]) projectId = args[++i];
     else if (args[i] === '--image' && args[i + 1]) chatImages.push(args[++i]);
@@ -1902,13 +1873,14 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
     else if (args[i] === '--stream') useStream = true;
     else if (args[i] === '--background' || args[i] === '-b') background = true;
     else if (args[i] === '--json') jsonOutput = true;
-    else if (args[i] === '--video-model' && args[i + 1]) videoModel = args[++i];
     else if (args[i] === '--video-resolution' && args[i + 1]) videoResolution = args[++i];
-    else if (args[i] === '--image-model' && args[i + 1]) preferredModel = args[++i];
-    else if (args[i] === '--agent-model' && args[i + 1]) agentModel = args[++i];
-    else if (args[i] === '--model' && args[i + 1]) {
-      warnLegacyModelFlag('--image-model');
-      preferredModel = args[++i];
+    else if (
+      ['--agent-model', '--image-model', '--video-model', '--model'].includes(args[i])
+      || ['--agent-model=', '--image-model=', '--video-model=', '--model='].some(prefix => args[i].startsWith(prefix))
+    ) {
+      const flag = args[i].split('=')[0];
+      process.stderr.write(`❌ makaron chat chooses agent, image, and video models automatically. Remove ${flag} and retry.\n`);
+      process.exit(1);
     }
     else promptParts.push(args[i]);
   }
@@ -1918,7 +1890,6 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
     console.error('Run: makaron chat --help');
     process.exit(1);
   }
-  agentModel = validateAgentModel(agentModel);
   const { headers, baseUrl } = getAuth();
   // Split images into URLs vs local files
   const imageUrlList = chatImages.filter(p => p.startsWith('http://') || p.startsWith('https://'));
@@ -2108,10 +2079,7 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
   if (useStream) {
     // Legacy SSE mode
     const { results } = await streamAgent(baseUrl, headers, projectId, finalPrompt, {
-      videoModel,
       videoResolution,
-      preferredModel,
-      agentModel,
       uploadedVideoCount: uploadedTurnVideoCount,
       turnMediaCount: uploadedTurnMediaCount,
     });
@@ -2124,10 +2092,7 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
   } else {
     // Default: fire-and-forget + poll
     const { runId } = await submitRun(baseUrl, headers, projectId, finalPrompt, {
-      videoModel,
       videoResolution,
-      preferredModel,
-      agentModel,
       audioAttachments,
       uploadedVideoCount: uploadedTurnVideoCount,
       turnMediaCount: uploadedTurnMediaCount,
@@ -2320,10 +2285,7 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
 
   if (sub === 'list') {
     const builtIn = args.includes('--built-in');
-    let skills = builtIn ? await fetchBuiltInSkills(baseUrl) : await fetchMarketplaceSkills(baseUrl);
-    if (builtIn && args.includes('--openmontage')) {
-      skills = skills.filter(skill => skill.sourceProject === 'openmontage');
-    }
+    const skills = builtIn ? await fetchBuiltInSkills(baseUrl) : await fetchMarketplaceSkills(baseUrl);
     if (jsonOutput) console.log(JSON.stringify({ skills }, null, 2));
     else if (builtIn) printBuiltInSkills(skills);
     else printMarketplaceSkills(skills);
@@ -2365,8 +2327,6 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
   } else {
     console.log(`Skill commands:
   skills list --built-in              List all built-in Makaron skills and Studio Run recipes
-  skills list --built-in --openmontage
-                                      List OpenMontage-native adapters only
   skills list                         List marketplace skills
   skills search <query>               Search marketplace skills
   skills show <id|label> --built-in   Show a built-in skill

package/package.json

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

package/skills/makaron/SKILL.md

@@ -83,12 +83,9 @@ npx makaron-cli chat --project <id> --json -b "<prompt>"
 # Auto-create project (with or without images)
 npx makaron-cli chat --project auto --image photo.jpg --json -b "make it cinematic"
 npx makaron-cli chat --project auto --image img1.jpg --image img2.jpg --json -b "combine these"
-
-# Choose each model role explicitly
-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|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.
+`chat` always routes agent, image, and video models automatically. Never pass `--agent-model`, `--image-model`, `--video-model`, or the legacy `--model` flag to `chat`; the CLI rejects them before starting a run. Model flags remain available only on explicit low-level commands such as `edit` and `video create`.
 
 Returns immediately:
 ```json
@@ -105,7 +102,7 @@ Returns immediately:
 | Fix one moment in a video from a screenshot | `npx makaron-cli chat --project <id> --image screenshot.png "@4 this frame should be Paris; only fix this moment"` |
 | Cut or assemble video | `npx makaron-cli chat --project <id> --video clip.mp4 "cut out the dead air and keep the best 20 seconds"` |
 | Add music | `npx makaron-cli chat --project <id> "add calm piano background music"` |
-| Beat-sync video from audio | `npx makaron-cli chat --project auto --audio beat.mp3 --video-model seedance-fast --video-resolution 480p "make a beat-synced video"` |
+| Beat-sync video from audio | `npx makaron-cli chat --project auto --audio beat.mp3 --video-resolution 480p "make a beat-synced video"` |
 | Create motion design | `npx makaron-cli chat --project <id> "make an animated Instagram story with this image"` |
 
 ### Marketplace skills
@@ -179,7 +176,6 @@ Attach a short song, beat, or voice recording when the video should follow audio
 ```bash
 npx makaron-cli chat --project auto \
   --audio beat.mp3 \
-  --video-model seedance-fast \
   --video-resolution 480p \
   -b "make a 15s beat-synced video"
 ```