makaron-cli 0.13.5 → 0.13.7

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "makaron-cli",
-  "version": "0.13.5",
+  "version": "0.13.7",
   "description": "Give Claude Code a creative agent. Pass complete creative requests and source media to Makaron Chat.",
   "author": {
     "name": "Versa AI",

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "makaron-cli",
-  "version": "0.13.5",
+  "version": "0.13.7",
   "description": "Give Codex a creative agent. Pass complete creative requests and source media to Makaron Chat.",
   "author": {
     "name": "Versa AI",

package/README.md

@@ -98,7 +98,12 @@ npx makaron-cli chat --project auto --image photo.jpg --json -b "make it cinemat
 npx makaron-cli chat --project auto --image img1.jpg --image img2.jpg --json -b "combine these"
 ```
 
-`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`.
+`chat` routes image and video models automatically, but you may select the Agent LLM with `--agent-model`. Accepted values are exactly `auto`, `gpt-5.6-terra`, `gpt-5.6-sol`, `gpt-5.6-luna`, `grok-4.5`, and `deepseek-v4-pro`; `auto` currently resolves to `gpt-5.6-terra`. This flag changes only the reasoning/tool-calling Agent LLM. The CLI still rejects `--image-model`, `--video-model`, and the legacy `--model` flag before starting a chat run, so image/video model names cannot be mistaken for Agent models.
+
+```bash
+# Explicit lower-cost Agent LLM for a controlled comparison
+npx makaron-cli chat --project auto --agent-model deepseek-v4-pro --json -b "make a 20s badminton video"
+```
 
 Returns immediately:
 ```json
@@ -156,11 +161,10 @@ External source ranges can be added without uploading either the original video
 ```bash
 npx makaron-cli project media add <projectId> \
   --source-url "https://cdn.example.com/source.mp4" \
-  --start-sec 12.5 --end-sec 19 \
-  --source-uri "dam://project/asset" \
+  --start 12.5 --end 19 \
   --description "Racket frame molding"
 
-# Batch form: a JSON array or {"source_ranges": [...]}
+# Batch form: a JSON array or {"clips": [...]}
 npx makaron-cli project media add <projectId> --input ranges.json --json
 ```
 
@@ -181,10 +185,12 @@ npx makaron-cli chat --project auto \
   "Make a 30-second 9:16 TikTok with English VO and burned-in captions"
 ```
 
-The manifest is a JSON array or `{ "title": "...", "source_ranges": [...] }`.
-It is validated before project creation and supports up to 20 ranges for one
-Makaron task. Batch planning remains the upstream orchestrator's responsibility:
-convert each plan into one manifest and start one independent Makaron task.
+The manifest is a JSON array or `{ "title": "...", "clips": [...] }`. Every
+clip contains exactly `source_url`, `start`, `end`, and `description`; the time
+values are seconds and array order is edit order. It is validated before project
+creation and supports up to 20 clips for one Makaron task. Batch planning remains
+the upstream orchestrator's responsibility: convert each plan into one manifest
+and start one independent Makaron task.
 
 ### Export editable Remotion compositions
 
@@ -341,7 +347,7 @@ npx makaron-cli video create --script "Shot 1 (15s): <<<image_1>>> and <<<image_
 
 # 3b. Native SeeDance or MiniMax H3 text-to-video (no image required)
 npx makaron-cli video create --script "Shot 1 (5s): A neon one-person studio wakes at dawn" --duration 5 --video-model seedance-fast --aspect 16:9
-npx makaron-cli video create --script "Shot 1 (15s): A premium creative editor comes alive" --duration 15 --video-model minimax-h3 --video-resolution 2k --aspect 16:9
+npx makaron-cli video create --script "Shot 1 (15s): A premium creative editor comes alive" --duration 15 --video-model minimax-h3 --aspect 16:9
 
 # 3c. Edit a video from a local file or public URL
 npx makaron-cli video create --script "make it funny" --video input.mp4 --duration 5 --video-model seedance-fast
@@ -357,7 +363,7 @@ For project/timeline video editing, use:
 npx makaron-cli chat --project <id|auto> --video input.mp4 -b "make it funny"
 ```
 
-Options for `video create`: `--script "..."`, `--script-file <path>`, `--image <url>` (repeatable, up to the selected model limit), `--video <file|url>` and `--audio <file|url>` (repeatable where supported), `--duration <seconds>`, `--aspect 9:16|16:9|1:1`, `--video-model seedance-fast|seedance-mini|seedance|seedance-2.5|kling|grok|google-omni|minimax-h3`, `--video-resolution auto|480p|720p|768p|1080p|2k|4k`. Default model is `seedance-fast`. SeeDance accepts native text-to-video with no image and integer output duration 4-15s (default 5s); `seedance-mini` supports 480p/720p and is best for cheaper drafts/multi-size tests; MiniMax H3 accepts native text-to-video, 4-15s output, and up to 9 image, up to 3 video, and up to 3 audio references through Makaron Agent/chat. H3 defaults to public 2k output; 768p requires provider preview access plus `MINIMAX_H3_ENABLE_768P=true` on the Makaron server. Kling supports 5-15s; Grok 1.5 supports 1-15s single-image-to-video only; Gemini Omni supports 3-10s fast 720p image/video generation and editing with native generated audio, including up to 6 image references when no video reference is provided. For `--video-model grok`, forced `--aspect` is ignored to avoid xAI stretching the source image; pad/create the image at the target shape first or use another model.
+Options for `video create`: `--script "..."`, `--script-file <path>`, `--image <url>` (repeatable, up to the selected model limit), `--video <file|url>` and `--audio <file|url>` (repeatable where supported), `--duration <seconds>`, `--aspect 9:16|16:9|1:1`, `--video-model seedance-fast|seedance-mini|seedance|seedance-2.5|kling|grok|google-omni|minimax-h3`, `--video-resolution auto|480p|720p|768p|1080p|2k|4k`. Default model is `seedance-fast`. SeeDance accepts native text-to-video with no image and integer output duration 4-15s (default 5s); `seedance-mini` supports 480p/720p and is best for cheaper drafts/multi-size tests; MiniMax H3 accepts native text-to-video, 4-15s output, public 768p/2k resolution, and up to 9 image, up to 3 video, and up to 3 audio references through Makaron Agent/chat. H3 defaults to 768p; request 2k explicitly for maximum/final quality. Kling supports 5-15s; Grok 1.5 supports 1-15s single-image-to-video only; Gemini Omni supports 3-10s fast 720p image/video generation and editing with native generated audio, including up to 6 image references when no video reference is provided. For `--video-model grok`, forced `--aspect` is ignored to avoid xAI stretching the source image; pad/create the image at the target shape first or use another model.
 
 Seedance 2.5: use `--video-model seedance-2.5` for 4-30 second output at 480p/720p. `--image` accepts local files or URLs (up to 30), while repeatable `--video` and `--audio` accept up to 10 each. Use `--video-operation generate|edit|extend`, `--extend-direction forward|backward`, `--output-format mp4|mov`, `--web-search`, `--generated-audio` / `--no-generated-audio`, and `--relaxed-content-filter`. Edit/extend require a video reference. The Evolink route does not currently expose 4K output.
 

package/bin/makaron.mjs

@@ -28,6 +28,14 @@ const NPM_PACKAGE_NAME = 'makaron-cli';
 const UPDATE_CHECK_INTERVAL_MS = 24 * 60 * 60 * 1000;
 const UPDATE_CHECK_TIMEOUT_MS = 400;
 const AGENT_WAIT_TIMEOUT_SECONDS = Math.max(900, Number(process.env.MAKARON_AGENT_WAIT_TIMEOUT_SECONDS || 10_800));
+const CHAT_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';
@@ -59,6 +67,16 @@ function warnLegacyModelFlag(replacement) {
   process.stderr.write(`⚠️  --model is deprecated here; use ${replacement}.\n`);
 }
 
+function validateChatAgentModel(value) {
+  if (!value || !CHAT_AGENT_MODELS.includes(value)) {
+    process.stderr.write(`❌ Unknown Agent LLM: ${value || '(missing value)'}\n`);
+    process.stderr.write(`Choose one of: ${CHAT_AGENT_MODELS.join(', ')}\n`);
+    process.stderr.write('--agent-model selects only the Agent LLM. Put image/video model preferences in the chat prompt, or use the explicit edit/video commands.\n');
+    process.exit(1);
+  }
+  return value;
+}
+
 function getCliVersion() {
   try {
     const pkg = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url), 'utf-8'));
@@ -159,51 +177,50 @@ function readJsonInput(filePath) {
 const MAX_MEDIA_MANIFEST_RANGES = 20;
 
 function normalizeMediaManifest(input) {
-  const manifest = Array.isArray(input) ? { source_ranges: input } : input;
+  const manifest = Array.isArray(input) ? { clips: input } : input;
   if (!manifest || typeof manifest !== 'object') {
     throw new Error('Media manifest must be a JSON object or an array of source ranges.');
   }
-  const rawRanges = Array.isArray(manifest.source_ranges)
-    ? manifest.source_ranges
-    : Array.isArray(manifest.sourceRanges)
-      ? manifest.sourceRanges
-      : null;
+  const rawRanges = Array.isArray(manifest.clips)
+    ? manifest.clips
+    : Array.isArray(manifest.source_ranges)
+      ? manifest.source_ranges
+      : Array.isArray(manifest.sourceRanges)
+        ? manifest.sourceRanges
+        : null;
   if (!rawRanges?.length) {
-    throw new Error('Media manifest must contain a non-empty source_ranges array.');
+    throw new Error('Media manifest must contain a non-empty clips array.');
   }
   if (rawRanges.length > MAX_MEDIA_MANIFEST_RANGES) {
     throw new Error(`Media manifest supports at most ${MAX_MEDIA_MANIFEST_RANGES} source ranges per Makaron task.`);
   }
 
   const sourceRanges = rawRanges.map((raw, index) => {
-    if (!raw || typeof raw !== 'object') throw new Error(`source_ranges[${index}] must be an object.`);
+    if (!raw || typeof raw !== 'object') throw new Error(`clips[${index}] must be an object.`);
     const sourceUrl = typeof raw.source_url === 'string' ? raw.source_url.trim() : '';
     let parsed;
     try {
       parsed = new URL(sourceUrl);
     } catch {
-      throw new Error(`source_ranges[${index}].source_url must be a valid HTTP(S) URL.`);
+      throw new Error(`clips[${index}].source_url must be a valid HTTP(S) URL.`);
     }
     if (!['http:', 'https:'].includes(parsed.protocol)) {
-      throw new Error(`source_ranges[${index}].source_url must use HTTP or HTTPS.`);
+      throw new Error(`clips[${index}].source_url must use HTTP or HTTPS.`);
     }
-    const startSec = Number(raw.start_sec);
-    const endSec = Number(raw.end_sec);
-    if (!Number.isFinite(startSec) || startSec < 0) {
-      throw new Error(`source_ranges[${index}].start_sec must be a finite number >= 0.`);
+    const start = Number(raw.start ?? raw.start_sec);
+    const end = Number(raw.end ?? raw.end_sec);
+    if (!Number.isFinite(start) || start < 0) {
+      throw new Error(`clips[${index}].start must be a finite number >= 0.`);
     }
-    if (!Number.isFinite(endSec) || endSec <= startSec) {
-      throw new Error(`source_ranges[${index}].end_sec must be greater than start_sec.`);
+    if (!Number.isFinite(end) || end <= start) {
+      throw new Error(`clips[${index}].end must be greater than start.`);
     }
-    const range = { source_url: sourceUrl, start_sec: startSec, end_sec: endSec };
-    for (const key of ['source_uri', 'project_id', 'asset_id', 'file_name', 'description']) {
-      if (typeof raw[key] === 'string' && raw[key].trim()) range[key] = raw[key].trim();
-    }
-    for (const key of ['width', 'height']) {
-      const value = Number(raw[key]);
-      if (Number.isFinite(value) && value > 0) range[key] = value;
-    }
-    return range;
+    return {
+      source_url: sourceUrl,
+      start,
+      end,
+      description: typeof raw.description === 'string' ? raw.description.trim() : '',
+    };
   });
 
   return {
@@ -350,15 +367,17 @@ Options:
   --image <file|url>        Attach a reference image or screenshot. Repeatable.
   --video <file|url>        Attach a video to the project timeline. Repeatable.
   --audio <file|url>        Attach a song, beat, or voice reference. MP3/WAV, repeatable.
-  --media-manifest <file|-> Import source_url + start_sec + end_sec ranges before this run.
+  --media-manifest <file|-> Import source_url + start + end + description clips before this run.
   --skill <id|label|name>   Use an installed skill or auto-install a matched marketplace skill.
+  --agent-model <id>        Agent LLM only: auto, gpt-5.6-terra, gpt-5.6-sol,
+                            gpt-5.6-luna, grok-4.5, or deepseek-v4-pro.
   --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.
+Agent LLM defaults to auto (currently gpt-5.6-terra). Image/video model routing
+stays automatic in chat; --image-model, --video-model, and --model are rejected.
 
 What you can ask:
   Image edit
@@ -382,6 +401,9 @@ What you can ask:
   Agent-to-agent source-range handoff
     makaron chat --project auto --media-manifest set-01.json -b --json "make a 30s vertical video"
 
+  Compare Agent LLMs with identical inputs
+    makaron chat --project auto --agent-model deepseek-v4-pro -b --json "make a 20s badminton video"
+
   Music
     makaron chat --project <id> "add calm piano background music"
 
@@ -423,6 +445,7 @@ async function streamAgent(baseUrl, headers, projectId, prompt, opts = {}) {
       projectId,
       prompt,
       headless: true,
+      ...(opts.agentModel ? { agentModel: opts.agentModel } : {}),
       ...(opts.uploadedVideoCount ? { uploadedVideoCount: opts.uploadedVideoCount } : {}),
       ...(opts.turnMediaCount ? { turnMediaCount: opts.turnMediaCount } : {}),
     }),
@@ -531,6 +554,7 @@ async function streamAgent(baseUrl, headers, projectId, prompt, opts = {}) {
 
 async function submitRun(baseUrl, headers, projectId, prompt, opts = {}) {
   const body = { projectId, prompt };
+  if (opts.agentModel) body.agentModel = opts.agentModel;
   if (opts.currentSnapshotIndex != null) body.currentSnapshotIndex = opts.currentSnapshotIndex;
   if (opts.isNsfw) body.isNsfw = opts.isNsfw;
   if (opts.audioAttachments?.length) body.audioAttachments = opts.audioAttachments;
@@ -910,7 +934,7 @@ async function addProjectMediaSourceRanges(baseUrl, headers, projectId, ranges,
   const res = await fetch(`${baseUrl}/api/projects/${projectId}/media`, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json', ...headers },
-    body: JSON.stringify({ source_ranges: ranges }),
+    body: JSON.stringify({ clips: ranges }),
   });
   if (!res.ok) { console.error('Project media add failed:', await res.text()); process.exit(1); }
   const data = await res.json();
@@ -1686,7 +1710,7 @@ Commands:
   credits                            Show current credit balance
   list (ls)                          List all projects
   project media <projectId> --json    List timeline media for a project
-  project media add <projectId> --source-url <url> --start-sec <n> --end-sec <n>
+  project media add <projectId> --source-url <url> --start <n> --end <n>
                                      Add an external source range without uploading video
   create --image <file>              Create project from local image
   create --image-url <url>           Create project from URL
@@ -1694,6 +1718,8 @@ Commands:
 
   chat --project <id> "message"      Chat (non-blocking, polls for result)
   chat --project <id> --skill <id>   Use a built-in or marketplace skill
+  chat --project <id> --agent-model <id> "message"
+                                     Select only the Agent LLM (strict allowlist)
   chat --project <id> --video <file> Attach video to conversation
   chat --project <id> --audio <file> Attach song/beat/voice reference
   chat --project auto --media-manifest <file> "message"
@@ -1727,7 +1753,8 @@ Examples:
   makaron chat --project <id> "turn this into a short video"
 
 Run makaron <command> --help for command-specific options.
-Chat chooses agent, image, and video models automatically.
+Chat defaults the Agent LLM automatically; --agent-model can select an exact
+Agent LLM. Image and video model routing remains automatic in chat.
 
 Environment:
   MAKARON_API_KEY       API key (mk_live_xxx) — recommended for agents
@@ -1806,11 +1833,11 @@ function printHelp(topic, subtopic) {
     console.log('Usage: makaron credits [--json]');
   } else if (topic === 'project' || topic === 'projects') {
     if (subtopic === 'media') console.log(`Usage: makaron project media <projectId> [--json]
-  makaron project media add <projectId> --source-url <url> --start-sec <n> --end-sec <n> [--source-uri <uri>] [--description <text>] [--json]
+  makaron project media add <projectId> --source-url <url> --start <n> --end <n> [--description <text>] [--json]
   makaron project media add <projectId> --input <ranges.json> [--json]`);
     else console.log(`Project commands:
   project media <projectId> --json      List timeline media for a project
-  project media add <projectId> ...     Add external source_url + start_sec + end_sec media
+  project media add <projectId> ...     Add external source_url + start + end media
 `);
   } else if (topic === 'abort') {
     console.log('Usage: makaron abort <runId>');
@@ -1855,7 +1882,7 @@ Use with chat:
     else console.log(`Video commands:
   video script --image <file> [--image <file>] "direction"   Write video script
   video create --script "..." --video-model seedance-fast    Native text-to-video (no image required)
-  video create --script "..." --video-model minimax-h3 --video-resolution 2k    MiniMax H3 native 2K text-to-video
+  video create --script "..." --video-model minimax-h3                          MiniMax H3 text-to-video (default 768P)
   video create --script "..." --image <url> [--duration 10]  Submit video task
   video create --script "..." --video <public-url> [--video-model seedance-fast|seedance-mini|seedance|seedance-2.5|kling|google-omni|minimax-h3]  Edit/reference a video (Grok does not support video refs)
   video status <taskId>                                      Check video status
@@ -1969,6 +1996,7 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
   let jsonOutput = false;
   let activeSkill = undefined;
   let mediaManifestPath = undefined;
+  let agentModel = undefined;
   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]);
@@ -1984,6 +2012,21 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
     else if (args[i].startsWith('--media-manifest=')) mediaManifestPath = args[i].slice('--media-manifest='.length);
     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] === '--agent-model') {
+      if (agentModel !== undefined) {
+        process.stderr.write('❌ Pass --agent-model only once per chat run.\n');
+        process.exit(1);
+      }
+      if (!args[i + 1] || args[i + 1].startsWith('--')) validateChatAgentModel('');
+      agentModel = validateChatAgentModel(args[++i]);
+    }
+    else if (args[i].startsWith('--agent-model=')) {
+      if (agentModel !== undefined) {
+        process.stderr.write('❌ Pass --agent-model only once per chat run.\n');
+        process.exit(1);
+      }
+      agentModel = validateChatAgentModel(args[i].slice('--agent-model='.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;
@@ -1992,11 +2035,11 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
       process.exit(1);
     }
     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))
+      ['--image-model', '--video-model', '--model'].includes(args[i])
+      || ['--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.stderr.write(`❌ ${flag} is not valid for makaron chat. Only --agent-model may select the Agent LLM; image/video routing stays automatic. Remove ${flag} and retry.\n`);
       process.exit(1);
     }
     else promptParts.push(args[i]);
@@ -2223,6 +2266,7 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
   if (useStream) {
     // Legacy SSE mode
     const { results } = await streamAgent(baseUrl, headers, projectId, finalPrompt, {
+      agentModel,
       uploadedVideoCount: uploadedTurnVideoCount,
       turnMediaCount: uploadedTurnMediaCount,
     });
@@ -2235,6 +2279,7 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
   } else {
     // Default: fire-and-forget + poll
     const { runId } = await submitRun(baseUrl, headers, projectId, finalPrompt, {
+      agentModel,
       audioAttachments,
       uploadedVideoCount: uploadedTurnVideoCount,
       turnMediaCount: uploadedTurnMediaCount,
@@ -2496,7 +2541,7 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
     const jsonOutput = args.includes('--json');
     if (args[2] === 'add') {
       const projectId = args[3];
-      if (!projectId) { console.error('Usage: makaron project media add <projectId> --source-url <url> --start-sec <n> --end-sec <n>'); process.exit(1); }
+      if (!projectId) { console.error('Usage: makaron project media add <projectId> --source-url <url> --start <n> --end <n>'); process.exit(1); }
       const readOption = (name) => {
         const index = args.indexOf(name);
         return index >= 0 ? args[index + 1] : undefined;
@@ -2505,28 +2550,24 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
       let ranges;
       if (inputPath) {
         const input = readJsonInput(inputPath);
-        ranges = Array.isArray(input) ? input : input.source_ranges || input.sourceRanges;
+        ranges = Array.isArray(input) ? input : input.clips || input.source_ranges || input.sourceRanges;
       } else {
         const sourceUrl = readOption('--source-url');
-        const startSec = Number(readOption('--start-sec'));
-        const endSec = Number(readOption('--end-sec'));
-        if (!sourceUrl || !Number.isFinite(startSec) || !Number.isFinite(endSec)) {
-          console.error('Provide --source-url, --start-sec, and --end-sec, or --input <ranges.json>.');
+        const start = Number(readOption('--start') ?? readOption('--start-sec'));
+        const end = Number(readOption('--end') ?? readOption('--end-sec'));
+        if (!sourceUrl || !Number.isFinite(start) || !Number.isFinite(end)) {
+          console.error('Provide --source-url, --start, and --end, or --input <manifest.json>.');
           process.exit(1);
         }
         ranges = [{
           source_url: sourceUrl,
-          start_sec: startSec,
-          end_sec: endSec,
-          ...(readOption('--source-uri') ? { source_uri: readOption('--source-uri') } : {}),
-          ...(readOption('--project-id') ? { project_id: readOption('--project-id') } : {}),
-          ...(readOption('--asset-id') ? { asset_id: readOption('--asset-id') } : {}),
-          ...(readOption('--file-name') ? { file_name: readOption('--file-name') } : {}),
+          start,
+          end,
           ...(readOption('--description') ? { description: readOption('--description') } : {}),
         }];
       }
       if (!Array.isArray(ranges) || !ranges.length) {
-        console.error('Input must contain a non-empty source_ranges array.');
+        console.error('Input must contain a non-empty clips array.');
         process.exit(1);
       }
       await addProjectMediaSourceRanges(baseUrl, headers, projectId, ranges, { json: jsonOutput });
@@ -2538,7 +2579,7 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
   } else {
     console.log(`Project commands:
   project media <projectId> --json      List timeline media for a project
-  project media add <projectId> ...     Add external source_url + start_sec + end_sec media
+  project media add <projectId> ...     Add external source_url + start + end media
 `);
   }
 } else if (command === 'abort') {
@@ -2781,7 +2822,7 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
     console.log(`Video commands:
   video script --image <file> [--image <file>] "direction"   Write video script
   video create --script "..." --video-model seedance-fast    Native text-to-video (no image required)
-  video create --script "..." --video-model minimax-h3 --video-resolution 2k    MiniMax H3 native 2K text-to-video
+  video create --script "..." --video-model minimax-h3                          MiniMax H3 text-to-video (default 768P)
   video create --script "..." --image <url> [--duration 10]  Submit video task
   video create --script "..." --video <public-url> [--video-model seedance-fast|seedance-mini|seedance|seedance-2.5|kling|google-omni|minimax-h3]  Edit/reference a video (Grok does not support video refs)
   video status <taskId>                                      Check video status

package/package.json

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

package/skills/makaron/SKILL.md

@@ -85,7 +85,11 @@ npx makaron-cli chat --project auto --image photo.jpg --json -b "make it cinemat
 npx makaron-cli chat --project auto --image img1.jpg --image img2.jpg --json -b "combine these"
 ```
 
-`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`.
+`chat` routes image and video models automatically. Use `--agent-model` only when the user explicitly asks to select or compare the reasoning/tool-calling Agent LLM. Accepted values are exactly `auto`, `gpt-5.6-terra`, `gpt-5.6-sol`, `gpt-5.6-luna`, `grok-4.5`, and `deepseek-v4-pro`; `auto` currently resolves to `gpt-5.6-terra`. Never put an image or video model ID in `--agent-model`. The CLI rejects unknown Agent IDs plus `--image-model`, `--video-model`, and legacy `--model` before starting a chat run.
+
+```bash
+npx makaron-cli chat --project auto --agent-model deepseek-v4-pro --json -b "make a 20s badminton video"
+```
 
 Returns immediately:
 ```json
@@ -152,11 +156,11 @@ This is project-scoped. `responses get <runId> --pick output` only returns artif
 Publish an external video interval directly into that Media List without uploading the original or a derivative MP4:
 
 ```bash
-npx makaron-cli project media add <projectId> --source-url "https://cdn.example.com/source.mp4" --start-sec 12.5 --end-sec 19 --source-uri "dam://project/asset" --description "Racket frame molding"
+npx makaron-cli project media add <projectId> --source-url "https://cdn.example.com/source.mp4" --start 12.5 --end 19 --description "Racket frame molding"
 npx makaron-cli project media add <projectId> --input ranges.json --json
 ```
 
-The JSON input may be an array or `{ "source_ranges": [...] }`. Each item uses `source_url + start_sec + end_sec`; optional `source_uri`, `project_id`, and `asset_id` preserve durable source identity. Put existing media understanding (summary, editorial purpose, scene evidence, confidence, and limitations) in `description`. Makaron reads that provider-neutral Media List field before deciding whether any additional image/video analysis is needed.
+The JSON input may be an array or `{ "clips": [...] }`. Each clip has exactly `source_url + start + end + description`; `start` and `end` are seconds, array order is edit order, and `source_url` is opaque. Do not add or request provider-specific identity fields. Put existing media understanding (summary, editorial purpose, scene evidence, confidence, and limitations) in `description`. Makaron reads that provider-neutral Media List field before deciding whether any additional image/video analysis is needed.
 
 For one-call orchestration, use `chat --project auto --media-manifest plan.json`. Makaron validates the manifest, creates the project, imports its ranges, and starts the Agent. If an upstream service returns multiple plans, the caller should start one independent Makaron task per plan instead of passing the provider-specific batch response into Makaron.
 
@@ -280,7 +284,7 @@ npx makaron-cli video create --script "Shot 1 (15s): <<<image_1>>> and <<<image_
 
 # 3b. Native SeeDance or MiniMax H3 text-to-video (no image required)
 npx makaron-cli video create --script "Shot 1 (5s): A neon one-person studio wakes at dawn" --duration 5 --video-model seedance-fast --aspect 16:9
-npx makaron-cli video create --script "Shot 1 (15s): A premium creative editor comes alive" --duration 15 --video-model minimax-h3 --video-resolution 2k --aspect 16:9
+npx makaron-cli video create --script "Shot 1 (15s): A premium creative editor comes alive" --duration 15 --video-model minimax-h3 --aspect 16:9
 
 # 3c. Edit a video from a local file or public URL
 npx makaron-cli video create --script "make it funny" --video input.mp4 --duration 5 --video-model seedance-fast
@@ -296,7 +300,7 @@ npx makaron-cli video status <taskId>
 npx makaron-cli chat --project <id|auto> --video input.mp4 -b "make it funny"
 ```
 
-Options for `video create`: `--script "..."`, `--script-file <path>`, `--image <url>` (repeatable, up to the selected model limit), `--video <file|url>` and `--audio <file|url>` (repeatable where supported), `--duration <seconds>`, `--aspect 9:16|16:9|1:1`, `--video-model seedance-fast|seedance-mini|seedance|seedance-2.5|kling|grok|google-omni|minimax-h3`, `--video-resolution auto|480p|720p|768p|1080p|2k|4k`. Default model is `seedance-fast`. SeeDance accepts native text-to-video with no image and integer output duration 4-15s (default 5s); `seedance-mini` supports 480p/720p and is best for cheaper drafts/multi-size tests; MiniMax H3 accepts native text-to-video, 4-15s output, and up to 9 image, up to 3 video, and up to 3 audio references through Makaron Agent/chat. H3 defaults to public 2k output; 768p requires provider preview access plus `MINIMAX_H3_ENABLE_768P=true` on the Makaron server. Kling supports 5-15s; Grok 1.5 supports 1-15s single-image-to-video only; Gemini Omni supports 3-10s fast 720p image/video generation and editing with native generated audio, including up to 6 image references when no video reference is provided. For `--video-model grok`, forced `--aspect` is ignored to avoid xAI stretching the source image; pad/create the image at the target shape first or use another model.
+Options for `video create`: `--script "..."`, `--script-file <path>`, `--image <url>` (repeatable, up to the selected model limit), `--video <file|url>` and `--audio <file|url>` (repeatable where supported), `--duration <seconds>`, `--aspect 9:16|16:9|1:1`, `--video-model seedance-fast|seedance-mini|seedance|seedance-2.5|kling|grok|google-omni|minimax-h3`, `--video-resolution auto|480p|720p|768p|1080p|2k|4k`. Default model is `seedance-fast`. SeeDance accepts native text-to-video with no image and integer output duration 4-15s (default 5s); `seedance-mini` supports 480p/720p and is best for cheaper drafts/multi-size tests; MiniMax H3 accepts native text-to-video, 4-15s output, public 768p/2k resolution, and up to 9 image, up to 3 video, and up to 3 audio references through Makaron Agent/chat. H3 defaults to 768p; request 2k explicitly for maximum/final quality. Kling supports 5-15s; Grok 1.5 supports 1-15s single-image-to-video only; Gemini Omni supports 3-10s fast 720p image/video generation and editing with native generated audio, including up to 6 image references when no video reference is provided. For `--video-model grok`, forced `--aspect` is ignored to avoid xAI stretching the source image; pad/create the image at the target shape first or use another model.
 
 Seedance 2.5 uses `--video-model seedance-2.5` and supports 4-30s at 480p/720p, up to 30 images + 10 videos + 10 audios, repeatable local/URL references, `--video-operation generate|edit|extend`, `--extend-direction`, `--output-format mp4|mov`, and `--web-search`. The Evolink route does not currently expose 4K output.