makaron-cli 0.13.8 → 0.14.0

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "makaron-cli",
-  "version": "0.13.8",
+  "version": "0.14.0",
   "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.8",
+  "version": "0.14.0",
   "description": "Give Codex a creative agent. Pass complete creative requests and source media to Makaron Chat.",
   "author": {
     "name": "Versa AI",

package/README.md

@@ -170,26 +170,37 @@ 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:
+Typed external images and video ranges can be added without uploading the original media:
 
 ```bash
 npx makaron-cli project media add <projectId> \
+  --type image \
+  --source-url "https://cdn.example.com/product.jpg" \
+  --description "Hero product image"
+
+npx makaron-cli project media add <projectId> \
+  --type video \
   --source-url "https://cdn.example.com/source.mp4" \
   --start 12.5 --end 19 \
   --description "Racket frame molding"
 
 # Batch form: a JSON array or {"clips": [...]}
-npx makaron-cli project media add <projectId> --input ranges.json --json
+npx makaron-cli project media add <projectId> --input media.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.
+Every item must declare `type` as `image` or `video`. Images contain
+`source_url + type + description` and do not have a time range. Videos contain
+`source_url + type + start + end + description`; their ranges remain
+non-destructive metadata, and Remotion must trim the original URL to those exact
+source bounds. The returned `<<<media_N>>>` is immediately usable by a later
+Agent run.
 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,
+For an agent-to-agent handoff, create the project, import the typed external media,
 and start the Agent in one command:
 
 ```bash
@@ -200,9 +211,9 @@ npx makaron-cli chat --project auto \
 ```
 
 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
+item declares `type`. Images omit `start` and `end`; videos require both values
+in seconds. Array order is edit order. It is validated before project creation
+and supports up to 20 media items for one Makaron task. Batch planning remains
 the upstream orchestrator's responsibility: convert each plan into one manifest
 and start one independent Makaron task.
 
@@ -341,9 +352,12 @@ npx makaron-cli edit --image photo.jpg --ref style.jpg "match this style"
 
 # Output to file
 npx makaron-cli edit --image photo.jpg --out result.jpg "make it dramatic"
+
+# Strict transparent PNG/WebP output through GPT Image 2 (fails rather than returning opaque)
+npx makaron-cli edit --image-model openai --background transparent --out sticker.png "a magenta star sticker"
 ```
 
-Options: `--image`, `--image-model gemini|gemini-lite|qwen|openai|pony|wai`, `--ref <file>` (up to 3), `--aspect <ratio>`, `--out <path>`
+Options: `--image`, `--image-model gemini|gemini-lite|qwen|openai|pony|wai`, `--ref <file>` (up to 3), `--aspect <ratio>`, `--background auto|opaque|transparent`, `--out <path>`. Transparent output routes strictly to GPT Image 2 and is returned only when the provider supplies real PNG/WebP alpha.
 
 ### `video` — Standalone video tools (no project timeline)
 
@@ -377,7 +391,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, 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.
+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|sync-lipsync-v3`, `--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. `sync-lipsync-v3` requires exactly one video plus one MP3/WAV and preserves that replacement audio while aligning the mouth. 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.
 
@@ -428,6 +442,7 @@ type CompletionAction = {
 3. Stop when `status` is `"completed"`, `"failed"`, or `"aborted"`
 4. Top-level `status: "completed"` means ALL artifacts are ready (including rendered videos)
 5. If an async video fails, top-level `status` is `"failed"` and the failed video may include `completion_actions` for a safe retry or diagnosis. Agents can surface these as the next user-confirmed step.
+6. `responses get --wait` reconciles pending video output against completed Project Media with the same `snapshot_id` or `task_id`. A lagging Run row therefore does not block delivery after the durable project video is ready.
 
 ## Exit Codes
 
@@ -508,6 +523,15 @@ send_message "All done!"
 
 Admin commands require an API key with admin privileges. Ask your admin to run `makaron admin set-admin <your-email>` to grant access.
 
+### Add credits to a user
+
+Use either the account email address or the Supabase user UUID. Credits must be a positive integer.
+
+```bash
+npx makaron-cli admin add-credits user@example.com 1000
+npx makaron-cli admin add-credits <user-id> 1000 --json
+```
+
 ### List all marketplace skills
 
 ```bash

package/bin/makaron.mjs

@@ -174,25 +174,19 @@ function readJsonInput(filePath) {
   return JSON.parse(raw);
 }
 
-const MAX_MEDIA_MANIFEST_RANGES = 20;
+const MAX_MEDIA_MANIFEST_ITEMS = 20;
 
 function normalizeMediaManifest(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.clips)
-    ? manifest.clips
-    : Array.isArray(manifest.source_ranges)
-      ? manifest.source_ranges
-      : Array.isArray(manifest.sourceRanges)
-        ? manifest.sourceRanges
-        : null;
+    throw new Error('Media manifest must be a JSON object or an array of media items.');
+  }
+  const rawRanges = Array.isArray(manifest.clips) ? manifest.clips : null;
   if (!rawRanges?.length) {
     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.`);
+  if (rawRanges.length > MAX_MEDIA_MANIFEST_ITEMS) {
+    throw new Error(`Media manifest supports at most ${MAX_MEDIA_MANIFEST_ITEMS} media items per Makaron task.`);
   }
 
   const sourceRanges = rawRanges.map((raw, index) => {
@@ -207,8 +201,19 @@ function normalizeMediaManifest(input) {
     if (!['http:', 'https:'].includes(parsed.protocol)) {
       throw new Error(`clips[${index}].source_url must use HTTP or HTTPS.`);
     }
-    const start = Number(raw.start ?? raw.start_sec);
-    const end = Number(raw.end ?? raw.end_sec);
+    const declaredType = raw.type;
+    if (declaredType !== 'image' && declaredType !== 'video') {
+      throw new Error(`clips[${index}].type must be image or video.`);
+    }
+    const description = typeof raw.description === 'string' ? raw.description.trim() : '';
+    if (declaredType === 'image') {
+      if (raw.start !== undefined || raw.end !== undefined || raw.start_sec !== undefined || raw.end_sec !== undefined) {
+        throw new Error(`clips[${index}] image items must not include start or end.`);
+      }
+      return { source_url: sourceUrl, type: 'image', description };
+    }
+    const start = Number(raw.start);
+    const end = Number(raw.end);
     if (!Number.isFinite(start) || start < 0) {
       throw new Error(`clips[${index}].start must be a finite number >= 0.`);
     }
@@ -217,9 +222,10 @@ function normalizeMediaManifest(input) {
     }
     return {
       source_url: sourceUrl,
+      type: declaredType,
       start,
       end,
-      description: typeof raw.description === 'string' ? raw.description.trim() : '',
+      description,
     };
   });
 
@@ -328,6 +334,86 @@ function normalizeRunResponse(data) {
   return data;
 }
 
+function projectMediaIdentity(item) {
+  const snapshotId = item?.snapshot_id || item?.snapshotId;
+  const taskId = item?.task_id || item?.taskId;
+  return {
+    snapshotId: typeof snapshotId === 'string' && snapshotId ? snapshotId : null,
+    taskId: typeof taskId === 'string' && taskId ? taskId : null,
+  };
+}
+
+function findMatchingCompletedProjectVideo(item, media) {
+  const identity = projectMediaIdentity(item);
+  if (!identity.snapshotId && !identity.taskId) return null;
+  return (media || []).find(candidate => {
+    if (candidate?.type !== 'video' || candidate?.status !== 'completed' || !candidate?.url) return false;
+    const candidateIdentity = projectMediaIdentity(candidate);
+    return (identity.snapshotId && candidateIdentity.snapshotId === identity.snapshotId)
+      || (identity.taskId && candidateIdentity.taskId === identity.taskId);
+  }) || null;
+}
+
+async function reconcileRunWithProjectMedia(baseUrl, headers, data) {
+  normalizeRunResponse(data);
+  const output = Array.isArray(data.output) ? data.output : [];
+  const pendingVideos = output.filter(item =>
+    item?.type === 'video' && (item.status === 'queued' || item.status === 'rendering')
+  );
+  const agentDone = data.agent_status === 'completed'
+    || (data.status === 'in_progress' && data.incomplete === true);
+  if (!agentDone || pendingVideos.length === 0 || !data.projectId) return data;
+
+  let projectMedia;
+  try {
+    const res = await fetch(`${baseUrl}/api/projects/${data.projectId}/media`, { headers });
+    if (!res.ok) return data;
+    projectMedia = await res.json();
+  } catch {
+    return data;
+  }
+
+  let reconciled = false;
+  for (const item of pendingVideos) {
+    const completed = findMatchingCompletedProjectVideo(item, projectMedia.media);
+    if (!completed) continue;
+    const identity = projectMediaIdentity(completed);
+    item.status = 'completed';
+    item.url = completed.url;
+    if (identity.snapshotId) item.snapshot_id = identity.snapshotId;
+    if (identity.taskId) item.task_id = identity.taskId;
+    if (completed.posterUrl) item.poster_url = completed.posterUrl;
+    for (const field of ['duration', 'width', 'height']) {
+      if (typeof completed[field] === 'number') item[field] = completed[field];
+    }
+
+    const legacyVideos = Array.isArray(data.result?.videos) ? data.result.videos : [];
+    const legacy = legacyVideos.find(video => {
+      const legacyIdentity = projectMediaIdentity(video);
+      return (identity.snapshotId && legacyIdentity.snapshotId === identity.snapshotId)
+        || (identity.taskId && legacyIdentity.taskId === identity.taskId);
+    });
+    if (legacy) {
+      legacy.status = 'completed';
+      legacy.videoUrl = completed.url;
+      if (identity.snapshotId && !legacy.snapshotId) legacy.snapshotId = identity.snapshotId;
+    }
+    reconciled = true;
+  }
+
+  if (!reconciled) return data;
+  const pendingArtifacts = output.some(item =>
+    (item?.type === 'video' || item?.type === 'music')
+    && (item.status === 'queued' || item.status === 'rendering')
+  );
+  if (!pendingArtifacts) {
+    data.status = 'completed';
+    data.incomplete = false;
+    delete data.next_poll_after_ms;
+  }
+  return data;
+}
+
 function collectCompletionActions(data) {
   const items = [];
   const add = (action, source) => {
@@ -367,7 +453,7 @@ 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 + end + description clips before this run.
+  --media-manifest <file|-> Import typed image/video media 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.
@@ -612,6 +698,7 @@ async function pollRun(baseUrl, headers, runId, opts = {}) {
         continue;
       }
       data = await res.json();
+      data = await reconcileRunWithProjectMedia(baseUrl, headers, data);
     } catch {
       continue;
     }
@@ -764,6 +851,7 @@ async function watchRun(baseUrl, headers, runId, opts = {}) {
         continue;
       }
       data = await res.json();
+      data = await reconcileRunWithProjectMedia(baseUrl, headers, data);
     } catch {
       await new Promise(r => setTimeout(r, interval));
       continue;
@@ -949,7 +1037,10 @@ async function addProjectMediaSourceRanges(baseUrl, headers, projectId, ranges,
   }
   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)'}`);
+      const range = item.type === 'video' && Number.isFinite(item.start_sec) && Number.isFinite(item.end_sec)
+        ? ` ${formatSeconds(item.start_sec)}-${formatSeconds(item.end_sec)}s`
+        : '';
+      console.log(`${item.ref} [${item.type || 'media'}] ${item.source_url}${range}${item.created ? '' : ' (existing)'}`);
     }
   }
   return data;
