makaron-cli 0.13.3 → 0.13.5

package/.claude-plugin/plugin.json

@@ -1,12 +1,12 @@
 {
   "name": "makaron-cli",
-  "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.",
+  "version": "0.13.5",
+  "description": "Give Claude Code a creative agent. Pass complete creative requests and source media to Makaron Chat.",
   "author": {
-    "name": "Makaron AI",
+    "name": "Versa AI",
+    "email": "tianyi@versa-ai.com",
     "url": "https://www.makaron.app"
   },
   "homepage": "https://www.makaron.app/agent",
-  "repository": "https://github.com/vegekyd/ai-image-editor",
   "skills": "./skills/"
 }

package/.codex-plugin/plugin.json

@@ -1,21 +1,30 @@
 {
   "name": "makaron-cli",
-  "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",
-  "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.",
+  "version": "0.13.5",
+  "description": "Give Codex a creative agent. Pass complete creative requests and source media to Makaron Chat.",
   "author": {
-    "name": "Makaron AI",
+    "name": "Versa AI",
+    "email": "tianyi@versa-ai.com",
     "url": "https://www.makaron.app"
   },
   "homepage": "https://www.makaron.app/agent",
-  "repository": "https://github.com/vegekyd/ai-image-editor",
   "license": "MIT",
-  "keywords": ["ai", "image-editing", "video", "music", "agent", "creative", "skills"],
-  "category": "Creative Tools",
-  "capabilities": ["image-editing", "video-generation", "music-creation", "text-to-image", "marketplace-skills"],
+  "keywords": ["creative-production", "image-editing", "video-generation", "music", "agent", "cli"],
   "skills": "./skills/",
-  "websiteURL": "https://www.makaron.app",
-  "brandColor": "#d946ef"
+  "interface": {
+    "displayName": "Makaron Creative Studio",
+    "shortDescription": "Give Codex a creative agent",
+    "longDescription": "Pass any complete creative request and source media to Makaron Chat. Makaron plans and produces images, video, music, and motion design in a persistent project that a human can continue editing in makaron.app.",
+    "developerName": "Versa AI",
+    "category": "Creative Tools",
+    "capabilities": ["Read", "Write"],
+    "websiteURL": "https://www.makaron.app/agent",
+    "privacyPolicyURL": "https://www.makaron.app/privacy",
+    "defaultPrompt": [
+      "Pass this complete creative brief and its source files to Makaron Chat.",
+      "Ask Makaron Chat to turn this image into the finished media described in my request.",
+      "Continue this Makaron project with my complete follow-up request."
+    ],
+    "brandColor": "#d946ef"
+  }
 }

package/README.md

@@ -115,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-resolution 480p "make a beat-synced video"` |
+| Beat-sync video from audio | `npx makaron-cli chat --project auto --audio beat.mp3 "use Seedance Mini at 480p to make a beat-synced video"` |
 | Create motion design | `npx makaron-cli chat --project <id> "make an animated Instagram story with this image"` |
 
 ### Marketplace skills
@@ -151,6 +151,41 @@ npx makaron-cli project media <projectId> --json
 
 This is project-scoped. `responses get <runId> --pick output` only returns artifacts from one run; `project media` returns the whole project timeline: original uploads, references, generated images, video snapshots, and editable compositions.
 
+External source ranges can be added without uploading either the original video or a derivative clip:
+
+```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"
+
+# Batch form: a JSON array or {"source_ranges": [...]}
+npx makaron-cli project media add <projectId> --input ranges.json --json
+```
+
+The returned `<<<media_N>>>` is immediately usable by a later Agent run. Its range remains non-destructive metadata; Remotion must trim the original URL to these exact source bounds.
+Use `description` as the provider-neutral media-understanding field. Put any
+already-known summary, editorial purpose, concrete scene evidence, confidence,
+and limitations there. Makaron exposes the full description in Media List
+context so the Agent can edit from it without repeating image/video analysis
+unless a required detail is missing or uncertain.
+
+For an agent-to-agent handoff, create the project, import the external ranges,
+and start the Agent in one command:
+
+```bash
+npx makaron-cli chat --project auto \
+  --media-manifest set-01.json \
+  --json -b \
+  "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.
+
 ### Export editable Remotion compositions
 
 Animated Remotion compositions are saved as editable timeline/code artifacts first. To materialize one into an MP4 that CLI, V, or another service can read, call the backend export worker:
@@ -216,12 +251,13 @@ 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-resolution 480p \
-  -b "make a 15s beat-synced video"
+  -b "use Seedance Mini at 480p to make a 15s beat-synced video"
 ```
 
 `--audio` accepts repeatable local files or public URLs. Local MP3/WAV files must be 2-15s and <=15MB; reference audio currently works with Seedance video generation.
 
+`chat` intentionally has no video model or resolution flags. State both in the chat message so the Agent selects a compatible provider and resolution together. Use `video create` only when you explicitly need direct provider controls.
+
 ### Fix one video moment from a screenshot
 
 When a video is mostly good but one moment needs a local fix, attach a screenshot of the problem frame and describe the correction in normal language:
@@ -303,8 +339,9 @@ npx makaron-cli video create --script "Shot 1 (5s): <<<image_1>>> ..." --image h
 npx makaron-cli video create --script "Shot 1 (5s): <<<image_1>>> slow cinematic push-in with native ambience" --image https://...jpg --duration 5 --video-model grok
 npx makaron-cli video create --script "Shot 1 (15s): <<<image_1>>> and <<<image_2>>> build a neon one-person studio" --image https://...jpg --image https://...webp --duration 15 --video-model seedance-mini --video-resolution 480p --aspect 9:16
 
-# 3b. Native SeeDance text-to-video (no image required)
+# 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
 
 # 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
@@ -320,9 +357,11 @@ 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 7), `--video <file|url>`, `--duration <seconds>`, `--aspect 9:16|16:9|1:1`, `--video-model seedance-fast|seedance-mini|seedance|kling|grok|google-omni`, `--video-resolution auto|480p|720p|1080p|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; 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, 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.
+
+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.
 
