makaron-cli 0.8.2 → 0.8.4

package/bin/makaron.mjs

@@ -19,8 +19,6 @@ import { execFileSync } from 'child_process';
 // ─── Config ──────────────────────────────────────────────────────────────────
 
 const AUTH_FILE = path.join(process.env.HOME || '~', '.makaron', 'auth.json');
-const APPROVALS_FILE = path.join(path.dirname(AUTH_FILE), 'approvals.json');
-const DELIVERIES_FILE = path.join(path.dirname(AUTH_FILE), 'deliveries.json');
 const DEFAULT_URL = 'https://www.makaron.app';
 const BASE_URL = process.env.MAKARON_URL || DEFAULT_URL;
 const APP_URL = process.env.MAKARON_APP_URL || DEFAULT_URL;
@@ -29,10 +27,18 @@ const APP_URL = process.env.MAKARON_APP_URL || DEFAULT_URL;
 const SUPABASE_URL = 'https://sdyrtztrjgmmpnirswxt.supabase.co';
 const SUPABASE_ANON_KEY = 'sb_publishable_FJFN2YYaWaQjABUKLqxQcA_fhxPLFDY';
 
-const MAX_VIDEO_FILE_SIZE = 200 * 1024 * 1024;
-const MAX_VIDEO_DURATION = 15;
-const MAX_VIDEO_DURATION_TOLERANCE = 0.5;
+const MAX_VIDEO_UPLOAD_FILE_SIZE_MB = 50;
+const MAX_VIDEO_UPLOAD_FILE_SIZE = MAX_VIDEO_UPLOAD_FILE_SIZE_MB * 1024 * 1024;
+const MAX_VIDEO_UPLOAD_DURATION = 120;
+const MAX_VIDEO_UPLOAD_DURATION_TOLERANCE = 1;
+const MAX_VIDEO_PROVIDER_REFERENCE_DURATION = 15;
+const MAX_VIDEO_PROVIDER_REFERENCE_DURATION_TOLERANCE = 0.5;
 const MAX_VIDEO_FRAME_PIXELS = 2_086_876;