@@ -1705,7 +1796,22 @@ function saveMcpImage(result, outputPath) {
   const imageBlock = content.find(c => c.type === 'image');
   if (textBlock) process.stderr.write(`${textBlock.text}\n`);
   if (imageBlock) {
-    const out = outputPath || `makaron-output-${Date.now()}.jpg`;
+    const extension = imageBlock.mimeType === 'image/png'
+      ? 'png'
+      : imageBlock.mimeType === 'image/webp'
+        ? 'webp'
+        : 'jpg';
+    let out = outputPath || `makaron-output-${Date.now()}.${extension}`;
+    if (outputPath) {
+      const requestedExtension = path.extname(outputPath).slice(1).toLowerCase();
+      const compatible = extension === 'jpg'
+        ? ['jpg', 'jpeg'].includes(requestedExtension)
+        : requestedExtension === extension;
+      if (!compatible) {
+        out = `${outputPath.slice(0, outputPath.length - path.extname(outputPath).length)}.${extension}`;
+        process.stderr.write(`Output is ${imageBlock.mimeType}; saving as ${out} so bytes and filename agree.\n`);
+      }
+    }
     fs.writeFileSync(out, Buffer.from(imageBlock.data, 'base64'));
     console.log(out);
     return out;
@@ -1756,8 +1862,10 @@ 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 <n> --end <n>
-                                     Add an external source range without uploading video
+  project media add <projectId> --type image --source-url <url>
+                                     Add an external image without uploading it
+  project media add <projectId> --type video --source-url <url> --start <n> --end <n>
+                                     Add an external video range without uploading it
   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)
@@ -1769,7 +1877,7 @@ Commands:
   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
+                                     Create, import typed external media, 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
@@ -1791,7 +1899,7 @@ Commands:
   video script|create|status         Video generation
   music create|status                Music generation
 
-  admin                              Admin commands (skills, upload, set-admin)
+  admin                              Admin commands (skills, credits, upload, set-admin)
 
 Examples:
   makaron chat --project auto "plan a launch poster"
@@ -1879,11 +1987,12 @@ 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 <n> --end <n> [--description <text>] [--json]
-  makaron project media add <projectId> --input <ranges.json> [--json]`);
+  makaron project media add <projectId> --type image --source-url <url> [--description <text>] [--json]
+  makaron project media add <projectId> --type video --source-url <url> --start <n> --end <n> [--description <text>] [--json]
+  makaron project media add <projectId> --input <media.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 + end media
+  project media add <projectId> ...     Add typed external image/video media
 `);
   } else if (topic === 'abort') {
     console.log('Usage: makaron abort <runId>');
@@ -1923,12 +2032,12 @@ Not sure which built-in skill to use? Start with:
   composition status <jobId> [--wait] [--json]
 `);
   } else if (topic === 'edit') {
-    console.log('Usage: makaron edit [--image <file|url>] [--image-model gemini|gemini-lite|qwen|openai|pony|wai] [--skill enhance|creative|wild|captions] [--ref <file>] [--out <file>] "prompt"');
+    console.log('Usage: makaron edit [--image <file|url>] [--image-model gemini|gemini-lite|qwen|openai|pony|wai] [--skill enhance|creative|wild|captions] [--ref <file>] [--aspect <ratio>] [--background auto|opaque|transparent] [--out <file>] "prompt"');
   } else if (topic === 'analyze') {
     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 <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 === '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|sync-lipsync-v3] [--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
@@ -1936,6 +2045,7 @@ Not sure which built-in skill to use? Start with:
   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 create --script "Use the supplied audio" --video <url> --audio <url> --video-model sync-lipsync-v3  Lip-sync exact replacement audio
   video status <taskId>                                      Check video status
   video status --snapshot <snapshotId> [--wait]              Check v2 video snapshot
 `);