-Video edit model behavior: `--video-model kling --video` uses Kling base/direct edit internally; `--video-model seedance-fast --video`, `--video-model seedance-mini --video`, or `--video-model seedance --video` uses the SeeDance video-reference path and requires target <=15s, <=50MB, width/height 300-6000px, aspect ratio 0.4-2.5, and frame pixels 409,600-2,086,876. `--video-model google-omni --video` uses Gemini Omni direct video editing and accepts one reference video in Makaron. Output duration is clamped to 3-10s. Grok does not support video references.
+Video edit model behavior: `--video-model kling --video` uses Kling base/direct edit internally; `--video-model seedance-fast --video`, `--video-model seedance-mini --video`, or `--video-model seedance --video` uses the SeeDance video-reference path and requires target <=15s, <=50MB, width/height 300-6000px, aspect ratio 0.4-2.5, and frame pixels 409,600-2,086,876. `--video-model minimax-h3 --video` uses H3 feature/reference mode: up to 3 video references totaling <=15s, each <=50MB with width/height 256-5760px and aspect ratio 0.4-2.5. `--video-model google-omni --video` uses Gemini Omni direct video editing and accepts one reference video in Makaron. Output duration is clamped to 3-10s. Grok does not support video references.
 
 ### `music` — Music generation
 
@@ -435,7 +474,7 @@ send_message "All done!"
 ## Important Notes
 
 - One project = one conversation thread. All history is preserved.
-- One run at a time per project. New message interrupts previous run.
+- One active Agent Run at a time per project. A new message received while it is active is appended to that same Agent Run and processed at a durable work-unit boundary; it does not interrupt the execution or create a second owner for an in-progress Studio workflow.
 - Multi-image: `create --image a.jpg --image b.jpg` or `chat --image ref.jpg`.
 - Provider-generated videos can take 3-5 minutes; Grok is usually around 30-40 seconds; Gemini Omni is usually around 30-70 seconds plus Storage handoff. Remotion compositions should be converted with `materialize` / `responses get --materialize`, and timing should be read from `duration_seconds`, `render_seconds`, and `realtime_ratio`.
 - Music takes ~60 seconds. Appears in output when done.

package/bin/makaron.mjs

@@ -45,11 +45,15 @@ const MAX_AUDIO_REFERENCE_DURATION_TOLERANCE = 0.5;
 const MAX_AUDIO_REFERENCE_FILE_SIZE_MB = 15;
 const MAX_AUDIO_REFERENCE_FILE_SIZE = MAX_AUDIO_REFERENCE_FILE_SIZE_MB * 1024 * 1024;
 const MAX_VIDEO_FRAME_PIXELS = 2_086_876;
+const SEEDANCE25_MAX_VIDEO_REFERENCE_DURATION = 30;
+const SEEDANCE25_MAX_VIDEO_FRAME_PIXELS = 8_295_044;
 const SEEDANCE_MIN_VIDEO_FRAME_PIXELS = 409_600;
 const SEEDANCE_MIN_VIDEO_SIDE = 300;
 const SEEDANCE_MAX_VIDEO_SIDE = 6000;
 const SEEDANCE_MIN_VIDEO_ASPECT = 0.4;
 const SEEDANCE_MAX_VIDEO_ASPECT = 2.5;
