makaron-cli 0.13.1 → 0.13.2

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "makaron-cli",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "description": "AI image editing, video generation, music creation, and marketplace skill workflows via CLI. Agents can self-register, install skills, create projects, and produce creative media.",
   "author": {
     "name": "Makaron AI",

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "makaron-cli",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "description": "AI image editing, video generation, music creation, and marketplace skill workflows via CLI. Agents can self-register, install skills, create projects, and produce creative media.",
   "displayName": "Makaron",
   "shortDescription": "AI image/video/music creation from the terminal",

package/README.md

@@ -48,6 +48,12 @@ export MAKARON_API_KEY=mk_live_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
 Verify: `npx makaron-cli list` should show projects.
 
+Check the current credit balance and subscription:
+```bash
+npx makaron-cli credits
+npx makaron-cli credits --json
+```
+
 ### Let a human claim your account
 
 After registering, generate a link for a human to link your API key to their account:

package/bin/makaron.mjs

@@ -28,6 +28,7 @@ const NPM_PACKAGE_NAME = 'makaron-cli';
 const UPDATE_CHECK_INTERVAL_MS = 24 * 60 * 60 * 1000;
 const UPDATE_CHECK_TIMEOUT_MS = 400;
 const AGENT_MODELS = ['auto', 'gpt-5.6-terra', 'gpt-5.6-sol', 'gpt-5.6-luna', 'grok-4.5', 'deepseek-v4-pro'];
+const AGENT_WAIT_TIMEOUT_SECONDS = Math.max(900, Number(process.env.MAKARON_AGENT_WAIT_TIMEOUT_SECONDS || 10_800));
 
 // Public anon key (safe to embed — only enables auth, not data access)
 const SUPABASE_URL = 'https://sdyrtztrjgmmpnirswxt.supabase.co';
@@ -363,6 +364,8 @@ async function streamAgent(baseUrl, headers, projectId, prompt, opts = {}) {
       ...(opts.videoModel ? { videoModel: opts.videoModel } : {}),
       ...(opts.videoResolution ? { videoResolution: opts.videoResolution } : {}),
       ...(opts.agentModel && opts.agentModel !== 'auto' ? { agentModel: opts.agentModel } : {}),
+      ...(opts.uploadedVideoCount ? { uploadedVideoCount: opts.uploadedVideoCount } : {}),
+      ...(opts.turnMediaCount ? { turnMediaCount: opts.turnMediaCount } : {}),
     }),
     signal: controller.signal,
   });