@@ -1951,6 +2061,7 @@ Not sure which built-in skill to use? Start with:
     else if (subtopic === 'skill-categories') console.log('Usage: makaron admin skill-categories [--json|add|update|delete] ...');
     else if (subtopic === 'upload') console.log('Usage: makaron admin upload <local-file> <storage-path>');
     else if (subtopic === 'fetch-skill') console.log('Usage: makaron admin fetch-skill <share-code|url>');
+    else if (subtopic === 'add-credits') console.log('Usage: makaron admin add-credits <email-or-user-id> <credits> [--json]');
     else if (subtopic === 'set-admin') console.log('Usage: makaron admin set-admin <email>');
     else console.log(`Admin commands:
   admin skills                         List all marketplace skills
@@ -1963,6 +2074,7 @@ Not sure which built-in skill to use? Start with:
   admin skill-categories delete <id>   Delete a category
   admin upload <file> <storage-path>   Upload file to Storage
   admin fetch-skill <code|url>         Download skill from share link
+  admin add-credits <user> <credits>   Add credits by email or user ID
   admin set-admin <email>              Grant admin access to a user
 `);
   } else if (topic === 'register') {
@@ -2184,12 +2296,12 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
     );
     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.stderr.write(`❌ Imported ${importedManifestMedia.length}/${mediaManifest.sourceRanges.length} media item(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`);