+const MINIMAX_H3_MIN_VIDEO_SIDE = 256;
+const MINIMAX_H3_MAX_VIDEO_SIDE = 5760;
 
 function warnLegacyModelFlag(replacement) {
   process.stderr.write(`⚠️  --model is deprecated here; use ${replacement}.\n`);
@@ -152,6 +156,71 @@ function readJsonInput(filePath) {
   return JSON.parse(raw);
 }
 
+const MAX_MEDIA_MANIFEST_RANGES = 20;
+
+function normalizeMediaManifest(input) {
+  const manifest = Array.isArray(input) ? { source_ranges: 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;
+  if (!rawRanges?.length) {
+    throw new Error('Media manifest must contain a non-empty source_ranges 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.`);
+    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.`);
+    }
+    if (!['http:', 'https:'].includes(parsed.protocol)) {
+      throw new Error(`source_ranges[${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.`);
+    }
+    if (!Number.isFinite(endSec) || endSec <= startSec) {
+      throw new Error(`source_ranges[${index}].end_sec must be greater than start_sec.`);
+    }
+    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 {
+    sourceRanges,
+    title: typeof manifest.title === 'string' && manifest.title.trim() ? manifest.title.trim() : undefined,
+  };
+}
+
+function readMediaManifest(filePath) {
+  try {
+    return normalizeMediaManifest(readJsonInput(filePath));
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    throw new Error(`Invalid media manifest: ${message}`);
+  }
+}
+
 // ─── Auth ────────────────────────────────────────────────────────────────────
 
 function loadAuth() {
@@ -281,8 +350,8 @@ 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.
   --skill <id|label|name>   Use an installed skill or auto-install a matched marketplace skill.
-  --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.
@@ -310,11 +379,14 @@ What you can ask:
   Video cuts and assembly
     makaron chat --project <id> --video clip.mp4 "cut out the dead air and keep the best 20 seconds"
 
+  Agent-to-agent source-range handoff
+    makaron chat --project auto --media-manifest set-01.json -b --json "make a 30s vertical video"
+
   Music
     makaron chat --project <id> "add calm piano background music"
 
   Reference audio / beat sync
-    makaron chat --project auto --audio beat.mp3 --video-resolution 480p "用这个音乐做卡点视频"
+    makaron chat --project auto --audio beat.mp3 "用 Seedance Mini 480p 做卡点视频"
     makaron chat --project <id> --audio https://example.com/beat.mp3 "add this as the soundtrack"
 
   Motion design
@@ -351,7 +423,6 @@ async function streamAgent(baseUrl, headers, projectId, prompt, opts = {}) {
       projectId,
       prompt,
       headless: true,
-      ...(opts.videoResolution ? { videoResolution: opts.videoResolution } : {}),
       ...(opts.uploadedVideoCount ? { uploadedVideoCount: opts.uploadedVideoCount } : {}),
       ...(opts.turnMediaCount ? { turnMediaCount: opts.turnMediaCount } : {}),
     }),
@@ -460,7 +531,6 @@ async function streamAgent(baseUrl, headers, projectId, prompt, opts = {}) {
 
 async function submitRun(baseUrl, headers, projectId, prompt, opts = {}) {
   const body = { projectId, prompt };
-  if (opts.videoResolution) body.videoResolution = opts.videoResolution;
   if (opts.currentSnapshotIndex != null) body.currentSnapshotIndex = opts.currentSnapshotIndex;
   if (opts.isNsfw) body.isNsfw = opts.isNsfw;
   if (opts.audioAttachments?.length) body.audioAttachments = opts.audioAttachments;
@@ -825,9 +895,33 @@ async function listProjectMedia(baseUrl, headers, projectId, opts = {}) {
     const status = item.status && item.status !== 'completed' ? ` ${item.status}` : '';
     const duration = typeof item.duration === 'number' ? ` ${item.duration}s` : '';
     const dimensions = item.width && item.height ? ` ${item.width}x${item.height}` : '';
-    const description = item.description ? ` — ${item.description}` : '';
+    const description = item.description ? ` — ${String(item.description).replace(/\s*\n\s*/g, ' | ')}` : '';
+    const sourceRange = item.source_range || item.sourceRange;
+    const range = sourceRange
+      ? ` source ${formatSeconds(sourceRange.start_sec)}-${formatSeconds(sourceRange.end_sec)}s`
+      : '';
     const url = item.url ? `\n      ${item.url}` : '';
-    console.log(`  ${String(item.index).padStart(2)}. ${ref} [${item.type}${status}${duration}${dimensions}]${description}${url}`);
+    console.log(`  ${String(item.index).padStart(2)}. ${ref} [${item.type}${status}${duration}${dimensions}${range}]${description}${url}`);
+  }
+  return data;
+}
+
+async function addProjectMediaSourceRanges(baseUrl, headers, projectId, ranges, opts = {}) {
+  const res = await fetch(`${baseUrl}/api/projects/${projectId}/media`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json', ...headers },
+    body: JSON.stringify({ source_ranges: ranges }),
+  });
+  if (!res.ok) { console.error('Project media add failed:', await res.text()); process.exit(1); }
+  const data = await res.json();
+  if (opts.json && !opts.silent) {
+    console.log(JSON.stringify(data, null, 2));
+    return data;
+  }
+  if (!opts.silent) {
+    for (const item of data.media || []) {
+      console.log(`${item.ref} ${item.source_url} ${formatSeconds(item.start_sec)}-${formatSeconds(item.end_sec)}s${item.created ? '' : ' (existing)'}`);
+    }
   }
   return data;
 }
@@ -1368,7 +1462,8 @@ function getAudioMimeFromExt(ext) {
   return null;
 }
 
-function validateAudioReferenceFile(audioPath) {
+function validateAudioReferenceFile(audioPath, options = {}) {
+  const maxDuration = options.maxDuration ?? MAX_AUDIO_REFERENCE_DURATION;
   if (!fs.existsSync(audioPath)) {
     return { ok: false, error: `Audio file not found: ${audioPath}` };
   }
@@ -1391,8 +1486,8 @@ function validateAudioReferenceFile(audioPath) {
   if (duration < MIN_AUDIO_REFERENCE_DURATION) {
     return { ok: false, error: `Audio too short: ${formatSeconds(duration)}s (min ${MIN_AUDIO_REFERENCE_DURATION}s).` };
   }
-  if (duration > MAX_AUDIO_REFERENCE_DURATION + MAX_AUDIO_REFERENCE_DURATION_TOLERANCE) {
-    return { ok: false, error: `Audio too long: ${formatSeconds(duration)}s (max ${MAX_AUDIO_REFERENCE_DURATION}s, with ${MAX_AUDIO_REFERENCE_DURATION_TOLERANCE}s metadata tolerance).` };
+  if (duration > maxDuration + MAX_AUDIO_REFERENCE_DURATION_TOLERANCE) {
+    return { ok: false, error: `Audio too long: ${formatSeconds(duration)}s (max ${maxDuration}s, with ${MAX_AUDIO_REFERENCE_DURATION_TOLERANCE}s metadata tolerance).` };
   }
   return { ok: true, mime, meta: { duration, fileSizeBytes: stat.size } };
 }
@@ -1474,16 +1569,19 @@ function validateVideoFile(videoPath, options = {}) {
   const maxSide = options.maxSide ?? Infinity;
   const minAspect = options.minAspect ?? 0;
   const maxAspect = options.maxAspect ?? Infinity;
+  const allowedExtensions = options.allowedExtensions ?? ['mp4', 'mov', 'webm'];
+  const maxFramePixels = options.maxFramePixels ?? MAX_VIDEO_FRAME_PIXELS;
+  const maxFileSize = options.maxFileSize ?? MAX_VIDEO_UPLOAD_FILE_SIZE;
   if (!fs.existsSync(videoPath)) {
     return { ok: false, error: `Video file not found: ${videoPath}` };
   }
   const stat = fs.statSync(videoPath);
-  if (stat.size > MAX_VIDEO_UPLOAD_FILE_SIZE) {
-    return { ok: false, error: `Video too large: ${(stat.size / 1024 / 1024).toFixed(1)}MB (max ${MAX_VIDEO_UPLOAD_FILE_SIZE_MB}MB). The CLI uploads directly to Storage; use the frontend to transcode larger videos first.` };
+  if (stat.size > maxFileSize) {
+    return { ok: false, error: `Video too large: ${(stat.size / 1024 / 1024).toFixed(1)}MB (max ${(maxFileSize / 1024 / 1024).toFixed(0)}MB).` };
   }
   const ext = path.extname(videoPath).slice(1).toLowerCase();
-  if (!['mp4', 'mov', 'webm'].includes(ext)) {
-    return { ok: false, error: `Unsupported video format: .${ext}. Use MP4, MOV, or WebM.` };
+  if (!allowedExtensions.includes(ext)) {
+    return { ok: false, error: `Unsupported video format: .${ext}. Use ${allowedExtensions.map(value => value.toUpperCase()).join(' or ')}.` };
   }
   const meta = probeLocalVideo(videoPath);
   if (!meta) {
@@ -1492,8 +1590,8 @@ function validateVideoFile(videoPath, options = {}) {
   if (meta.duration > maxDuration + durationTolerance) {
     return { ok: false, error: `Video too long: ${formatSeconds(meta.duration)}s (max ${maxDuration}s, with ${durationTolerance}s metadata tolerance)` };
   }
-  if (meta.width * meta.height > MAX_VIDEO_FRAME_PIXELS) {
-    return { ok: false, error: `Video resolution too high: ${meta.width}x${meta.height} (${meta.width * meta.height} px). Max is <=1080p (${MAX_VIDEO_FRAME_PIXELS} px). Re-upload through the frontend to transcode, or export a smaller video.` };
+  if (meta.width * meta.height > maxFramePixels) {
+    return { ok: false, error: `Video resolution too high: ${meta.width}x${meta.height} (${meta.width * meta.height} px). Max is ${maxFramePixels} pixels.` };
   }
   const framePixels = meta.width * meta.height;
   const aspect = meta.width / meta.height;
@@ -1588,6 +1686,8 @@ 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>
+                                     Add an external source range without uploading video
   create --image <file>              Create project from local image
   create --image-url <url>           Create project from URL
   create --title "name"              Create empty project (text-to-image)
@@ -1596,6 +1696,8 @@ Commands:
   chat --project <id> --skill <id>   Use a built-in or marketplace skill
   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"
+                                     Create, import external ranges, and run Agent
   chat --project <id> -b "message"   Background: submit and print runId
   chat --project <id> --stream "msg" Legacy: stream SSE in real-time
   chat --project <id> --json "msg"   Output structured JSON result
@@ -1703,9 +1805,12 @@ function printHelp(topic, subtopic) {
   } else if (topic === 'credits' || topic === 'credit' || topic === 'balance') {
     console.log('Usage: makaron credits [--json]');
   } else if (topic === 'project' || topic === 'projects') {
-    if (subtopic === 'media') console.log('Usage: makaron project media <projectId> [--json]');
+    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> --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
 `);
   } else if (topic === 'abort') {
     console.log('Usage: makaron abort <runId>');
@@ -1745,13 +1850,14 @@ Use with chat:
     console.log('Usage: makaron analyze --video <file|url> ["question"]');
   } else if (topic === 'video') {
     if (subtopic === 'script') console.log('Usage: makaron video script --image <file> [--image <file>] [--lang en|zh] "direction"');
-    else if (subtopic === 'create') console.log('Usage: makaron video create --script "..." [--image <url> | --video <public-url>] [--duration 10] [--aspect 9:16] [--video-model seedance-fast|seedance-mini|seedance|kling|grok|google-omni] [--video-resolution auto|480p|720p|1080p|4k] [--keep-original-sound]');
+    else if (subtopic === 'create') console.log('Usage: makaron video create --script "..." [--image <url> ...] [--video <url> ...] [--audio <url> ...] [--duration 10] [--aspect 9:16] [--video-model seedance-fast|seedance-mini|seedance|seedance-2.5|kling|grok|google-omni|minimax-h3] [--operation generate|edit|extend] [--video-resolution auto|480p|720p|768p|1080p|2k|4k] [--keep-original-sound]');
     else if (subtopic === 'status') console.log('Usage: makaron video status <taskId> | --snapshot <snapshotId> [--wait]');
     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 "..." --image <url> [--duration 10]  Submit video task
-  video create --script "..." --video <public-url> [--video-model seedance-fast|seedance-mini|seedance|kling|google-omni]  Edit a video (standalone; Grok does not support video refs)
+  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
   video status --snapshot <snapshotId> [--wait]              Check v2 video snapshot
 `);
@@ -1862,18 +1968,29 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
   let background = false;
   let jsonOutput = false;
   let activeSkill = undefined;
-  let videoResolution = undefined;
+  let mediaManifestPath = 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]);
     else if (args[i] === '--video' && args[i + 1]) chatVideos.push(args[++i]);
     else if (args[i] === '--audio' && args[i + 1]) chatAudios.push(args[++i]);
+    else if (args[i] === '--media-manifest') {
+      if (!args[i + 1] || args[i + 1].startsWith('--')) {
+        process.stderr.write('❌ --media-manifest requires a JSON file path or -.\n');
+        process.exit(1);
+      }
+      mediaManifestPath = args[++i];
+    }
+    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] === '--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-resolution' && args[i + 1]) videoResolution = args[++i];
+    else if (args[i] === '--video-resolution' || args[i].startsWith('--video-resolution=')) {
+      process.stderr.write('❌ makaron chat chooses video model and resolution together. Put the requested resolution in your chat message, for example: "use MiniMax H3 at 2K".\n');
+      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))
@@ -1890,6 +2007,15 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
     console.error('Run: makaron chat --help');
     process.exit(1);
   }
+  let mediaManifest;
+  if (mediaManifestPath) {
+    try {
+      mediaManifest = readMediaManifest(mediaManifestPath);
+    } catch (error) {
+      process.stderr.write(`❌ ${error instanceof Error ? error.message : String(error)}\n`);
+      process.exit(1);
+    }
+  }
   const { headers, baseUrl } = getAuth();
   // Split images into URLs vs local files
   const imageUrlList = chatImages.filter(p => p.startsWith('http://') || p.startsWith('https://'));
@@ -1946,13 +2072,31 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
     const res = await fetch(`${baseUrl}/api/projects/create`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json', ...headers },
-      body: JSON.stringify({ title: prompt.slice(0, 50) }),
+      body: JSON.stringify({ title: mediaManifest?.title || prompt.slice(0, 50) }),
     });
     if (!res.ok) { process.stderr.write(`❌ Failed to create project: ${await res.text()}\n`); process.exit(1); }
     const data = await res.json();
     projectId = data.projectId;
     process.stderr.write(`📦 Project created: ${projectId}\n`);
   }
+  let importedManifestMedia = [];
+  if (mediaManifest) {
+    const imported = await addProjectMediaSourceRanges(
+      baseUrl,
+      headers,
+      projectId,
+      mediaManifest.sourceRanges,
+      { silent: true },
+    );
+    importedManifestMedia = imported.media || [];
+    if (importedManifestMedia.length !== mediaManifest.sourceRanges.length) {
+      process.stderr.write(`❌ Imported ${importedManifestMedia.length}/${mediaManifest.sourceRanges.length} source range(s); aborting run.\n`);
+      process.exit(1);
+    }
+    uploadedTurnMediaCount += importedManifestMedia.length;
+    uploadedTurnVideoCount += importedManifestMedia.length;
+    process.stderr.write(`📎 Imported ${importedManifestMedia.length} external source range(s) from media manifest\n`);
+  }
   // Upload additional images to existing project
   if (imageFileList.length > 0 || imageUrlList.length > 0) {
     const uploadedImageUrls = imageFileList.length
@@ -1988,7 +2132,7 @@ 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 = resolvedSkill ? `[Active skill: ${resolvedSkill}]\n${prompt}` : prompt;
+  const finalPrompt = resolvedSkill ? `[Active skill: ${resolvedSkill}]\n${prompt}` : prompt;
   let audioAttachments = [];
   if (chatAudios.length > 0) {
     const audioImports = [];
@@ -2079,7 +2223,6 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
   if (useStream) {
     // Legacy SSE mode
     const { results } = await streamAgent(baseUrl, headers, projectId, finalPrompt, {
-      videoResolution,
       uploadedVideoCount: uploadedTurnVideoCount,
       turnMediaCount: uploadedTurnMediaCount,
     });
@@ -2092,7 +2235,6 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
   } else {
     // Default: fire-and-forget + poll
     const { runId } = await submitRun(baseUrl, headers, projectId, finalPrompt, {
-      videoResolution,
       audioAttachments,
       uploadedVideoCount: uploadedTurnVideoCount,
       turnMediaCount: uploadedTurnMediaCount,
@@ -2100,7 +2242,20 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
     if (background) {
       // Just print runId and exit
       if (jsonOutput) {
-        console.log(JSON.stringify({ runId, projectId, projectUrl: `${APP_URL}/projects/${projectId}`, status: 'running' }));
+        console.log(JSON.stringify({
+          runId,
+          projectId,
+          projectUrl: `${APP_URL}/projects/${projectId}`,
+          status: 'running',
+          ...(importedManifestMedia.length ? {
+            importedMedia: importedManifestMedia.map(item => ({
+              ref: item.ref,
+              source_url: item.source_url,
+              start_sec: item.start_sec,
+              end_sec: item.end_sec,
+            })),
+          } : {}),
+        }));
       } else {
         console.log(runId);
       }
@@ -2338,13 +2493,52 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
   const { headers, baseUrl } = getAuth();
   const sub = args[1];
   if (sub === 'media') {
-    const projectId = args[2];
-    if (!projectId) { console.error('Usage: makaron project media <projectId> [--json]'); process.exit(1); }
     const jsonOutput = args.includes('--json');
-    await listProjectMedia(baseUrl, headers, projectId, { json: jsonOutput });
+    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); }
+      const readOption = (name) => {
+        const index = args.indexOf(name);
+        return index >= 0 ? args[index + 1] : undefined;
+      };
+      const inputPath = readOption('--input');
+      let ranges;
+      if (inputPath) {
+        const input = readJsonInput(inputPath);
+        ranges = Array.isArray(input) ? input : 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>.');
+          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') } : {}),
+          ...(readOption('--description') ? { description: readOption('--description') } : {}),
+        }];
+      }
+      if (!Array.isArray(ranges) || !ranges.length) {
+        console.error('Input must contain a non-empty source_ranges array.');
+        process.exit(1);
+      }
+      await addProjectMediaSourceRanges(baseUrl, headers, projectId, ranges, { json: jsonOutput });
+    } else {
+      const projectId = args[2];
+      if (!projectId) { console.error('Usage: makaron project media <projectId> [--json]'); process.exit(1); }
+      await listProjectMedia(baseUrl, headers, projectId, { json: jsonOutput });
+    }
   } 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
 `);
   }
 } else if (command === 'abort') {
@@ -2422,11 +2616,15 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
 
   } else if (sub === 'create') {
     const images = [];
+    const videos = [];
+    const audios = [];
     let script = '', duration = undefined, aspectRatio = undefined, videoModel = undefined, videoResolution = undefined, wait = false;
-    let video = null, keepOriginalSound = false;
+    let keepOriginalSound = false, videoOperation = undefined, extendDirection = undefined, outputFormat = undefined;
+    let generateAudio = undefined, contentFilter = undefined, webSearch = false;
     for (let i = 2; i < args.length; i++) {
       if (args[i] === '--image' && args[i + 1]) images.push(args[++i]);
-      else if (args[i] === '--video' && args[i + 1]) video = args[++i];
+      else if (args[i] === '--video' && args[i + 1]) videos.push(args[++i]);
+      else if (args[i] === '--audio' && args[i + 1]) audios.push(args[++i]);
       else if (args[i] === '--script' && args[i + 1]) script = args[++i];
       else if (args[i] === '--script-file' && args[i + 1]) script = fs.readFileSync(args[++i], 'utf-8');
       else if (args[i] === '--duration' && args[i + 1]) duration = Number(args[++i]);
@@ -2439,6 +2637,13 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
       else if (args[i] === '--video-resolution' && args[i + 1]) videoResolution = args[++i];
       else if (args[i] === '--resolution' && args[i + 1]) videoResolution = args[++i];
       else if (args[i] === '--keep-original-sound') keepOriginalSound = true;
+      else if (args[i] === '--video-operation' && args[i + 1]) videoOperation = args[++i];
+      else if (args[i] === '--extend-direction' && args[i + 1]) extendDirection = args[++i];
+      else if (args[i] === '--output-format' && args[i + 1]) outputFormat = args[++i];
+      else if (args[i] === '--no-generated-audio') generateAudio = false;
+      else if (args[i] === '--generated-audio') generateAudio = true;
+      else if (args[i] === '--relaxed-content-filter') contentFilter = false;
+      else if (args[i] === '--web-search') webSearch = true;
       else if (args[i] === '--project') {
         console.error('Usage: video create no longer supports --project. Use: makaron chat --project <id> --video <file|url> "your request"');
         process.exit(1);
@@ -2446,27 +2651,53 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
       else if (args[i] === '--wait') wait = true;
     }
     const selectedVideoModel = videoModel || 'seedance-fast';
-    const isSeedanceModel = selectedVideoModel === 'seedance-fast' || selectedVideoModel === 'seedance-mini' || selectedVideoModel === 'seedance';
-    if (!script || (!images.length && !video && !isSeedanceModel)) {
-      console.error('Usage: makaron video create --script "..." [--image <url> | --video <public-url>] [--duration 10] [--aspect 9:16] [--video-model seedance-fast|seedance-mini|seedance|kling|grok|google-omni] [--video-resolution auto|480p|720p|1080p|4k] [--keep-original-sound]');
+    const isSeedance25 = selectedVideoModel === 'seedance-2.5';
+    const isSeedanceModel = selectedVideoModel === 'seedance-fast' || selectedVideoModel === 'seedance-mini' || selectedVideoModel === 'seedance' || isSeedance25;
+    const isMinimaxH3 = selectedVideoModel === 'minimax-h3';
+    const supportsNativeTextToVideo = isSeedanceModel || isMinimaxH3;
+    if (!script || (!images.length && !videos.length && !audios.length && !supportsNativeTextToVideo)) {
+      console.error('Usage: makaron video create --script "..." [--image <url>] [--video <file|url>] [--audio <file|url>] [--duration 30] [--video-model seedance-2.5|minimax-h3]');
       process.exit(1);
     }
+    if (isSeedance25 && images.length > 30) { console.error('Seedance 2.5 supports at most 30 image references.'); process.exit(1); }
+    if (isSeedance25 && videos.length > 10) { console.error('Seedance 2.5 supports at most 10 video references.'); process.exit(1); }
+    if (isSeedance25 && audios.length > 10) { console.error('Seedance 2.5 supports at most 10 audio references.'); process.exit(1); }
+    if (isMinimaxH3 && images.length > 9) { console.error('MiniMax H3 supports at most 9 image references.'); process.exit(1); }
+    if (isMinimaxH3 && videos.length > 3) { console.error('MiniMax H3 supports at most 3 video references.'); process.exit(1); }
+    if (isMinimaxH3 && audios.length > 3) { console.error('MiniMax H3 supports at most 3 audio references.'); process.exit(1); }
+    if (videoOperation && !['generate', 'edit', 'extend'].includes(videoOperation)) { console.error('--video-operation must be generate, edit, or extend.'); process.exit(1); }
+    if (extendDirection && !['forward', 'backward'].includes(extendDirection)) { console.error('--extend-direction must be forward or backward.'); process.exit(1); }
+    if (outputFormat && !['mp4', 'mov'].includes(outputFormat)) { console.error('--output-format must be mp4 or mov.'); process.exit(1); }
 
     if (wait) {
       console.error('Usage: --wait is only supported for project timeline tasks. Use chat --project for project video generation, or poll the returned taskId with video status.');
       process.exit(1);
     }
 
-    let videoUrl = isHttpUrl(video) ? video : null;
-    let inputVideoMeta = null;
-    if (videoUrl) {
-      process.stderr.write(`📹 Assuming public video URL already matches provider reference limits. Seedance requires ≤${MAX_VIDEO_PROVIDER_REFERENCE_DURATION}s, ≤50MB, sides 300-6000px, frame pixels 409,600-${MAX_VIDEO_FRAME_PIXELS}; Kling requires ≤200MB and ≤2K; Google Omni accepts one reference video in Makaron; Grok does not support video references.\n`);
+    const providerMaxDuration = isSeedance25 ? SEEDANCE25_MAX_VIDEO_REFERENCE_DURATION : MAX_VIDEO_PROVIDER_REFERENCE_DURATION;
+    const providerMaxPixels = isMinimaxH3 ? Infinity : isSeedance25 ? SEEDANCE25_MAX_VIDEO_FRAME_PIXELS : MAX_VIDEO_FRAME_PIXELS;
+    const localImages = images.filter(image => !isHttpUrl(image));
+    if (localImages.length) {
+      const uploadedImages = await uploadImageFilesViaSignedUrl(baseUrl, headers, undefined, localImages);
+      const uploadedByPath = new Map(localImages.map((image, index) => [image, uploadedImages[index]]));
+      images = images.map(image => isHttpUrl(image) ? image : uploadedByPath.get(image)).filter(Boolean);
     }
-    if (video && !videoUrl) {
+    const videoUrls = [];
+    let inputVideoMeta = null;
+    for (const video of videos) {
+      if (isHttpUrl(video)) { videoUrls.push(video); continue; }
       const valid = validateVideoFile(video, {
-        maxDuration: MAX_VIDEO_PROVIDER_REFERENCE_DURATION,
+        maxDuration: providerMaxDuration,
         durationTolerance: MAX_VIDEO_PROVIDER_REFERENCE_DURATION_TOLERANCE,
-        ...(selectedVideoModel === 'seedance' || selectedVideoModel === 'seedance-fast' || selectedVideoModel === 'seedance-mini' ? {
+        maxFramePixels: providerMaxPixels,
+        maxFileSize: isSeedance25 ? 200 * 1024 * 1024 : MAX_VIDEO_UPLOAD_FILE_SIZE,
+        ...(selectedVideoModel === 'minimax-h3' ? {
+          allowedExtensions: ['mp4', 'mov'],
+          minSide: MINIMAX_H3_MIN_VIDEO_SIDE,
+          maxSide: MINIMAX_H3_MAX_VIDEO_SIDE,
+          minAspect: SEEDANCE_MIN_VIDEO_ASPECT,
+          maxAspect: SEEDANCE_MAX_VIDEO_ASPECT,
+        } : isSeedanceModel ? {
           minFramePixels: SEEDANCE_MIN_VIDEO_FRAME_PIXELS,
           minSide: SEEDANCE_MIN_VIDEO_SIDE,
           maxSide: SEEDANCE_MAX_VIDEO_SIDE,
@@ -2475,22 +2706,38 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
         } : {}),
       });
       if (!valid.ok) { console.error(`❌ ${valid.error}`); process.exit(1); }
-      inputVideoMeta = valid.meta;
+      inputVideoMeta ||= valid.meta;
       process.stderr.write(`📹 Uploading ${path.basename(video)} (${(fs.statSync(video).size/1024/1024).toFixed(1)}MB)...\n`);
-      videoUrl = await uploadFileViaSignedUrl(baseUrl, headers, undefined, video, valid.mime);
-      if (!videoUrl) process.exit(1);
+      const uploaded = await uploadFileViaSignedUrl(baseUrl, headers, undefined, video, valid.mime);
+      if (!uploaded) process.exit(1);
+      videoUrls.push(uploaded);
       process.stderr.write(`📹 Uploaded: ${path.basename(video)}\n`);
     }
+    const audioUrls = [];
+    for (const audio of audios) {
+      if (isHttpUrl(audio)) { audioUrls.push(audio); continue; }
+      const valid = validateAudioReferenceFile(audio, { maxDuration: isSeedance25 ? 30 : MAX_AUDIO_REFERENCE_DURATION });
+      if (!valid.ok) { console.error(`❌ ${valid.error}`); process.exit(1); }
+      process.stderr.write(`🎵 Uploading ${path.basename(audio)}...\n`);
+      const uploaded = await uploadFileViaSignedUrl(baseUrl, headers, undefined, audio, valid.mime, { uploadKind: 'audio' });
+      if (!uploaded) process.exit(1);
+      audioUrls.push(uploaded);
+    }
     // Standalone MCP tool (no project timeline write)
     process.stderr.write('🎬 Submitting video...\n');
-    const vArgs = videoUrl
-      ? { videoUrl, editPrompt: script, images, videoModel: selectedVideoModel, videoResolution, referType: (selectedVideoModel === 'seedance' || selectedVideoModel === 'seedance-fast' || selectedVideoModel === 'seedance-mini') ? 'feature' : 'base' }
-      : { script, images, videoModel: selectedVideoModel, videoResolution };
-    const effectiveDuration = duration || (inputVideoMeta?.duration ? Math.min(MAX_VIDEO_PROVIDER_REFERENCE_DURATION, Math.round(inputVideoMeta.duration)) : undefined);
+    const resolvedOperation = videoOperation || (isSeedance25 && videoUrls.length ? 'edit' : 'generate');
+    const vArgs = isSeedance25
+      ? { script, images, videoUrls, audioUrls, videoModel: selectedVideoModel, videoResolution, operation: resolvedOperation, extendDirection, outputFormat, generateAudio, contentFilter, webSearch }
+      : isMinimaxH3
+        ? { script, images, videoUrls, audioUrls, videoModel: selectedVideoModel, videoResolution }
+      : videoUrls[0]
+        ? { videoUrl: videoUrls[0], editPrompt: script, images, videoModel: selectedVideoModel, videoResolution, referType: isSeedanceModel ? 'feature' : 'base' }
+        : { script, images, videoModel: selectedVideoModel, videoResolution };
+    const effectiveDuration = resolvedOperation === 'edit' ? undefined : duration || (inputVideoMeta?.duration ? Math.min(providerMaxDuration, Math.round(inputVideoMeta.duration)) : undefined);
     if (effectiveDuration) vArgs.duration = effectiveDuration;
     if (aspectRatio) vArgs.aspectRatio = aspectRatio;
-    if (keepOriginalSound && videoUrl) vArgs.keepOriginalSound = true;
-    const result = await callMcpTool(baseUrl, headers, videoUrl ? 'makaron_edit_video' : 'makaron_create_video', vArgs);
+    if (keepOriginalSound && videoUrls.length && !isSeedance25) vArgs.keepOriginalSound = true;
+    const result = await callMcpTool(baseUrl, headers, videoUrls.length && !isSeedance25 && !isMinimaxH3 ? 'makaron_edit_video' : 'makaron_create_video', vArgs);
     const text = result?.content?.find(c => c.type === 'text')?.text;
     if (text) {
       console.log(text);
@@ -2534,8 +2781,9 @@ 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 "..." --image <url> [--duration 10]  Submit video task
-  video create --script "..." --video <public-url> [--video-model seedance-fast|seedance-mini|seedance|kling|google-omni]  Edit a video (standalone; Grok does not support video refs)
+  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
   video status --snapshot <snapshotId> [--wait]              Check v2 video snapshot
 `);

package/package.json

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

package/skills/makaron/SKILL.md

@@ -102,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-resolution 480p "make a beat-synced video"` |
+| Beat-sync video from audio | `npx makaron-cli chat --project auto --audio beat.mp3 "use Seedance Mini at 480p to make a beat-synced video"` |
 | Create motion design | `npx makaron-cli chat --project <id> "make an animated Instagram story with this image"` |
 
 ### Marketplace skills
@@ -149,6 +149,21 @@ npx makaron-cli project media <projectId> --json
 
 This is project-scoped. `responses get <runId> --pick output` only returns artifacts from one run; `project media` returns the whole project timeline: original uploads, references, generated images, video snapshots, and editable compositions.
 
+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> --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.
+
+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.
+
+```bash
+npx makaron-cli chat --project auto --media-manifest set-01.json --json -b "Make a 30-second 9:16 TikTok with English VO and captions"
+```
+
 ### With video input (edit, compose, extend)
 
 ```bash
@@ -176,12 +191,13 @@ 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-resolution 480p \
-  -b "make a 15s beat-synced video"
+  -b "use Seedance Mini at 480p to make a 15s beat-synced video"
 ```
 
 `--audio` accepts repeatable local files or public URLs. Local MP3/WAV files must be 2-15s and <=15MB; reference audio currently works with Seedance video generation.
 
+`chat` intentionally has no video model or resolution flags. State both in the chat message so the Agent selects a compatible provider and resolution together. Use `video create` only when you explicitly need direct provider controls.
+
 ### Fix one video moment from a screenshot
 
 When a video is mostly good but one moment needs a local fix, attach a screenshot of the problem frame and describe the correction in normal language:
@@ -262,8 +278,9 @@ npx makaron-cli analyze --video input.mp4 "describe the key actions and pacing"
 npx makaron-cli video create --script "Shot 1 (5s): <<<image_1>>> ..." --image https://...jpg --duration 5 --video-model kling
 npx makaron-cli video create --script "Shot 1 (15s): <<<image_1>>> and <<<image_2>>> build a neon one-person studio" --image https://...jpg --image https://...webp --duration 15 --video-model seedance-mini --video-resolution 480p --aspect 9:16
 
-# 3b. Native SeeDance text-to-video (no image required)
+# 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
 
 # 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
@@ -279,9 +296,11 @@ 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 7), `--video <file|url>`, `--duration <seconds>`, `--aspect 9:16|16:9|1:1`, `--video-model seedance-fast|seedance-mini|seedance|kling|grok|google-omni`, `--video-resolution auto|480p|720p|1080p|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; 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, 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.
+
+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.
 
-Video edit model behavior: `--video-model kling --video` uses Kling base/direct edit internally; `--video-model seedance-fast --video`, `--video-model seedance-mini --video`, or `--video-model seedance --video` uses the SeeDance video-reference path and requires target <=15s, <=50MB, width/height 300-6000px, aspect ratio 0.4-2.5, and frame pixels 409,600-2,086,876. `--video-model google-omni --video` uses Gemini Omni direct video editing and accepts one reference video in Makaron. Output duration is clamped to 3-10s. Grok does not support video references.
+Video edit model behavior: `--video-model kling --video` uses Kling base/direct edit internally; `--video-model seedance-fast --video`, `--video-model seedance-mini --video`, or `--video-model seedance --video` uses the SeeDance video-reference path and requires target <=15s, <=50MB, width/height 300-6000px, aspect ratio 0.4-2.5, and frame pixels 409,600-2,086,876. `--video-model minimax-h3 --video` uses H3 feature/reference mode: up to 3 video references totaling <=15s, each <=50MB with width/height 256-5760px and aspect ratio 0.4-2.5. `--video-model google-omni --video` uses Gemini Omni direct video editing and accepts one reference video in Makaron. Output duration is clamped to 3-10s. Grok does not support video references.
 
 ### `music` — Music generation
 
@@ -412,7 +431,7 @@ send_message "All done!"
 ## Important Notes
 
 - One project = one conversation thread. All history is preserved.
-- One run at a time per project. New message interrupts previous run.
+- One active Agent Run at a time per project. A new message received while it is active is appended to that same Agent Run and processed at a durable work-unit boundary; it does not interrupt the execution or create a second owner for an in-progress Studio workflow.
 - Multi-image: `create --image a.jpg --image b.jpg` or `chat --image ref.jpg`.
 - Provider-generated videos can take 3-5 minutes; Grok is usually around 30-40 seconds; Gemini Omni is usually around 30-70 seconds plus Storage handoff. Remotion compositions should be converted with `materialize` / `responses get --materialize`, and timing should be read from `duration_seconds`, `render_seconds`, and `realtime_ratio`.
 - Music takes ~60 seconds. Appears in output when done.