+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;
 
 function getCliVersion() {
   try {
@@ -64,34 +70,6 @@ function saveAuth(data) {
   fs.writeFileSync(AUTH_FILE, JSON.stringify(data, null, 2));
 }
 
-function loadApprovals() {
-  try {
-    return JSON.parse(fs.readFileSync(APPROVALS_FILE, 'utf-8'));
-  } catch {
-    return [];
-  }
-}
-
-function saveApprovals(approvals) {
-  const dir = path.dirname(APPROVALS_FILE);
-  if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
-  fs.writeFileSync(APPROVALS_FILE, JSON.stringify(approvals, null, 2));
-}
-
-function loadDeliveries() {
-  try {
-    return JSON.parse(fs.readFileSync(DELIVERIES_FILE, 'utf-8'));
-  } catch {
-    return [];
-  }
-}
-
-function saveDeliveries(deliveries) {
-  const dir = path.dirname(DELIVERIES_FILE);
-  if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
-  fs.writeFileSync(DELIVERIES_FILE, JSON.stringify(deliveries, null, 2));
-}
-
 function buildCookie(tokenJson) {
   const url = tokenJson._supabaseUrl || SUPABASE_URL;
   const ref = url.match(/\/\/([^.]+)\./)?.[1] || '';
@@ -456,434 +434,6 @@ function applyPick(data, field) {
   }
 }
 
-// ─── Dialogue Events (message / approval / artifact) ─────────────────────────
-
-function stableEventId(prefix, runId, seq, fallback) {
-  return fallback || `${prefix}_${runId}_${seq ?? Date.now()}`;
-}
-
-function inferApprovalIntent(text) {
-  if (!text) return false;
-  const normalized = text.toLowerCase().replace(/\s+/g, ' ').trim();
-  const hasEnglishApprovalIntent = /\b(shall i|should i|do you want me to|confirm|approve|approval|permission)\b/.test(normalized);
-  const hasEnglishAction = /\b(go ahead|proceed|continue|generate|create|submit|start|run|render)\b/.test(normalized);
-  const hasChineseApprovalIntent = /(是否|要不要|是否要|需要我|请确认|确认|同意|批准|可以吗|是否可以)/.test(normalized);
-  const hasChineseAction = /(继续|开始|生成|创建|提交|执行|渲染|出图|出视频|制作)/.test(normalized);
-  return (hasEnglishApprovalIntent && hasEnglishAction) || (hasChineseApprovalIntent && hasChineseAction);
-}
-
-function isPureStatusMessage(text, sourceType, status) {
-  const normalized = String(text || '').toLowerCase().replace(/\s+/g, ' ').trim();
-  if (sourceType === 'status') return true;
-  if (status && !normalized) return true;
-  if (!normalized) return false;
-  return /^(queued|running|rendering|uploading|processing|generating|completed|complete|done|failed|aborted|started|submitted|waiting|polling)(\.|…|\.\.\.)?$/.test(normalized)
-    || /^(排队中|队列中|运行中|渲染中|上传中|处理中|生成中|已完成|完成|失败|已失败|已提交|等待中)$/.test(normalized);
-}
-
-function hasExplicitApprovalRequirement(data, text) {
-  return Boolean(
-    data.requires_approval
-      || data.requiresApproval
-      || data.action_required
-      || data.actionRequired
-      || data.proposal
-      || inferApprovalIntent(text)
-  );
-}
-
-function isPureQaRun(data) {
-  const raw = [
-    data.intent,
-    data.mode,
-    data.workflow,
-    data.workflow_type,
-    data.workflowType,
-    data.run_type,
-    data.runType,
-    data.kind,
-  ].filter(Boolean).join(' ').toLowerCase();
-  return /\b(qa|q&a|question_answer|question-answer|answer|pure_qa|pure-qa)\b/.test(raw);
-}
-
-function normalizeDialogueMessage(runId, projectId, ev, context = {}) {
-  const data = ev.data || ev;
-  const text = data.text || data.message || data.content || data.statusText || '';
-  if (!text && ev.type !== 'tool_call') return null;
-  const explicitApproval = hasExplicitApprovalRequirement(data, text);
-  const textOnlyCheckpoint = Boolean(
-    context.stoppedWithoutArtifacts
-      && ev.type !== 'error'
-      && !explicitApproval
-      && !isPureStatusMessage(text, ev.type, data.status)
-  );
-  const requiresApproval = explicitApproval || textOnlyCheckpoint;
-  const message = {
-    type: 'message',
-    id: stableEventId('msg', runId, ev.seq, data.id || ev.id),
-    runId,
-    projectId,
-    seq: ev.seq,
-    status: data.status || undefined,
-    text: text || `${data.tool || 'tool_call'}${data.input?.description ? `: ${data.input.description}` : ''}`,
-  };
-  if (ev.type) message.source_type = ev.type;
-  if (requiresApproval) {
-    message.requires_approval = true;
-    message.approval_options = data.approval_options || data.approvalOptions || ['approve', 'revise', 'ask_user', 'continue'];
-    if (textOnlyCheckpoint) message.approval_reason = 'text_only_checkpoint';
-  }
-  if (data.proposal) message.proposal = data.proposal;
-  return message;
-}
-
-function normalizeDialogueArtifact(runId, projectId, item, seq) {
-  if (!item) return null;
-  const kind = item.type || item.kind || (item.imageUrl ? 'image' : item.videoUrl ? 'video' : undefined);
-  if (!kind) return null;
-  if (!['image', 'video', 'design', 'music', 'audio', 'file'].includes(kind)) return null;
-  const artifact = {
-    type: 'artifact',
-    id: stableEventId('artifact', runId, seq, item.id || item.snapshotId || item.taskId),
-    runId,
-    projectId,
-    seq,
-    kind,
-    status: item.status || (item.url || item.imageUrl || item.videoUrl || item.audioUrl ? 'completed' : 'running'),
-  };
-  const url = item.url || item.imageUrl || item.videoUrl || item.audioUrl;
-  if (url) artifact.url = url;
-  const fileName = item.fileName || item.filename || item.name || (url ? url.split('/').pop()?.split('?')[0] : null);
-  const contentType = item.contentType || item.content_type || item.mimeType || item.mime_type;
-  if (fileName) artifact.fileName = fileName;
-  if (contentType) artifact.contentType = contentType;
-  if (item.error) artifact.error = item.error;
-  if (item.taskId) artifact.taskId = item.taskId;
-  if (item.snapshotId) artifact.snapshotId = item.snapshotId;
-  return artifact;
-}
-
-function normalizeDialogueEvent(runId, projectId, ev, context = {}) {
-  const data = ev.data || {};
-  if (ev.type === 'message' || ev.type === 'approval' || ev.type === 'artifact') {
-    return { ...data, ...ev, runId: ev.runId || runId, projectId: ev.projectId || projectId };
-  }
-  switch (ev.type) {
-    case 'content':
-    case 'status':
-    case 'tool_call':
-    case 'error':
-      return normalizeDialogueMessage(runId, projectId, ev, context);
-    case 'image':
-      return normalizeDialogueArtifact(runId, projectId, { type: 'image', status: data.imageUrl ? 'completed' : 'running', imageUrl: data.imageUrl, snapshotId: data.snapshotId }, ev.seq);
-    case 'render':
-      return normalizeDialogueArtifact(runId, projectId, { type: data.animation ? 'video' : 'design', status: data.published ? 'completed' : 'running', url: data.url, snapshotId: data.snapshotId }, ev.seq);
-    case 'animation_task':
-    case 'video_snapshot':
-      return normalizeDialogueArtifact(runId, projectId, { type: 'video', status: 'running', taskId: data.taskId, snapshotId: data.snapshotId }, ev.seq);
-    case 'music_task':
-      return normalizeDialogueArtifact(runId, projectId, { type: 'music', status: 'running', taskId: data.taskId }, ev.seq);
-    default:
-      return null;
-  }
-}
-
-function buildDialogueEvents(runId, data) {
-  const projectId = data.projectId || data.project_id;
-  const events = [];
-  const hasArtifacts = Boolean(
-    (data.output || []).some(item => normalizeDialogueArtifact(runId, projectId, item, item.seq))
-      || (data.events || []).some(ev => normalizeDialogueEvent(runId, projectId, ev, { stoppedWithoutArtifacts: false })?.type === 'artifact')
-  );
-  const hasContinuationAction = (data.events || []).some(ev => ['tool_call', 'image', 'render', 'animation_task', 'video_snapshot', 'music_task'].includes(ev.type));
-  const checkpointMode = data.checkpointMode || 'service';
-  const context = {
-    stoppedWithoutArtifacts: checkpointMode !== 'off'
-      && !isPureQaRun(data)
-      && !hasArtifacts
-      && !hasContinuationAction
-      && !data.incomplete
-      && ['completed', 'failed', 'aborted', 'waiting', 'needs_input'].includes(data.status),
-  };
-  for (const ev of data.events || []) {
-    const normalized = normalizeDialogueEvent(runId, projectId, ev, context);
-    if (normalized) events.push(normalized);
-  }
-  for (const item of data.output || []) {
-    const normalized = normalizeDialogueArtifact(runId, projectId, item, item.seq);
-    if (normalized && !events.some(ev => ev.type === 'artifact' && ev.id === normalized.id)) events.push(normalized);
-  }
-  for (const approval of loadApprovals().filter(item => item.runId === runId)) {
-    events.push(approval);
-  }
-  return events;
-}
-
-function compactDialogueEvents(events) {
-  const compacted = [];
-  for (const ev of events) {
-    const prev = compacted[compacted.length - 1];
-    const canMerge = prev
-      && ev.type === 'message'
-      && prev.type === 'message'
-      && ev.source_type === 'content'
-      && prev.source_type === 'content'
-      && !ev.proposal
-      && !prev.proposal
-      && Boolean(ev.requires_approval) === Boolean(prev.requires_approval)
-      && (ev.approval_reason || '') === (prev.approval_reason || '');
-    if (canMerge) {
-      prev.text = `${prev.text}${ev.text}`;
-      prev.id = `${prev.id}+${ev.id}`;
-      prev.seq_end = ev.seq;
-      if (ev.requires_approval) {
-        prev.requires_approval = true;
-        prev.approval_options = prev.approval_options || ev.approval_options;
-      }
-    } else {
-      compacted.push({ ...ev });
-    }
-  }
-  return compacted;
-}
-
-function findUnhandledApprovalMessages(events) {
-  const approved = new Set(events.filter(ev => ev.type === 'approval').map(ev => ev.messageId || ev.message_id));
-  return events.filter(ev => ev.type === 'message' && ev.requires_approval && !approved.has(ev.id));
-}
-
-function isCompletedDeliverableArtifact(artifact) {
-  return artifact?.type === 'artifact'
-    && ['image', 'video', 'design', 'music', 'audio', 'file'].includes(artifact.kind)
-    && artifact.status === 'completed'
-    && Boolean(artifact.url);
-}
-
-function findUndeliveredArtifacts(runId, events) {
-  const delivered = new Set(loadDeliveries().filter(item => item.runId === runId).map(item => item.artifactId || item.artifact_id));
-  return events.filter(isCompletedDeliverableArtifact).filter(artifact => !delivered.has(artifact.id));
-}
-
-function buildCliCommand() {
-  return 'npx makaron-cli@latest';
-}
-
-function buildHandleCommand(messageId, runId, choice) {
-  return `${buildCliCommand()} responses handle ${messageId} --run ${runId} --choice ${choice}`;
-}
-
-function buildNextCommand(runId) {
-  return `${buildCliCommand()} responses next ${runId} --json`;
-}
-
-function buildDeliverCommand(artifactId, runId) {
-  return `${buildCliCommand()} responses deliver ${artifactId} --run ${runId}`;
-}
-
-function buildRunError(data, events) {
-  const errorEvent = events.find(ev => ev.type === 'message' && ev.source_type === 'error') || null;
-  const resultError = data.result?.error || data.error || data.message || null;
-  if (!errorEvent && !resultError && !['failed', 'aborted'].includes(data.status)) return null;
-  const errorType = (typeof resultError === 'object' && (resultError.type || resultError.code)) || data.error_type || data.errorType || data.status || 'failed';
-  return {
-    type: errorType,
-    status: data.status || 'failed',
-    message: errorEvent?.text || (typeof resultError === 'string' ? resultError : resultError?.message) || `Makaron run ${data.status || 'failed'}`,
-    recoverable: Boolean((typeof resultError === 'object' && resultError.recoverable) || data.recoverable),
-    detail: typeof resultError === 'object' ? resultError : undefined,
-  };
-}
-
-function buildNextAction(runId, events, data = {}) {
-  const runError = buildRunError(data, events);
-  if (runError) {
-    return {
-      status: 'failed',
-      blocking: true,
-      runId,
-      error: runError,
-      next_command: buildNextCommand(runId),
-      next_commands: {
-        inspect: buildNextCommand(runId),
-      },
-      events,
-    };
-  }
-  const checkpoint = findUnhandledApprovalMessages(events)[0] || null;
-  const artifacts = events.filter(ev => ev.type === 'artifact');
-  const approvals = events.filter(ev => ev.type === 'approval');
-  if (data.incomplete || ['queued', 'running', 'rendering', 'processing', 'generating', 'submitted'].includes(data.status)) {
-    return {
-      status: 'running',
-      blocking: false,
-      runId,
-      artifacts,
-      approvals,
-      next_command: buildNextCommand(runId),
-      next_commands: {
-        inspect: buildNextCommand(runId),
-      },
-      events,
-    };
-  }
-  if (checkpoint) {
-    return {
-      status: 'needs_approval',
-      blocking: true,
-      runId,
-      checkpoint,
-      next_commands: {
-        approve: buildHandleCommand(checkpoint.id, runId, 'approve'),
-        revise: `${buildHandleCommand(checkpoint.id, runId, 'revise')} --note "what to change"`,
-        ask_user: buildHandleCommand(checkpoint.id, runId, 'ask_user'),
-        continue: buildHandleCommand(checkpoint.id, runId, 'continue'),
-        inspect: buildNextCommand(runId),
-      },
-      events,
-    };
-  }
-  const undeliveredArtifacts = findUndeliveredArtifacts(runId, events);
-  if (undeliveredArtifacts.length) {
-    const first = undeliveredArtifacts[0];
-    return {
-      status: 'has_artifacts',
-      blocking: true,
-      runId,
-      artifacts,
-      undelivered_artifacts: undeliveredArtifacts,
-      approvals,
-      next_commands: {
-        deliver: buildDeliverCommand(first.id, runId),
-        inspect: buildNextCommand(runId),
-      },
-      events,
-    };
-  }
-  return {
-    status: artifacts.length ? 'delivered' : 'ready',
-    blocking: false,
-    runId,
-    artifacts,
-    approvals,
-    deliveries: loadDeliveries().filter(item => item.runId === runId),
-    next_commands: {
-      inspect: buildNextCommand(runId),
-    },
-    events,
-  };
-}
-
-async function fetchRun(baseUrl, headers, runId, opts = {}) {
-  const params = new URLSearchParams();
-  if (opts.events) params.set('events', 'true');
-  const suffix = params.toString() ? `?${params}` : '';
-  const res = await fetch(`${baseUrl}/api/agent/run/${runId}${suffix}`, { headers });
-  if (!res.ok) { process.stderr.write(`Error ${res.status}: ${await res.text()}\n`); process.exit(1); }
-  return normalizeRunResponse(await res.json());
-}
-
-async function printDialogueEvents(baseUrl, headers, runId, opts = {}) {
-  const { jsonl = false, failOnUnapproved = false, follow = false, interval = 5000, compact = false, checkpointMode = 'service' } = opts;
-  const printed = new Set();
-
-  while (true) {
-    const data = await fetchRun(baseUrl, headers, runId, { events: true });
-    const dialogueEvents = buildDialogueEvents(runId, { ...data, checkpointMode });
-    const events = compact ? compactDialogueEvents(dialogueEvents) : dialogueEvents;
-    const unhandled = findUnhandledApprovalMessages(events);
-    if (failOnUnapproved && unhandled.length) {
-      process.stderr.write(`Unhandled Makaron message requires approval: ${unhandled.map(ev => ev.id).join(', ')}\n`);
-      process.exit(3);
-    }
-
-    const nextEvents = follow ? events.filter(ev => !printed.has(`${ev.type}:${ev.id || ev.seq}`)) : events;
-    for (const ev of nextEvents) {
-      printed.add(`${ev.type}:${ev.id || ev.seq}`);
-      if (jsonl) console.log(JSON.stringify(ev));
-    }
-    if (!jsonl) console.log(JSON.stringify(nextEvents, null, 2));
-
-    if (!follow || (!data.incomplete && ['completed', 'failed', 'aborted'].includes(data.status))) {
-      if (data.status === 'failed' || data.status === 'aborted') process.exit(1);
-      return;
-    }
-    await new Promise(r => setTimeout(r, data.next_poll_after_ms || interval));
-  }
-}
-
-async function printAgentNext(baseUrl, headers, runId, opts = {}) {
-  const { json = false, checkpointMode = 'service', failOnCheckpoint = true } = opts;
-  const data = await fetchRun(baseUrl, headers, runId, { events: true });
-  const events = compactDialogueEvents(buildDialogueEvents(runId, { ...data, checkpointMode }));
-  const action = buildNextAction(runId, events, data);
-  if (json) {
-    console.log(JSON.stringify(action, null, 2));
-  } else if (action.status === 'failed') {
-    console.log(`failed: ${action.error?.message || 'Makaron run failed'}`);
-    console.log(`inspect: ${action.next_commands.inspect}`);
-  } else if (action.status === 'needs_approval') {
-    console.log(`needs_approval: ${action.checkpoint.id}`);
-    if (action.checkpoint.text) console.log(action.checkpoint.text);
-    console.log(`approve: ${action.next_commands.approve}`);
-    console.log(`revise: ${action.next_commands.revise}`);
-    console.log(`ask_user: ${action.next_commands.ask_user}`);
-    console.log(`continue: ${action.next_commands.continue}`);
-    console.log(`inspect: ${action.next_commands.inspect}`);
-  } else if (action.status === 'has_artifacts') {
-    for (const artifact of action.undelivered_artifacts || action.artifacts) {
-      console.log(`${artifact.kind} ${artifact.status}${artifact.url ? ` ${artifact.url}` : ''}`);
-    }
-    if (action.next_commands.deliver) console.log(`deliver: ${action.next_commands.deliver}`);
-    console.log(`inspect: ${action.next_commands.inspect}`);
-  } else if (action.status === 'running') {
-    console.log('running');
-    console.log(`inspect: ${action.next_commands.inspect}`);
-  } else if (action.status === 'delivered') {
-    console.log('delivered');
-    console.log(`inspect: ${action.next_commands.inspect}`);
-  } else {
-    console.log('ready');
-    console.log(`inspect: ${action.next_commands.inspect}`);
-  }
-  if (action.status === 'needs_approval' && failOnCheckpoint) process.exit(3);
-  if (action.status === 'failed') process.exit(1);
-}
-
-function recordApproval(runId, messageId, choice, note) {
-  const approvals = loadApprovals();
-  const approval = {
-    type: 'approval',
-    id: `approval_${Date.now()}`,
-    runId,
-    messageId,
-    choice,
-    status: 'recorded',
-    createdAt: new Date().toISOString(),
-  };
-  if (note) approval.note = note;
-  approvals.push(approval);
-  saveApprovals(approvals);
-  console.log(JSON.stringify(approval));
-}
-
-function recordDelivery(runId, artifactId, opts = {}) {
-  const deliveries = loadDeliveries();
-  const delivery = {
-    type: 'delivery',
-    id: `delivery_${Date.now()}`,
-    runId,
-    artifactId,
-    status: 'recorded',
-    createdAt: new Date().toISOString(),
-  };
-  if (opts.channel) delivery.channel = opts.channel;
-  if (opts.messageId) delivery.messageId = opts.messageId;
-  if (opts.note) delivery.note = opts.note;
-  deliveries.push(delivery);
-  saveDeliveries(deliveries);
-  console.log(JSON.stringify(delivery));
-}
-
 // ─── Watch (incremental event stream) ───────────────────────────────────────
 
 async function watchRun(baseUrl, headers, runId, opts = {}) {
@@ -1041,6 +591,34 @@ async function listProjects(baseUrl, headers) {
   console.log('');
 }
 
+async function listProjectMedia(baseUrl, headers, projectId, opts = {}) {
+  const res = await fetch(`${baseUrl}/api/projects/${projectId}/media`, { headers });
+  if (!res.ok) { console.error('Project media failed:', await res.text()); process.exit(1); }
+  const data = await res.json();
+  if (opts.json) {
+    console.log(JSON.stringify(data, null, 2));
+    return data;
+  }
+
+  console.log(`🎞️  ${data.title || 'Untitled'}`);
+  console.log(`   Project: ${data.projectUrl || `${APP_URL}/projects/${projectId}`}`);
+  const media = data.media || [];
+  if (!media.length) {
+    console.log('   No timeline media yet.');
+    return data;
+  }
+  for (const item of media) {
+    const ref = item.ref || `<<<media_${item.index}>>>`;
+    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 url = item.url ? `\n      ${item.url}` : '';
+    console.log(`  ${String(item.index).padStart(2)}. ${ref} [${item.type}${status}${duration}${dimensions}]${description}${url}`);
+  }
+  return data;
+}
+
 function timeSince(date) {
   const s = Math.floor((Date.now() - date.getTime()) / 1000);
   if (s < 60) return 'just now';
@@ -1192,13 +770,20 @@ function probeLocalVideo(videoPath) {
   return probeVideoWithFfprobe(videoPath) || probeVideoWithFfmpeg(videoPath);
 }
 
-function validateVideoFile(videoPath) {
+function validateVideoFile(videoPath, options = {}) {
+  const maxDuration = options.maxDuration ?? MAX_VIDEO_UPLOAD_DURATION;
+  const durationTolerance = options.durationTolerance ?? MAX_VIDEO_UPLOAD_DURATION_TOLERANCE;
+  const minFramePixels = options.minFramePixels ?? 0;
+  const minSide = options.minSide ?? 0;
+  const maxSide = options.maxSide ?? Infinity;
+  const minAspect = options.minAspect ?? 0;
+  const maxAspect = options.maxAspect ?? Infinity;
   if (!fs.existsSync(videoPath)) {
     return { ok: false, error: `Video file not found: ${videoPath}` };
   }
   const stat = fs.statSync(videoPath);
-  if (stat.size > MAX_VIDEO_FILE_SIZE) {
-    return { ok: false, error: `Video too large: ${(stat.size / 1024 / 1024).toFixed(1)}MB (max 200MB)` };
+  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.` };
   }
   const ext = path.extname(videoPath).slice(1).toLowerCase();
   if (!['mp4', 'mov', 'webm'].includes(ext)) {
@@ -1208,12 +793,25 @@ function validateVideoFile(videoPath) {
   if (!meta) {
     return { ok: false, error: 'Cannot read video duration/resolution. Install ffmpeg/ffprobe or use the normal frontend upload flow.' };
   }
-  if (meta.duration > MAX_VIDEO_DURATION + MAX_VIDEO_DURATION_TOLERANCE) {
-    return { ok: false, error: `Video too long: ${formatSeconds(meta.duration)}s (max ${MAX_VIDEO_DURATION}s, with ${MAX_VIDEO_DURATION_TOLERANCE}s metadata tolerance)` };
+  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.` };
   }
+  const framePixels = meta.width * meta.height;
+  const aspect = meta.width / meta.height;
+  if (
+    framePixels < minFramePixels ||
+    meta.width < minSide ||
+    meta.height < minSide ||
+    meta.width > maxSide ||
+    meta.height > maxSide ||
+    aspect < minAspect ||
+    aspect > maxAspect
+  ) {
+    return { ok: false, error: `Video size does not meet provider limits: ${meta.width}x${meta.height} (${framePixels} px, aspect ${aspect.toFixed(2)}). Required: frame pixels >=${minFramePixels}, sides ${minSide}-${Number.isFinite(maxSide) ? maxSide : '∞'}px, aspect ${minAspect}-${Number.isFinite(maxAspect) ? maxAspect : '∞'}. Resize/pad with FFmpeg before submitting.` };
+  }
   const mime = ext === 'mov' ? 'video/quicktime' : ext === 'webm' ? 'video/webm' : 'video/mp4';
   return { ok: true, mime, meta };
 }
@@ -1226,8 +824,8 @@ function validateVideoFileForAnalysis(videoPath) {
   if (stat.size === 0) {
     return { ok: false, error: `Video file is empty: ${videoPath}` };
   }
-  if (stat.size > MAX_VIDEO_FILE_SIZE) {
-    return { ok: false, error: `Video too large: ${(stat.size / 1024 / 1024).toFixed(1)}MB (max 200MB)` };
+  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.` };
   }
   const ext = path.extname(videoPath).slice(1).toLowerCase();
   if (!['mp4', 'mov', 'webm'].includes(ext)) {
@@ -1252,48 +850,6 @@ function saveMcpImage(result, outputPath) {
   return null;
 }
 
-function wantsHelp(values) {
-  return values.includes('--help') || values.includes('-h');
-}
-
-function printResponsesUsage() {
-  console.log(`Responses commands:
-  responses get <runId>                  Get status and output (JSON)
-  responses get <runId> --wait           Poll until completed
-  responses get <runId> --pick <field>   Extract: first_image_url, first_video_url, project_url, output
-  responses next <runId> --json          New Agent entry: compact timeline + checkpoint guidance
-  responses handle <messageId> --run <runId> --choice approve|revise|ask_user|continue
-  responses deliver <artifactId> --run <runId>   Record artifact delivered to the user
-  responses events <runId> --jsonl       Emit message/approval/artifact events for external Agents
-  responses timeline <runId> --jsonl     Alias for responses events
-  responses timeline <runId> --checkpoint-mode off   Disable text-only checkpoints for pure Q&A
-  responses approve <messageId> --run <runId>    Record approval for a Makaron message
-  responses revise <messageId> --run <runId>     Record revision request for a Makaron message
-  responses ask-user <messageId> --run <runId>   Record that the user must decide
-  responses continue <messageId> --run <runId>   Record continue decision
-  responses watch <runId> --jsonl        Watch until done (incremental events)
-  responses list --project <id>          List runs for a project
-`);
-}
-
-function printResponsesSubcommandUsage(sub) {
-  const usages = {
-    get: 'Usage: makaron responses get <runId> [--wait] [--json] [--pick <field>]',
-    watch: 'Usage: makaron responses watch <runId> [--jsonl] [--interval <ms>]',
-    next: 'Usage: makaron responses next <runId> [--json] [--checkpoint-mode service|off] [--no-fail]',
-    events: 'Usage: makaron responses events <runId> [--jsonl] [--compact] [--checkpoint-mode service|off] [--follow] [--interval <ms>] [--fail-on-unapproved]',
-    timeline: 'Usage: makaron responses timeline <runId> [--jsonl] [--compact] [--checkpoint-mode service|off] [--follow] [--interval <ms>] [--fail-on-unapproved]',
-    deliver: 'Usage: makaron responses deliver <artifactId> --run <runId> [--channel <name>] [--message-id <id>] [--note <text>]',
-    handle: 'Usage: makaron responses handle <messageId> --run <runId> --choice approve|revise|ask_user|continue [--note <text>]',
-    approve: 'Usage: makaron responses approve <messageId> --run <runId> [--note <text>]',
-    revise: 'Usage: makaron responses revise <messageId> --run <runId> [--note <text>]',
-    'ask-user': 'Usage: makaron responses ask-user <messageId> --run <runId> [--note <text>]',
-    continue: 'Usage: makaron responses continue <messageId> --run <runId> [--note <text>]',
-    list: 'Usage: makaron responses list --project <id>',
-  };
-  console.log(usages[sub] || 'Usage: makaron responses --help');
-}
-
 async function analyzeVideoCli(baseUrl, headers, rawVideo, questionParts) {
   if (!rawVideo) {
     console.error('Usage: makaron analyze --video <file|url> ["question"]');
@@ -1317,12 +873,133 @@ async function analyzeVideoCli(baseUrl, headers, rawVideo, questionParts) {
   if (text) console.log(text);
 }
 
+// ─── Help ───────────────────────────────────────────────────────────────────
+
+function hasHelpFlag(values) {
+  return values.includes('--help') || values.includes('-h');
+}
+
+function printRootHelp() {
+  console.log(`Makaron CLI — Talk to Makaron Agent from the terminal
+
+Commands:
+  register --json                    Get challenge for agent self-registration
+  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)
+  list (ls)                          List all projects
+  project media <projectId> --json    List timeline media for a project
+  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)
+
+  chat --project <id> "message"      Chat (non-blocking, polls for result)
+  chat --project <id> --video <file> Attach video to conversation
+  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
+
+  responses get <runId>              Get run status and results
+  responses get <runId> --wait       Poll until completed
+  responses list --project <id>      List runs for a project
+  abort <runId>                      Abort a running Agent
+
+  edit [--image <file>] "prompt"     AI image edit / text-to-image
+  analyze --video <file|url>         Analyze video content
+  video script|create|status         Video generation
+  music create|status                Music generation
+
+  admin                              Admin commands (skills, upload, set-admin)
+
+Environment:
+  MAKARON_API_KEY  API key (mk_live_xxx) — recommended for agents
+  MAKARON_URL      API base (default: ${DEFAULT_URL})
+`);
+}
+
+function printHelp(topic, subtopic) {
+  if (topic === 'login') {
+    console.log('Usage: makaron login');
+  } else if (topic === 'create') {
+    console.log('Usage: makaron create --image <file> [--image <file2>] | --image-url <url> | --title "name"');
+  } else if (topic === 'chat') {
+    console.log('Usage: makaron chat --project <id|auto> [--image <file>] [--video <file|url>] [--stream] [--background|-b] [--json] "your message"');
+  } else if (topic === 'responses' || topic === 'run') {
+    if (subtopic === 'get') console.log('Usage: makaron responses get <runId> [--wait] [--json] [--pick <field>]');
+    else if (subtopic === 'watch') console.log('Usage: makaron responses watch <runId> [--jsonl] [--interval <ms>]');
+    else if (subtopic === 'list') console.log('Usage: makaron responses list --project <id>');
+    else console.log(`Responses commands:
+  responses get <runId>                  Get status and output (JSON)
+  responses get <runId> --wait           Poll until completed
+  responses get <runId> --pick <field>   Extract: first_image_url, first_video_url, project_url, output
+  responses watch <runId> --jsonl        Watch until done (incremental events)
+  responses list --project <id>          List runs for a project
+`);
+  } else if (topic === 'list' || topic === 'ls') {
+    console.log('Usage: makaron list');
+  } else if (topic === 'project' || topic === 'projects') {
+    if (subtopic === 'media') console.log('Usage: makaron project media <projectId> [--json]');
+    else console.log(`Project commands:
+  project media <projectId> --json      List timeline media for a project
+`);
+  } else if (topic === 'abort') {
+    console.log('Usage: makaron abort <runId>');
+  } else if (topic === 'edit') {
+    console.log('Usage: makaron edit [--image <file|url>] [--model gemini|qwen|openai] [--skill enhance|creative|wild|captions] [--ref <file>] [--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 <public-url>) [--duration 10] [--aspect 9:16] [--model kling|seedance] [--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 "..." --image <url> [--duration 10]  Submit video task
+  video create --script "..." --video <public-url> [--model kling|seedance]  Edit a video (standalone)
+  video status <taskId>                                      Check video status
+  video status --snapshot <snapshotId> [--wait]              Check v2 video snapshot
+`);
+  } else if (topic === 'music') {
+    if (subtopic === 'create') console.log('Usage: makaron music create [--vocals] [--style "genre"] "description"');
+    else if (subtopic === 'status') console.log('Usage: makaron music status <taskId>');
+    else console.log(`Music commands:
+  music create [--vocals] [--style "genre"] "description"    Generate music
+  music status <taskId>                                      Check music status
+`);
+  } else if (topic === 'admin') {
+    if (subtopic === 'skills') console.log('Usage: makaron admin skills [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 === 'set-admin') console.log('Usage: makaron admin set-admin <email>');
+    else console.log(`Admin commands:
+  admin skills                         List all marketplace skills
+  admin skills add '<json>'            Add a new skill
+  admin skills update <id> '<json>'    Update a skill
+  admin skills delete <id>             Delete a skill
+  admin upload <file> <storage-path>   Upload file to Storage
+  admin fetch-skill <code|url>         Download skill from share link
+  admin set-admin <email>              Grant admin access to a user
+`);
+  } else if (topic === 'register') {
+    if (subtopic === '--verify') console.log('Usage: makaron register --verify --challenge-id <id> --answer <number>');
+    else console.log('Usage: makaron register --json | makaron register --verify --challenge-id <id> --answer <number>');
+  } else if (topic === 'claim') {
+    console.log('Usage: makaron claim');
+  } else {
+    printRootHelp();
+  }
+}
+
 // ─── Main ────────────────────────────────────────────────────────────────────
 
 const args = process.argv.slice(2);
 const command = args[0];
 
-if (command === '--version' || command === '-v' || command === 'version') {
+if (!command || command === '--help' || command === '-h' || command === 'help') {
+  printRootHelp();
+} else if (hasHelpFlag(args)) {
+  printHelp(command, args[1]);
+} else if (command === '--version' || command === '-v' || command === 'version') {
   console.log(getCliVersion());
 } else if (command === 'login') {
   await login();
@@ -1353,11 +1030,7 @@ if (command === '--version' || command === '-v' || command === 'version') {
   let videoModel = undefined;
   let preferredModel = undefined;
   for (let i = 1; i < args.length; i++) {
-    if (args[i] === '--help' || args[i] === '-h') {
-      console.error('Usage: makaron chat --project <id|auto> [--image <file>] [--video <file|url>] [--stream] [--background|-b] [--json] "your message"');
-      process.exit(0);
-    }
-    else if (args[i] === '--project' && args[i + 1]) projectId = args[++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] === '--stream') useStream = true;
@@ -1455,7 +1128,7 @@ if (command === '--version' || command === '-v' || command === 'version') {
     const uploadedVideoUrls = [...prevalidatedVideoUrlList];
     const uploadedVideoMetas = prevalidatedVideoUrlList.map(() => null);
     if (prevalidatedVideoUrlList.length) {
-      process.stderr.write(`📹 Assuming public video URL(s) already match Makaron upload limits: ≤${MAX_VIDEO_DURATION}s, ≤200MB, ≤1080p.\n`);
+      process.stderr.write(`📹 Assuming public video URL(s) already match Makaron upload limits: ≤${MAX_VIDEO_UPLOAD_DURATION}s, ≤${MAX_VIDEO_UPLOAD_FILE_SIZE_MB}MB, ≤1080p.\n`);
     }
     for (const videoPath of prevalidatedVideoFileList) {
       process.stderr.write(`📹 Uploading ${path.basename(videoPath)} (${(fs.statSync(videoPath).size/1024/1024).toFixed(1)}MB)...\n`);
@@ -1471,7 +1144,7 @@ if (command === '--version' || command === '-v' || command === 'version') {
 
     // Add videos to project via projects/create (same as images)
     if (uploadedVideoUrls.length === 0) {
-      process.stderr.write(`❌ No valid videos were uploaded. Local videos must be MP4/MOV/WebM, ≤${MAX_VIDEO_DURATION}s, ≤200MB, and ≤1080p.\n`);
+      process.stderr.write(`❌ No valid videos were uploaded. Local videos must be MP4/MOV/WebM, ≤${MAX_VIDEO_UPLOAD_DURATION}s, ≤${MAX_VIDEO_UPLOAD_FILE_SIZE_MB}MB, and ≤1080p.\n`);
       process.exit(1);
     }
 
@@ -1521,16 +1194,8 @@ if (command === '--version' || command === '-v' || command === 'version') {
     }
   }
 } else if (command === 'responses' || command === 'run') {
-  const sub = args[1];
-  if (!sub || sub === '--help' || sub === '-h') {
-    printResponsesUsage();
-    process.exit(0);
-  }
-  if (wantsHelp(args.slice(2))) {
-    printResponsesSubcommandUsage(sub);
-    process.exit(0);
-  }
   const { headers, baseUrl } = getAuth();
+  const sub = args[1];
 
   if (sub === 'get') {
     const runId = args[2];
@@ -1568,85 +1233,6 @@ if (command === '--version' || command === '-v' || command === 'version') {
     }
     await watchRun(baseUrl, headers, runId, { interval, jsonl });
 
-  } else if (sub === 'next') {
-    const runId = args[2];
-    if (!runId) { console.error('Usage: makaron responses next <runId> [--json] [--checkpoint-mode service|off] [--no-fail]'); process.exit(1); }
-    let jsonOutput = false, checkpointMode = 'service', failOnCheckpoint = true;
-    for (let i = 3; i < args.length; i++) {
-      if (args[i] === '--json') jsonOutput = true;
-      else if (args[i] === '--checkpoint-mode' && args[i + 1]) checkpointMode = args[++i];
-      else if (args[i] === '--no-fail') failOnCheckpoint = false;
-    }
-    if (!['service', 'off'].includes(checkpointMode)) {
-      console.error('--checkpoint-mode must be service or off');
-      process.exit(1);
-    }
-    await printAgentNext(baseUrl, headers, runId, { json: jsonOutput, checkpointMode, failOnCheckpoint });
-
-  } else if (sub === 'events' || sub === 'timeline') {
-    const runId = args[2];
-    if (!runId) { console.error(`Usage: makaron responses ${sub} <runId> [--jsonl] [--compact] [--checkpoint-mode service|off] [--follow] [--interval <ms>] [--fail-on-unapproved]`); process.exit(1); }
-    let interval = 5000, jsonl = false, follow = false, failOnUnapproved = false, compact = false, checkpointMode = 'service';
-    for (let i = 3; i < args.length; i++) {
-      if (args[i] === '--jsonl') jsonl = true;
-      else if (args[i] === '--compact') compact = true;
-      else if (args[i] === '--checkpoint-mode' && args[i + 1]) checkpointMode = args[++i];
-      else if (args[i] === '--follow') follow = true;
-      else if (args[i] === '--fail-on-unapproved') failOnUnapproved = true;
-      else if (args[i] === '--interval' && args[i + 1]) interval = parseInt(args[++i]);
-    }
-    if (!['service', 'off'].includes(checkpointMode)) {
-      console.error('--checkpoint-mode must be service or off');
-      process.exit(1);
-    }
-    await printDialogueEvents(baseUrl, headers, runId, { interval, jsonl, follow, failOnUnapproved, compact, checkpointMode });
-
-  } else if (sub === 'deliver') {
-    const artifactId = args[2];
-    if (!artifactId) { console.error('Usage: makaron responses deliver <artifactId> --run <runId> [--channel <name>] [--message-id <id>] [--note <text>]'); process.exit(1); }
-    let runId = null, note = null, channel = null, messageId = null;
-    const noteParts = [];
-    for (let i = 3; i < args.length; i++) {
-      if (args[i] === '--run' && args[i + 1]) runId = args[++i];
-      else if (args[i] === '--note' && args[i + 1]) note = args[++i];
-      else if (args[i] === '--channel' && args[i + 1]) channel = args[++i];
-      else if (args[i] === '--message-id' && args[i + 1]) messageId = args[++i];
-      else noteParts.push(args[i]);
-    }
-    if (!runId) { console.error('Usage: makaron responses deliver <artifactId> --run <runId> [--channel <name>] [--message-id <id>] [--note <text>]'); process.exit(1); }
-    if (!note && noteParts.length) note = noteParts.join(' ');
-    recordDelivery(runId, artifactId, { note, channel, messageId });
-
-  } else if (sub === 'handle' || ['approve', 'revise', 'ask-user', 'continue'].includes(sub)) {
-    const messageId = args[2];
-    if (!messageId) {
-      console.error(sub === 'handle'
-        ? 'Usage: makaron responses handle <messageId> --run <runId> --choice approve|revise|ask_user|continue [--note <text>]'
-        : `Usage: makaron responses ${sub} <messageId> --run <runId> [--note <text>]`);
-      process.exit(1);
-    }
-    let runId = null, note = null, choice = sub === 'handle' ? null : sub;
-    const noteParts = [];
-    for (let i = 3; i < args.length; i++) {
-      if (args[i] === '--run' && args[i + 1]) runId = args[++i];
-      else if (args[i] === '--note' && args[i + 1]) note = args[++i];
-      else if (args[i] === '--choice' && args[i + 1]) choice = args[++i];
-      else noteParts.push(args[i]);
-    }
-    if (!runId || !choice) {
-      console.error(sub === 'handle'
-        ? 'Usage: makaron responses handle <messageId> --run <runId> --choice approve|revise|ask_user|continue [--note <text>]'
-        : `Usage: makaron responses ${sub} <messageId> --run <runId> [--note <text>]`);
-      process.exit(1);
-    }
-    choice = choice === 'ask-user' ? 'ask_user' : choice;
-    if (!['approve', 'revise', 'ask_user', 'continue'].includes(choice)) {
-      console.error('--choice must be approve, revise, ask_user, or continue');
-      process.exit(1);
-    }
-    if (!note && noteParts.length) note = noteParts.join(' ');
-    recordApproval(runId, messageId, choice, note);
-
   } else if (sub === 'list') {
     let projectId = null;
     for (let i = 2; i < args.length; i++) {
@@ -1666,11 +1252,30 @@ if (command === '--version' || command === '-v' || command === 'version') {
     }
 
   } else {
-    printResponsesUsage();
+    console.log(`Responses commands:
+  responses get <runId>                  Get status and output (JSON)
+  responses get <runId> --wait           Poll until completed
+  responses get <runId> --pick <field>   Extract: first_image_url, first_video_url, project_url, output
+  responses watch <runId> --jsonl        Watch until done (incremental events)
+  responses list --project <id>          List runs for a project
+`);
   }
 } else if (command === 'list' || command === 'ls') {
   const { headers, baseUrl } = getAuth();
   await listProjects(baseUrl, headers);
+} else if (command === 'project' || command === 'projects') {
+  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 });
+  } else {
+    console.log(`Project commands:
+  project media <projectId> --json      List timeline media for a project
+`);
+  }
 } else if (command === 'abort') {
   const { headers, baseUrl } = getAuth();
   const runId = args[1];
@@ -1771,11 +1376,22 @@ if (command === '--version' || command === '-v' || command === 'version') {
 
     let videoUrl = isHttpUrl(video) ? video : null;
     let inputVideoMeta = null;
+    const selectedVideoModel = videoModel || 'kling';
     if (videoUrl) {
-      process.stderr.write(`📹 Assuming public video URL already matches Makaron upload limits: ≤${MAX_VIDEO_DURATION}s, ≤200MB, ≤1080p.\n`);
+      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.\n`);
     }
     if (video && !videoUrl) {
-      const valid = validateVideoFile(video);
+      const valid = validateVideoFile(video, {
+        maxDuration: MAX_VIDEO_PROVIDER_REFERENCE_DURATION,
+        durationTolerance: MAX_VIDEO_PROVIDER_REFERENCE_DURATION_TOLERANCE,
+        ...(selectedVideoModel === 'seedance' ? {
+          minFramePixels: SEEDANCE_MIN_VIDEO_FRAME_PIXELS,
+          minSide: SEEDANCE_MIN_VIDEO_SIDE,
+          maxSide: SEEDANCE_MAX_VIDEO_SIDE,
+          minAspect: SEEDANCE_MIN_VIDEO_ASPECT,
+          maxAspect: SEEDANCE_MAX_VIDEO_ASPECT,
+        } : {}),
+      });
       if (!valid.ok) { console.error(`❌ ${valid.error}`); process.exit(1); }
       inputVideoMeta = valid.meta;
       process.stderr.write(`📹 Uploading ${path.basename(video)} (${(fs.statSync(video).size/1024/1024).toFixed(1)}MB)...\n`);
@@ -1786,9 +1402,9 @@ if (command === '--version' || command === '-v' || command === 'version') {
     // Standalone MCP tool (no project timeline write)
     process.stderr.write('🎬 Submitting video...\n');
     const vArgs = videoUrl
-      ? { videoUrl, editPrompt: script, images, videoModel: videoModel || 'kling', referType: (videoModel || 'kling') === 'seedance' ? 'feature' : 'base' }
+      ? { videoUrl, editPrompt: script, images, videoModel: selectedVideoModel, referType: selectedVideoModel === 'seedance' ? 'feature' : 'base' }
       : { script, images };
-    const effectiveDuration = duration || (inputVideoMeta?.duration ? Math.min(MAX_VIDEO_DURATION, Math.round(inputVideoMeta.duration)) : undefined);
+    const effectiveDuration = duration || (inputVideoMeta?.duration ? Math.min(MAX_VIDEO_PROVIDER_REFERENCE_DURATION, Math.round(inputVideoMeta.duration)) : undefined);
     if (effectiveDuration) vArgs.duration = effectiveDuration;
     if (aspectRatio) vArgs.aspectRatio = aspectRatio;
     if (videoModel && !videoUrl) vArgs.videoModel = videoModel;
@@ -2081,43 +1697,5 @@ if (command === '--version' || command === '-v' || command === 'version') {
   console.log(JSON.stringify(data));
   console.error(`🔗 Share this link with a human: ${data.claim_url}`);
 } else {
-  console.log(`Makaron CLI — Talk to Makaron Agent from the terminal
-
-Commands:
-  register --json                    Get challenge for agent self-registration
-  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)
-  list (ls)                          List all projects
-  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)
-
-  chat --project <id> "message"      Chat (non-blocking, polls for result)
-  chat --project <id> --video <file> Attach video to conversation
-  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
-
-  responses get <runId>              Get run status and results
-  responses get <runId> --wait       Poll until completed
-  responses next <runId> --json      New Agent entry: compact timeline + checkpoint guidance
-  responses handle <messageId> --run <runId> --choice approve|revise|ask_user|continue
-  responses deliver <artifactId> --run <runId>   Record artifact delivered to the user
-  responses events <runId> --jsonl   Emit message/approval/artifact events
-  responses timeline <runId> --checkpoint-mode off   Disable text-only checkpoints for pure Q&A
-  responses list --project <id>      List runs for a project
-  abort <runId>                      Abort a running Agent
-
-  edit [--image <file>] "prompt"     AI image edit / text-to-image
-  analyze --video <file|url>         Analyze video content
-  video script|create|status         Video generation
-  music create|status                Music generation
-
-  admin                              Admin commands (skills, upload, set-admin)
-
-Environment:
-  MAKARON_API_KEY  API key (mk_live_xxx) — recommended for agents
-  MAKARON_URL      API base (default: ${DEFAULT_URL})
-`);
+  printRootHelp();
 }