+    uploadedTurnVideoCount += importedManifestMedia.filter(item => item.type === 'video').length;
+    process.stderr.write(`📎 Imported ${importedManifestMedia.length} typed external media item(s) from media manifest\n`);
   }
   // Upload additional images to existing project
   if (imageFileList.length > 0 || imageUrlList.length > 0) {
@@ -2347,9 +2459,12 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
           ...(importedManifestMedia.length ? {
             importedMedia: importedManifestMedia.map(item => ({
               ref: item.ref,
+              type: item.type,
               source_url: item.source_url,
-              start_sec: item.start_sec,
-              end_sec: item.end_sec,
+              ...(item.type === 'video' ? {
+                start_sec: item.start_sec,
+                end_sec: item.end_sec,
+              } : {}),
             })),
           } : {}),
         }));
@@ -2398,7 +2513,7 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
       const res = await fetch(`${baseUrl}/api/agent/run/${runId}`, { headers });
       if (!res.ok) { process.stderr.write(`Error ${res.status}: ${await res.text()}\n`); process.exit(1); }
       let data = await res.json();
-      normalizeRunResponse(data);
+      data = await reconcileRunWithProjectMedia(baseUrl, headers, data);
       if (exportCompositions && data.status === 'completed') {
         data = await exportAnimatedCompositionsFromRun(baseUrl, headers, data, { publish: publishExports, quiet: jsonOutput || !!pick });
       }