@@ -476,6 +479,8 @@ async function submitRun(baseUrl, headers, projectId, prompt, opts = {}) {
   if (opts.currentSnapshotIndex != null) body.currentSnapshotIndex = opts.currentSnapshotIndex;
   if (opts.isNsfw) body.isNsfw = opts.isNsfw;
   if (opts.audioAttachments?.length) body.audioAttachments = opts.audioAttachments;
+  if (opts.uploadedVideoCount) body.uploadedVideoCount = opts.uploadedVideoCount;
+  if (opts.turnMediaCount) body.turnMediaCount = opts.turnMediaCount;
 
   const res = await fetch(`${baseUrl}/api/agent/run`, {
     method: 'POST',
@@ -519,7 +524,7 @@ async function pollRun(baseUrl, headers, runId, opts = {}) {
     try {
       const res = await fetch(`${baseUrl}/api/agent/run/${runId}?${params}`, { headers });
       if (!res.ok) {
-        if (elapsed > 800) { process.stderr.write(`\n❌ Timeout after ${elapsed}s\n`); process.exit(1); }
+        if (elapsed > AGENT_WAIT_TIMEOUT_SECONDS) { process.stderr.write(`\n❌ Timeout after ${elapsed}s\n`); process.exit(1); }
         continue;
       }
       data = await res.json();
@@ -569,6 +574,13 @@ async function pollRun(baseUrl, headers, runId, opts = {}) {
           case 'music_task':
             process.stderr.write(`\n🎵 Music submitted: ${ev.data?.taskId}\n`);
             break;
+          case 'studio_run': {
+            const stage = ev.data?.currentStage || ev.data?.current_stage || 'complete';
+            const recipe = ev.data?.recipe || 'studio';
+            const status = ev.data?.status || 'running';
+            process.stderr.write(`\nStudio Run: ${recipe} / ${stage} / ${status}\n`);
+            break;
+          }
           case 'error':
             process.stderr.write(`\n❌ Error: ${ev.data?.message}\n`);
             break;
@@ -580,6 +592,7 @@ async function pollRun(baseUrl, headers, runId, opts = {}) {
 
     // Check terminal status
     if (data.status === 'completed' || data.status === 'failed' || data.status === 'aborted') {
+      normalizeRunResponse(data);
       if (printedText && !json) process.stdout.write('\n');
       if (data.status === 'completed' && exportCompositions) {
         data = await exportAnimatedCompositionsFromRun(baseUrl, headers, data, {
@@ -611,7 +624,7 @@ async function pollRun(baseUrl, headers, runId, opts = {}) {
         process.stderr.write(`🔗  ${APP_URL}/projects/${data.projectId}\n`);
       }
 
-      if (data.status === 'failed') process.exit(1);
+      if (data.status === 'failed' || data.status === 'aborted') process.exit(1);
       return data;
     }
   }
@@ -620,11 +633,15 @@ async function pollRun(baseUrl, headers, runId, opts = {}) {
 // ─── Pick Helper ────────────────────────────────────────────────────────────
 
 function applyPick(data, field) {
+  const videoUrls = [...new Set([
+    ...(data.output || []).filter(o => o.type === 'video' && o.url).map(o => o.url),
+    ...(data.result?.videos || []).filter(v => v.videoUrl).map(v => v.videoUrl),
+  ])];
   switch (field) {
     case 'first_image_url': return data.output?.find(o => o.type === 'image')?.url || null;
     case 'image_urls': return (data.output || []).filter(o => o.type === 'image' && o.url).map(o => o.url);
-    case 'first_video_url': return data.output?.find(o => o.type === 'video' && o.url)?.url || null;
-    case 'video_urls': return (data.output || []).filter(o => o.type === 'video' && o.url).map(o => o.url);
+    case 'first_video_url': return videoUrls[0] || null;
+    case 'video_urls': return videoUrls;
     case 'first_design_url': return data.output?.find(o => o.type === 'design')?.url || null;
     case 'design_urls': return (data.output || []).filter(o => o.type === 'design' && o.url).map(o => o.url);
     case 'first_music_url': return data.output?.find(o => o.type === 'music' && o.url)?.url || null;
@@ -635,6 +652,8 @@ function applyPick(data, field) {
       description: action.description,
       source: action.source,
     }));
+    case 'studio_run': return [...(data.output || [])].reverse().find(o => o.type === 'studio_run') || null;
+    case 'studio_recipe': return [...(data.output || [])].reverse().find(o => o.type === 'studio_run')?.recipe || null;
     case 'project_url': return data.project_url || data.projectUrl || null;
     case 'output': return data.output || [];
     case 'text': return data.output?.find(o => o.type === 'text')?.content || null;
@@ -656,7 +675,7 @@ async function watchRun(baseUrl, headers, runId, opts = {}) {
     try {
       const res = await fetch(`${baseUrl}/api/agent/run/${runId}`, { headers });
       if (!res.ok) {
-        if (elapsed > 800) { process.stderr.write(`Timeout after ${elapsed}s\n`); process.exit(2); }
+        if (elapsed > AGENT_WAIT_TIMEOUT_SECONDS) { process.stderr.write(`Timeout after ${elapsed}s\n`); process.exit(2); }
         await new Promise(r => setTimeout(r, interval));
         continue;
       }
@@ -1042,6 +1061,33 @@ async function fetchMarketplaceSkills(baseUrl, opts = {}) {
   return skills.map(normalizeMarketplaceSkill);
 }
 
+async function fetchBuiltInSkills(baseUrl) {
+  const res = await fetch(`${baseUrl}/api/skills?include=internal`);
+  if (!res.ok) {
+    process.stderr.write(`Error ${res.status}: ${await res.text()}\n`);
+    process.exit(1);
+  }
+  const data = await res.json();
+  return (data.skills || []).filter(skill => skill.builtIn);
+}
+
+function printBuiltInSkills(skills) {
+  if (!skills.length) {
+    console.log('No built-in skills found.');
+    return;
+  }
+  console.log(`Built-in skills: ${skills.length}\n`);
+  for (const skill of skills) {
+    const recipe = skill.studioRunRecipe ? `  [Studio Run: ${skill.studioRunRecipe}]` : '';
+    const source = skill.sourceMediaRequired ? '  [source media required]' : '';
+    const adapter = skill.sourceProject === 'openmontage'
+      ? `  [OpenMontage: ${skill.supportLevel || 'adapted'}${skill.canonicalSkill && skill.canonicalSkill !== skill.name ? ` -> ${skill.canonicalSkill}` : ''}]`
+      : '';
+    console.log(`  ${skill.name}${recipe}${source}${adapter}`);
+    if (skill.description) console.log(`    ${String(skill.description).replace(/\s+/g, ' ').trim()}`);
+  }
+}
+
 function marketplaceSearchText(skill) {
   const localized = [...localizedValues(skill.labels), ...localizedValues(skill.prompts)];
   return [
@@ -1554,6 +1600,7 @@ Commands:
   register --verify --challenge-id <id> --answer <n>  Verify and save API key
   claim                              Get claim URL for human to link account
   login                              Log in to Makaron (human interactive)
+  credits                            Show current credit balance
   list (ls)                          List all projects
   project media <projectId> --json    List timeline media for a project
   create --image <file>              Create project from local image
@@ -1561,7 +1608,7 @@ Commands:
   create --title "name"              Create empty project (text-to-image)
 
   chat --project <id> "message"      Chat (non-blocking, polls for result)
-  chat --project <id> --skill <id>   Use or auto-install a marketplace skill
+  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 <id> -b "message"   Background: submit and print runId
@@ -1578,7 +1625,7 @@ Commands:
                                      Export editable Remotion composition to MP4
   responses list --project <id>      List runs for a project
   abort <runId>                      Abort a running Agent
-  skills list|search|show|install    Browse and install marketplace skills
+  skills list|search|show|install    Browse built-in and marketplace skills
 
   edit [--image <file>] "prompt"     AI image edit / text-to-image
   analyze --video <file|url>         Analyze video content
@@ -1677,6 +1724,8 @@ function printHelp(topic, subtopic) {
 `);
   } else if (topic === 'list' || topic === 'ls') {
     console.log('Usage: makaron list');
+  } 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]');
     else console.log(`Project commands:
@@ -1689,13 +1738,17 @@ function printHelp(topic, subtopic) {
   } else if (topic === 'install-skill') {
     console.log('Usage: makaron install-skill [--global] [--agent <agent>] [--yes]');
   } else if (topic === 'skills') {
-    if (subtopic === 'list') console.log('Usage: makaron skills list [--json]');
+    if (subtopic === 'list') console.log('Usage: makaron skills list [--built-in] [--json]');
     else if (subtopic === 'search') console.log('Usage: makaron skills search <query> [--json]');
     else if (subtopic === 'show') console.log('Usage: makaron skills show <marketplace-id|label> [--json]');
     else if (subtopic === 'install') console.log('Usage: makaron skills install <marketplace-id|label> [--json]');
-    else console.log(`Skill marketplace commands:
+    else console.log(`Skill commands:
+  skills list --built-in              List all built-in Makaron skills and Studio Run recipes
+  skills list --built-in --openmontage
+                                      List OpenMontage-native adapters only
   skills list                         List marketplace skills
   skills search <query>               Search marketplace skills
+  skills show <id|label> --built-in   Show a built-in skill
   skills show <id|label>              Show a marketplace skill
   skills install <id|label>           Install a marketplace skill to your workspace
 
@@ -1783,6 +1836,29 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
   installAgentSkill(args.slice(1));
 } else if (command === 'login') {
   await login();
+} else if (command === 'credits' || command === 'credit' || command === 'balance') {
+  const { headers, baseUrl } = getAuth();
+  const res = await fetch(`${baseUrl}/api/billing/credits`, { headers });
+  const data = await res.json().catch(() => null);
+  if (!res.ok || !data) {
+    const message = data?.error || data?.message || (res.ok ? 'Invalid response' : `HTTP ${res.status}`);
+    process.stderr.write(`Failed to get credits: ${message}\n`);
+    process.exit(1);
+  }
+  if (args.includes('--json')) {
+    console.log(JSON.stringify(data));
+  } else {
+    console.log(`Credits: ${data.balance ?? 0}`);
+    console.log(`Lifetime purchased: ${data.lifetimePurchased ?? 0}`);
+    console.log(`Lifetime used: ${data.lifetimeUsed ?? 0}`);
+    if (data.subscription) {
+      const plan = data.subscription.planId || 'unknown';
+      const status = data.subscription.status ? ` (${data.subscription.status})` : '';
+      console.log(`Subscription: ${plan}${status}`);
+    } else {
+      console.log('Subscription: none');
+    }
+  }
 } else if (command === 'create') {
   const { headers, baseUrl } = getAuth();
   const opts = { images: [], imageUrls: [] };
@@ -1888,6 +1964,9 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
     process.exit(1);
   }
 
+  let uploadedTurnMediaCount = 0;
+  let uploadedTurnVideoCount = 0;
+
   // --project auto: create a new project (with images/videos if provided)
   if (!projectId || projectId === 'auto') {
     // Create an empty project first, then attach media by URL. Local images use
@@ -1925,6 +2004,7 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
         process.exit(1);
       }
       process.stderr.write(`📤 Added ${addedCount} image(s) to project\n`);
+      uploadedTurnMediaCount += addedCount;
     } else {
       process.stderr.write(`❌ Failed to add images: ${await res.text()}\n`);
       process.exit(1);
@@ -2016,19 +2096,25 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
         const data = await res.json();
         const videoSnaps = (data.snapshots || []).filter(s => s.type === 'video');
         process.stderr.write(`📹 Added ${videoSnaps.length} video(s) to timeline\n`);
+        uploadedTurnVideoCount += videoSnaps.length;
+        uploadedTurnMediaCount += videoSnaps.length;
       } else {
         process.stderr.write(`⚠️ Failed to add videos: ${await res.text()}\n`);
       }
     }
 
-    // Inject hint so Agent knows videos are available
-    const hint = `[User uploaded ${chatVideos.length === 1 ? 'a video' : `${chatVideos.length} videos`}. Use analyze_video to understand the content.]`;
-    finalPrompt = `${finalPrompt}\n\n${hint}`;
   }
 
   if (useStream) {
     // Legacy SSE mode
-    const { results } = await streamAgent(baseUrl, headers, projectId, finalPrompt, { videoModel, videoResolution, preferredModel, agentModel });
+    const { results } = await streamAgent(baseUrl, headers, projectId, finalPrompt, {
+      videoModel,
+      videoResolution,
+      preferredModel,
+      agentModel,
+      uploadedVideoCount: uploadedTurnVideoCount,
+      turnMediaCount: uploadedTurnMediaCount,
+    });
     process.stderr.write('\n━━━ Results ━━━\n');
     for (const img of results.images) process.stderr.write(`🖼️  Image: ${img.imageUrl}\n`);
     for (const d of results.designs) process.stderr.write(`🎨  ${d.desc}\n`);
@@ -2037,7 +2123,15 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
     for (const task of results.musicTasks) await pollMusic(baseUrl, headers, task.taskId);
   } else {
     // Default: fire-and-forget + poll
-    const { runId } = await submitRun(baseUrl, headers, projectId, finalPrompt, { videoModel, videoResolution, preferredModel, agentModel, audioAttachments });
+    const { runId } = await submitRun(baseUrl, headers, projectId, finalPrompt, {
+      videoModel,
+      videoResolution,
+      preferredModel,
+      agentModel,
+      audioAttachments,
+      uploadedVideoCount: uploadedTurnVideoCount,
+      turnMediaCount: uploadedTurnMediaCount,
+    });
     if (background) {
       // Just print runId and exit
       if (jsonOutput) {
@@ -2225,8 +2319,13 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
   const jsonOutput = args.includes('--json');
 
   if (sub === 'list') {
-    const skills = await fetchMarketplaceSkills(baseUrl);
+    const builtIn = args.includes('--built-in');
+    let skills = builtIn ? await fetchBuiltInSkills(baseUrl) : await fetchMarketplaceSkills(baseUrl);
+    if (builtIn && args.includes('--openmontage')) {
+      skills = skills.filter(skill => skill.sourceProject === 'openmontage');
+    }
     if (jsonOutput) console.log(JSON.stringify({ skills }, null, 2));
+    else if (builtIn) printBuiltInSkills(skills);
     else printMarketplaceSkills(skills);
   } else if (sub === 'search') {
     const query = args.filter((arg, index) => index > 1 && arg !== '--json').join(' ').trim();
@@ -2243,11 +2342,15 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
     else printMarketplaceSkills(skills);
   } else if (sub === 'show') {
     const identifier = args[2];
-    if (!identifier) { console.error('Usage: makaron skills show <marketplace-id|label> [--json]'); process.exit(1); }
-    const skills = await fetchMarketplaceSkills(baseUrl);
-    const skill = findMarketplaceSkill(skills, identifier);
+    if (!identifier) { console.error('Usage: makaron skills show <id|label> [--built-in] [--json]'); process.exit(1); }
+    const builtIn = args.includes('--built-in');
+    const skills = builtIn ? await fetchBuiltInSkills(baseUrl) : await fetchMarketplaceSkills(baseUrl);
+    const skill = builtIn
+      ? skills.find(candidate => candidate.name === identifier || candidate.label?.toLowerCase() === identifier.toLowerCase())
+      : findMarketplaceSkill(skills, identifier);
     if (!skill) { console.error(`Skill not found: ${identifier}`); process.exit(1); }
     if (jsonOutput) console.log(JSON.stringify(skill, null, 2));
+    else if (builtIn) printBuiltInSkills([skill]);
     else printMarketplaceSkill(skill);
   } else if (sub === 'install') {
     const identifier = args[2];
@@ -2260,9 +2363,13 @@ if (!command || command === '--help' || command === '-h' || command === 'help')
     if (jsonOutput) console.log(JSON.stringify({ ...data, marketplaceId: skill.id, label: skill.label }, null, 2));
     else console.log(data.skillName);
   } else {
-    console.log(`Skill marketplace commands:
+    console.log(`Skill commands:
+  skills list --built-in              List all built-in Makaron skills and Studio Run recipes
+  skills list --built-in --openmontage
+                                      List OpenMontage-native adapters only
   skills list                         List marketplace skills
   skills search <query>               Search marketplace skills
+  skills show <id|label> --built-in   Show a built-in skill
   skills show <id|label>              Show a marketplace skill
   skills install <id|label>           Install a marketplace skill to your workspace
 `);

package/package.json

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

package/skills/makaron/SKILL.md

@@ -44,6 +44,12 @@ export MAKARON_API_KEY=mk_live_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
 Verify: `npx makaron-cli list` should show projects.
 
+Check the current credit balance and subscription:
+```bash
+npx makaron-cli credits
+npx makaron-cli credits --json
+```
+
 ## Core Workflow
 
 ```bash