@@ -2614,7 +2729,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 <n> --end <n>'); process.exit(1); }
+      if (!projectId) { console.error('Usage: makaron project media add <projectId> --type <image|video> --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;
@@ -2622,26 +2737,25 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
       const inputPath = readOption('--input');
       let ranges;
       if (inputPath) {
-        const input = readJsonInput(inputPath);
-        ranges = Array.isArray(input) ? input : input.clips || input.source_ranges || input.sourceRanges;
+        const normalized = normalizeMediaManifest(readJsonInput(inputPath));
+        ranges = normalized.sourceRanges;
       } else {
         const sourceUrl = readOption('--source-url');
-        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>.');
+        const type = readOption('--type');
+        const start = readOption('--start');
+        const end = readOption('--end');
+        if (!sourceUrl || (type !== 'image' && type !== 'video')) {
+          console.error('Provide --type <image|video> and --source-url <url>, or --input <manifest.json>.');
           process.exit(1);
         }
-        ranges = [{
+        const normalized = normalizeMediaManifest([{
           source_url: sourceUrl,
-          start,
-          end,
+          type,
+          ...(start !== undefined ? { start } : {}),
+          ...(end !== undefined ? { end } : {}),
           ...(readOption('--description') ? { description: readOption('--description') } : {}),
-        }];
-      }
-      if (!Array.isArray(ranges) || !ranges.length) {
-        console.error('Input must contain a non-empty clips array.');
-        process.exit(1);
+        }]);
+        ranges = normalized.sourceRanges;
       }
       await addProjectMediaSourceRanges(baseUrl, headers, projectId, ranges, { json: jsonOutput });
     } else {
@@ -2652,7 +2766,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 + end media
+  project media add <projectId> ...     Add typed external image/video media
 `);
   }
 } else if (command === 'abort') {
@@ -2690,11 +2804,19 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
       editArgs.referenceImages.push(imageToArg(args[++i]));
     }
     else if (args[i] === '--aspect' && args[i + 1]) editArgs.aspectRatio = args[++i];
+    else if (args[i] === '--background' && args[i + 1]) {
+      const background = args[++i];
+      if (!['auto', 'opaque', 'transparent'].includes(background)) {
+        console.error('Invalid --background. Use auto, opaque, or transparent.');
+        process.exit(1);
+      }
+      editArgs.background = background;
+    }
     else if (args[i] === '--out' && args[i + 1]) outputPath = args[++i];
     else promptParts.push(args[i]);
   }
   editArgs.editPrompt = promptParts.join(' ');
-  if (!editArgs.editPrompt) { console.error('Usage: makaron edit [--image <file|url>] [--image-model gemini|gemini-lite|qwen|openai|pony|wai] [--ref <file>] [--out <file>] "prompt"'); process.exit(1); }
+  if (!editArgs.editPrompt) { console.error('Usage: makaron edit [--image <file|url>] [--image-model gemini|gemini-lite|qwen|openai|pony|wai] [--ref <file>] [--aspect <ratio>] [--background auto|opaque|transparent] [--out <file>] "prompt"'); process.exit(1); }
   process.stderr.write('🎨 Generating...\n');
   const result = await callMcpTool(baseUrl, headers, 'makaron_edit_image', editArgs);
   saveMcpImage(result, outputPath);
@@ -2768,6 +2890,7 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
     const isSeedance25 = selectedVideoModel === 'seedance-2.5';
     const isSeedanceModel = selectedVideoModel === 'seedance-fast' || selectedVideoModel === 'seedance-mini' || selectedVideoModel === 'seedance' || isSeedance25;
     const isMinimaxH3 = selectedVideoModel === 'minimax-h3';
+    const isSyncLipsync = selectedVideoModel === 'sync-lipsync-v3';
     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]');
@@ -2779,6 +2902,10 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
     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 (isSyncLipsync && (images.length !== 0 || videos.length !== 1 || audios.length !== 1)) { console.error('Sync Lipsync v3 requires exactly one --video and one --audio, with no --image.'); process.exit(1); }
+    if (isSyncLipsync && !/<<<audio_1>>>/i.test(script)) {
+      script += '\nUse <<<audio_1>>> as the exact replacement soundtrack.';
+    }
     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); }
@@ -2788,8 +2915,9 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
       process.exit(1);
     }
 
-    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;
+    let providerMaxDuration = isSeedance25 ? SEEDANCE25_MAX_VIDEO_REFERENCE_DURATION : MAX_VIDEO_PROVIDER_REFERENCE_DURATION;
+    if (isSyncLipsync) providerMaxDuration = 60;
+    const providerMaxPixels = isSyncLipsync || 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);
@@ -2804,7 +2932,7 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
         maxDuration: providerMaxDuration,
         durationTolerance: MAX_VIDEO_PROVIDER_REFERENCE_DURATION_TOLERANCE,
         maxFramePixels: providerMaxPixels,
-        maxFileSize: isSeedance25 ? 200 * 1024 * 1024 : MAX_VIDEO_UPLOAD_FILE_SIZE,
+        maxFileSize: isSeedance25 || isSyncLipsync ? 200 * 1024 * 1024 : MAX_VIDEO_UPLOAD_FILE_SIZE,
         ...(selectedVideoModel === 'minimax-h3' ? {
           allowedExtensions: ['mp4', 'mov'],
           minSide: MINIMAX_H3_MIN_VIDEO_SIDE,
@@ -2830,7 +2958,7 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
     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 });
+      const valid = validateAudioReferenceFile(audio, { maxDuration: isSyncLipsync ? 60 : 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' });
@@ -2840,7 +2968,9 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
     // Standalone MCP tool (no project timeline write)
     process.stderr.write('🎬 Submitting video...\n');
     const resolvedOperation = videoOperation || (isSeedance25 && videoUrls.length ? 'edit' : 'generate');
-    const vArgs = isSeedance25
+    const vArgs = isSyncLipsync
+      ? { script, images, videoUrls, audioUrls, videoModel: selectedVideoModel, videoResolution }
+      : isSeedance25
       ? { script, images, videoUrls, audioUrls, videoModel: selectedVideoModel, videoResolution, operation: resolvedOperation, extendDirection, outputFormat, generateAudio, contentFilter, webSearch }
       : isMinimaxH3
         ? { script, images, videoUrls, audioUrls, videoModel: selectedVideoModel, videoResolution }
@@ -2851,7 +2981,7 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
     if (effectiveDuration) vArgs.duration = effectiveDuration;
     if (aspectRatio) vArgs.aspectRatio = aspectRatio;
     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 result = await callMcpTool(baseUrl, headers, videoUrls.length && !isSeedance25 && !isMinimaxH3 && !isSyncLipsync ? 'makaron_edit_video' : 'makaron_create_video', vArgs);
     const text = result?.content?.find(c => c.type === 'text')?.text;
     if (text) {
       console.log(text);
@@ -2898,6 +3028,7 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
   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 create --script "Use the supplied audio" --video <url> --audio <url> --video-model sync-lipsync-v3  Lip-sync exact replacement audio
   video status <taskId>                                      Check video status
   video status --snapshot <snapshotId> [--wait]              Check v2 video snapshot
 `);
@@ -3103,6 +3234,31 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
     if (!res.ok) { console.error(`Error ${res.status}:`, await res.text()); process.exit(1); }
     console.log(`✅ ${email} is now admin`);
 
+  } else if (sub === 'add-credits') {
+    const user = args[2]?.trim();
+    const credits = Number(args[3]);
+    if (!user || !Number.isSafeInteger(credits) || credits <= 0) {
+      console.error('Usage: makaron admin add-credits <email-or-user-id> <credits> [--json]');
+      console.error('Credits must be a positive integer.');
+      process.exit(1);
+    }
+
+    const res = await fetch(`${baseUrl}/api/admin/add-credits`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json', ...headers },
+      body: JSON.stringify({ email: user, credits }),
+    });
+    const data = await res.json().catch(() => null);
+    if (!res.ok) {
+      console.error(`Error ${res.status}:`, data?.error || 'Failed to add credits');
+      process.exit(1);
+    }
+    if (args.includes('--json')) {
+      console.log(JSON.stringify(data));
+    } else {
+      console.log(`✅ Added ${credits} credits to ${user}. New balance: ${data.newBalance}`);
+    }
+
   } else {
     console.log(`Admin commands:
   admin skills                         List all marketplace skills
@@ -3115,6 +3271,7 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
   admin skill-categories delete <id>   Delete a category
   admin upload <file> <storage-path>   Upload file to Storage
   admin fetch-skill <code|url>         Download skill from share link
+  admin add-credits <user> <credits>   Add credits by email or user ID
   admin set-admin <email>              Grant admin access to a user
 `);
   }

package/package.json

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

package/skills/makaron/SKILL.md

@@ -162,7 +162,7 @@ npx makaron-cli chat --project auto \
 
 `--skill` accepts an installed skill name, a marketplace UUID, or a unique marketplace label. Marketplace search matches every localized title, every localized default prompt, and category ids. If a marketplace skill is matched, the CLI installs or reuses it and sends `[Active skill: <installed-skill-name>]` to Makaron Agent. Do not call admin skill commands for ordinary users. There is intentionally no user-facing CLI delete command for marketplace skills.
 
-For an explicitly authorized marketplace administrator, `admin skills` shows category assignment and 4-locale title/prompt completeness, while `admin skill-categories` supports list/add/update/delete. New skills must include `en`, `zh`, `zh-Hant`, and `ja` in both `labels` and `prompts`, plus at least one existing `categories` id. Partial localized updates are safely merged server-side.
+For an explicitly authorized administrator, `admin add-credits <email-or-user-id> <positive-integer> [--json]` adds credits to a user. Marketplace administrators can use `admin skills` to see category assignment and 4-locale title/prompt completeness, while `admin skill-categories` supports list/add/update/delete. New skills must include `en`, `zh`, `zh-Hant`, and `ja` in both `labels` and `prompts`, plus at least one existing `categories` id. Partial localized updates are safely merged server-side.
 
 ### With additional images (existing project)
 
@@ -180,16 +180,17 @@ 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:
+Publish typed external images and video intervals directly into that Media List without uploading the original media:
 
 ```bash
-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
+npx makaron-cli project media add <projectId> --type image --source-url "https://cdn.example.com/product.jpg" --description "Hero product image"
+npx makaron-cli project media add <projectId> --type video --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 media.json --json
 ```
 
-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.
+The JSON input may be an array or `{ "clips": [...] }`. Every item declares `type` as `image` or `video`. Images have `source_url + type + description` and no time range. Videos have `source_url + type + 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.
+For one-call orchestration, use `chat --project auto --media-manifest plan.json`. Makaron validates the manifest, creates the project, imports its media, 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"
@@ -292,9 +293,12 @@ npx makaron-cli edit --image photo.jpg --ref style.jpg "match this style"
 
 # Output to file
 npx makaron-cli edit --image photo.jpg --out result.jpg "make it dramatic"
+
+# Strict transparent output through GPT Image 2
+npx makaron-cli edit --image-model openai --background transparent --out sticker.png "a magenta star sticker"
 ```
 
-Options: `--image`, `--image-model gemini|gemini-lite|qwen|openai|pony|wai`, `--ref <file>` (up to 3), `--aspect <ratio>`, `--out <path>`
+Options: `--image`, `--image-model gemini|gemini-lite|qwen|openai|pony|wai`, `--ref <file>` (up to 3), `--aspect <ratio>`, `--background auto|opaque|transparent`, `--out <path>`. Transparent output routes strictly to GPT Image 2 and fails instead of returning an opaque fallback.
 
 ### `video` — Standalone video tools (no project timeline)
 
@@ -327,7 +331,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, 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.
+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|sync-lipsync-v3`, `--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. `sync-lipsync-v3` requires exactly one video plus one MP3/WAV and preserves that replacement audio while aligning the mouth. 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.
 
@@ -378,6 +382,7 @@ type CompletionAction = {
 3. Stop when `status` is `"completed"`, `"failed"`, or `"aborted"`
 4. Top-level `status: "completed"` means ALL artifacts are ready (including rendered videos)
 5. If an async video fails, top-level `status` is `"failed"` and the failed video may include `completion_actions` for a safe retry or diagnosis. Agents can surface these as the next user-confirmed step.
+6. `responses get --wait` reconciles pending video output against completed Project Media with the same `snapshot_id` or `task_id`. A lagging Run row therefore does not block delivery after the durable project video is ready.
 
 ## Exit Codes