@bitmagic/cli 0.1.59 → 0.1.60-dev.1

package/dist/editor/motion-panel.js

@@ -32,6 +32,19 @@ export const MOTION_PANEL_CSS = `
   #motion-hint { position: absolute; inset: 0; display: flex; align-items: center; justify-content: center;
                  text-align: center; padding: 20px; font-size: 13px; color: var(--bm-text-muted); }
   #motion-hint.hidden { display: none; }
+  #motion-trim { display: none; margin-top: 10px; }
+  #motion-trim.show { display: block; }
+  #motion-trimbar { position: relative; height: 14px; border-radius: 7px; background: var(--bm-surface-alt);
+                    touch-action: none; }
+  #motion-trim-kept { position: absolute; top: 0; bottom: 0; border-radius: 7px; background: var(--bm-aqua); }
+  #motion-trim-playhead { position: absolute; top: 0; bottom: 0; width: 2px; background: var(--bm-pink);
+                          pointer-events: none; }
+  .motion-trim-handle { position: absolute; top: 50%; width: 14px; height: 22px;
+                        transform: translate(-50%, -50%); border-radius: 5px; background: var(--bm-text);
+                        cursor: ew-resize; touch-action: none; }
+  #motion-trim-row { display: flex; align-items: center; justify-content: space-between; gap: 8px;
+                     margin-top: 6px; min-height: 24px; }
+  #motion-trim-note { font-size: 11px; color: var(--bm-text-muted); }
   #motion-sources { display: flex; gap: 8px; margin-top: 10px; flex-wrap: wrap; }
   #motion-file { display: none; }
   #motion-guidance { margin: 10px 0 0; font-size: 12px; color: var(--bm-text-muted); }
@@ -59,6 +72,18 @@ export const MOTION_PANEL_HTML = `  <div id="motion-overlay" class="bm-overlay">
         <div id="motion-hint">Whole body in frame, one person, plain background, good light.
           2&ndash;60 seconds.</div>
       </div>
+      <div id="motion-trim">
+        <div id="motion-trimbar" title="Drag the handles to choose what the animation is made from">
+          <div id="motion-trim-kept"></div>
+          <div id="motion-trim-playhead"></div>
+          <div id="motion-trim-start" class="motion-trim-handle"></div>
+          <div id="motion-trim-end" class="motion-trim-handle"></div>
+        </div>
+        <div id="motion-trim-row">
+          <span id="motion-trim-note"></span>
+          <button id="motion-trim-full" class="bm-pill bm-pill--ghost" type="button" hidden>Use full clip</button>
+        </div>
+      </div>
       <div id="motion-sources">
         <button id="motion-record" class="bm-pill bm-pill--primary" type="button">Record with webcam</button>
         <button id="motion-stop" class="bm-pill" type="button" hidden>Stop</button>
@@ -134,6 +159,168 @@ export const MOTION_PANEL_JS = `
   var motionTickTimer = null;
   var motionStartedAt = 0;
   var motionObjectUrl = null;
+  // ---- Trim window: seeded by the sidecar's trim analysis, adjusted on the handles ------------
+  var motionTrimWrap = document.getElementById('motion-trim');
+  var motionTrimBar = document.getElementById('motion-trimbar');
+  var motionTrimKept = document.getElementById('motion-trim-kept');
+  var motionTrimPlayhead = document.getElementById('motion-trim-playhead');
+  var motionTrimStartHandle = document.getElementById('motion-trim-start');
+  var motionTrimEndHandle = document.getElementById('motion-trim-end');
+  var motionTrimNote = document.getElementById('motion-trim-note');
+  var motionTrimFullBtn = document.getElementById('motion-trim-full');
+  var MOTION_TRIM_MIN_KEPT_S = 2;
+  var motionTrimDuration = 0;
+  var motionTrimStart = 0;
+  var motionTrimEnd = 0;
+  var motionPendingId = null;
+  var motionAnalysisState = 'idle';
+  var motionAnalysisToken = 0;
+  var motionAnalyzePollTimer = null;
+
+  function motionHasTrim() {
+    return motionTrimDuration > 0 && motionTrimEnd > motionTrimStart
+      && (motionTrimStart >= 0.1 || motionTrimDuration - motionTrimEnd >= 0.1);
+  }
+
+  function renderMotionTrim() {
+    if (motionTrimDuration <= 0) { motionTrimWrap.classList.remove('show'); return; }
+    motionTrimWrap.classList.add('show');
+    var pct = function (seconds) {
+      return Math.min(Math.max(seconds / motionTrimDuration, 0), 1) * 100 + '%';
+    };
+    motionTrimKept.style.left = pct(motionTrimStart);
+    motionTrimKept.style.width = Math.max(0, (motionTrimEnd - motionTrimStart) / motionTrimDuration) * 100 + '%';
+    motionTrimStartHandle.style.left = pct(motionTrimStart);
+    motionTrimEndHandle.style.left = pct(motionTrimEnd);
+    motionTrimFullBtn.hidden = !motionHasTrim();
+    var note;
+    if (motionAnalysisState === 'running') {
+      note = 'Analyzing the clip for a good trim\u2026';
+    } else if (!motionHasTrim()) {
+      note = 'Using the full clip.';
+    } else {
+      var parts = [];
+      if (motionTrimStart >= 0.1) parts.push(motionTrimStart.toFixed(1) + 's from the start');
+      if (motionTrimDuration - motionTrimEnd >= 0.1) parts.push((motionTrimDuration - motionTrimEnd).toFixed(1) + 's from the end');
+      note = 'Trimming ' + parts.join(' and ') + '.';
+    }
+    motionTrimNote.textContent = note;
+  }
+
+  function resetMotionTrim() {
+    motionAnalysisToken++;
+    if (motionAnalyzePollTimer) { clearTimeout(motionAnalyzePollTimer); motionAnalyzePollTimer = null; }
+    motionPendingId = null;
+    motionAnalysisState = 'idle';
+    motionTrimDuration = 0;
+    motionTrimStart = 0;
+    motionTrimEnd = 0;
+    motionTrimWrap.classList.remove('show');
+  }
+
+  function seedMotionTrim(durationSeconds) {
+    if (!(durationSeconds > 0)) return;
+    motionTrimDuration = durationSeconds;
+    motionTrimStart = 0;
+    motionTrimEnd = durationSeconds;
+    renderMotionTrim();
+  }
+
+  function applyMotionSuggestion(suggestion) {
+    if (!suggestion) { renderMotionTrim(); return; }
+    if (suggestion.durationSeconds > 0) {
+      motionTrimDuration = suggestion.durationSeconds;
+      motionTrimStart = 0;
+      motionTrimEnd = suggestion.durationSeconds;
+    }
+    if (suggestion.confidence === 'high'
+        && typeof suggestion.suggestedStartSeconds === 'number'
+        && typeof suggestion.suggestedEndSeconds === 'number'
+        && suggestion.suggestedEndSeconds > suggestion.suggestedStartSeconds) {
+      motionTrimStart = suggestion.suggestedStartSeconds;
+      motionTrimEnd = Math.min(suggestion.suggestedEndSeconds, motionTrimDuration || suggestion.suggestedEndSeconds);
+    }
+    renderMotionTrim();
+  }
+
+  function beginMotionTrimDrag(which, event) {
+    if (motionTrimDuration <= 0) return;
+    var handle = event.currentTarget;
+    handle.setPointerCapture(event.pointerId);
+    var move = function (e) {
+      var rect = motionTrimBar.getBoundingClientRect();
+      if (rect.width === 0) return;
+      var at = Math.min(Math.max((e.clientX - rect.left) / rect.width, 0), 1) * motionTrimDuration;
+      if (which === 'start') motionTrimStart = Math.min(at, motionTrimEnd - MOTION_TRIM_MIN_KEPT_S);
+      else motionTrimEnd = Math.max(at, motionTrimStart + MOTION_TRIM_MIN_KEPT_S);
+      renderMotionTrim();
+    };
+    var up = function () {
+      handle.removeEventListener('pointermove', move);
+      handle.removeEventListener('pointerup', up);
+      handle.removeEventListener('pointercancel', up);
+    };
+    handle.addEventListener('pointermove', move);
+    handle.addEventListener('pointerup', up);
+    handle.addEventListener('pointercancel', up);
+    event.preventDefault();
+  }
+
+  function pollMotionAnalysis(token) {
+    var tick = async function () {
+      if (token !== motionAnalysisToken) return;
+      var payload;
+      try {
+        payload = await (await fetch('/api/editor/motion-analyze-status')).json();
+      } catch (error) {
+        motionAnalyzePollTimer = setTimeout(tick, 2000);
+        return;
+      }
+      if (token !== motionAnalysisToken) return;
+      if (payload && payload.status === 'done') {
+        motionAnalysisState = 'done';
+        applyMotionSuggestion(payload.suggestion);
+        return;
+      }
+      if (payload && payload.status === 'running') {
+        motionAnalyzePollTimer = setTimeout(tick, 2000);
+        return;
+      }
+      // failed / unavailable / none: no suggestion, the full-range handles stand.
+      motionAnalysisState = 'failed';
+      renderMotionTrim();
+    };
+    motionAnalyzePollTimer = setTimeout(tick, 2000);
+  }
+
+  /**
+   * Hand the clip to the sidecar ahead of submission: it uploads once and runs the unbilled trim
+   * analysis while the creator reviews. Degraded, never blocking — any failure just leaves the
+   * handles at full range, and Submit works throughout.
+   */
+  async function startMotionAnalysis(blob) {
+    var token = ++motionAnalysisToken;
+    motionPendingId = null;
+    motionAnalysisState = 'running';
+    renderMotionTrim();
+    var result = null;
+    try {
+      var response = await fetch('/api/editor/motion-analyze', {
+        method: 'POST',
+        headers: { 'Content-Type': blob.type || 'video/webm' },
+        body: blob
+      });
+      result = await response.json();
+    } catch (error) { /* the sidecar said nothing; treat as unavailable */ }
+    if (token !== motionAnalysisToken) return;
+    if (!result || result.ok !== true || result.analysing !== true) {
+      motionAnalysisState = 'idle';
+      renderMotionTrim();
+      return;
+    }
+    motionPendingId = result.pendingId || null;
+    pollMotionAnalysis(token);
+  }
 
   function motionSupported() {
     return !!(window.isSecureContext && navigator.mediaDevices && navigator.mediaDevices.getUserMedia
@@ -201,6 +388,7 @@ export const MOTION_PANEL_JS = `
   }
 
   function resetMotionPanel() {
+    resetMotionTrim();
     stopMotionStream();
     discardMotionRecorder();
     motionRecorder = null;
@@ -258,6 +446,17 @@ export const MOTION_PANEL_JS = `
       : note;
     setMotionButtons('ready');
     motionSubmit.disabled = !ok;
+    resetMotionTrim();
+    if (ok) {
+      seedMotionTrim(seconds);
+      // A fresh WebM often reports no duration; the preview's metadata is the fallback scale.
+      motionPreview.onloadedmetadata = function () {
+        if (motionTrimDuration === 0 && isFinite(motionPreview.duration) && motionPreview.duration > 0) {
+          seedMotionTrim(motionPreview.duration);
+        }
+      };
+      void startMotionAnalysis(blob);
+    }
   }
 
   async function startMotionRecording() {
@@ -382,10 +581,19 @@ export const MOTION_PANEL_JS = `
     if (!motionBlob) return;
     var name = motionName.value.trim();
     if (name === '') { motionName.focus(); return; }
+    // Whatever the handles show is what gets made; a still-running analysis must not move them.
+    motionAnalysisToken++;
+    if (motionAnalyzePollTimer) { clearTimeout(motionAnalyzePollTimer); motionAnalyzePollTimer = null; }
     var query = '?name=' + encodeURIComponent(name)
       + '&slot=' + encodeURIComponent(motionSlot.value)
-      + '&loop=' + (motionLoop.checked ? '1' : '0')
-      + '&autoTrim=' + (motionFromRecording ? '1' : '0');
+      + '&loop=' + (motionLoop.checked ? '1' : '0');
+    if (motionHasTrim()) {
+      query += '&trimStart=' + encodeURIComponent(String(Math.round(motionTrimStart * 100) / 100))
+        + '&trimEnd=' + encodeURIComponent(String(Math.round(motionTrimEnd * 100) / 100));
+    }
+    if (motionPendingId) {
+      query += '&pendingId=' + encodeURIComponent(motionPendingId);
+    }
     motionSubmit.disabled = true;
     showMotionNote('Uploading the video…', '');
     var response, result;
@@ -428,5 +636,22 @@ export const MOTION_PANEL_JS = `
   motionPickBtn.addEventListener('click', function () { motionFile.value = ''; motionFile.click(); });
   motionFile.addEventListener('change', function () { pickMotionFile(motionFile.files && motionFile.files[0]); });
   motionSubmit.addEventListener('click', function () { void submitMotion(); });
+  motionTrimStartHandle.addEventListener('pointerdown', function (event) { beginMotionTrimDrag('start', event); });
+  motionTrimEndHandle.addEventListener('pointerdown', function (event) { beginMotionTrimDrag('end', event); });
+  motionTrimFullBtn.addEventListener('click', function () {
+    motionTrimStart = 0;
+    motionTrimEnd = motionTrimDuration;
+    renderMotionTrim();
+  });
+  // Review playback stays inside the kept range, so the creator sees what gets made.
+  motionPreview.addEventListener('timeupdate', function () {
+    if (motionTrimDuration > 0) {
+      motionTrimPlayhead.style.left = Math.min(Math.max(motionPreview.currentTime / motionTrimDuration, 0), 1) * 100 + '%';
+    }
+    if (!motionBlob || !motionHasTrim()) return;
+    if (motionPreview.currentTime >= motionTrimEnd || motionPreview.currentTime < motionTrimStart - 0.25) {
+      motionPreview.currentTime = motionTrimStart;
+    }
+  });
 `;
 //# sourceMappingURL=motion-panel.js.map

package/dist/editor/motion-panel.js.map

@@ -1 +1 @@
-{"version":3,"file":"motion-panel.js","sourceRoot":"","sources":["../../src/editor/motion-panel.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,MAAM,CAAC,MAAM,gBAAgB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmC/B,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8ChC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0U9B,CAAC"}
+{"version":3,"file":"motion-panel.js","sourceRoot":"","sources":["../../src/editor/motion-panel.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,MAAM,CAAC,MAAM,gBAAgB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgD/B,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0DhC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkhB9B,CAAC"}

package/dist/editor/motion-sink.d.ts

@@ -17,8 +17,16 @@ export interface MotionVideoRequest {
     name: string;
     locomotionState?: LocomotionState;
     loop?: boolean;
-    /** Cut walk-to-the-camera frames off both ends (recorded clips; not file picks). */
+    /** Cut walk-to-the-camera frames off both ends. Legacy clients only; the panel now sends an explicit window. */
     autoTrim?: boolean;
+    /**
+     * Explicit trim window (seconds into the source clip), both or neither — the
+     * window the creator confirmed on the panel's trim bar. Wins over autoTrim.
+     */
+    trimStartSeconds?: number;
+    trimEndSeconds?: number;
+    /** The sidecar's pending analysis clip; a match reuses its already-uploaded URL. */
+    pendingId?: string;
 }
 export interface MotionVideoRefusal {
     status: 400 | 413 | 415;
@@ -44,4 +52,4 @@ export declare function motionDoneMessage(result: {
     trimmedEndSeconds?: number;
 }): string;
 /** The command the panel prints when nobody is logged in — what the agent (or the creator) runs instead. */
-export declare function motionCommand(videoPath: string, request: Pick<MotionVideoRequest, 'name' | 'locomotionState' | 'loop' | 'autoTrim'>): string;
+export declare function motionCommand(videoPath: string, request: Pick<MotionVideoRequest, 'name' | 'locomotionState' | 'loop' | 'autoTrim' | 'trimStartSeconds' | 'trimEndSeconds'>): string;

package/dist/editor/motion-sink.js

@@ -8,7 +8,7 @@
  * because the sidecar has no multipart parser beyond the recorder's frame sink, and a single
  * binary body is the simplest thing both sides get right.
  */
-import { LOCOMOTION_STATES, describeAutoTrim } from '@bitmagic/asset-core';
+import { LOCOMOTION_STATES, MIN_TRIM_KEPT_SECONDS, describeAutoTrim } from '@bitmagic/asset-core';
 /** Matches the CLI lane's own cap (`generate/animation-from-video.ts`) and asset-forger's. */
 export const MOTION_BODY_LIMIT_BYTES = 200 * 1024 * 1024;
 /** Content types a browser's MediaRecorder or a file picker hands over, and the extension each becomes. */
@@ -47,6 +47,24 @@ export function parseMotionVideoRequest(input) {
     }
     const loop = input.query.get('loop');
     const autoTrim = input.query.get('autoTrim');
+    const trimStartRaw = input.query.get('trimStart');
+    const trimEndRaw = input.query.get('trimEnd');
+    if ((trimStartRaw === null) !== (trimEndRaw === null)) {
+        return { status: 400, error: 'trimStart and trimEnd must be given together.' };
+    }
+    let trimWindow = null;
+    if (trimStartRaw !== null && trimEndRaw !== null) {
+        const trimStart = Number(trimStartRaw);
+        const trimEnd = Number(trimEndRaw);
+        if (!Number.isFinite(trimStart) || !Number.isFinite(trimEnd) || trimStart < 0) {
+            return { status: 400, error: 'trimStart and trimEnd must be non-negative seconds into the clip.' };
+        }
+        if (trimEnd - trimStart < MIN_TRIM_KEPT_SECONDS) {
+            return { status: 400, error: `trimStart/trimEnd must keep at least ${MIN_TRIM_KEPT_SECONDS} seconds of the clip.` };
+        }
+        trimWindow = { trimStartSeconds: trimStart, trimEndSeconds: trimEnd };
+    }
+    const pendingId = input.query.get('pendingId');
     return {
         extension,
         contentType,
@@ -54,6 +72,8 @@ export function parseMotionVideoRequest(input) {
         ...(slot !== null && slot !== '' ? { locomotionState: slot } : {}),
         ...(loop === '1' || loop === 'true' ? { loop: true } : {}),
         ...(autoTrim === '1' || autoTrim === 'true' ? { autoTrim: true } : {}),
+        ...(trimWindow ?? {}),
+        ...(pendingId !== null && pendingId !== '' ? { pendingId } : {}),
     };
 }
 /**
@@ -72,8 +92,13 @@ export function motionCommand(videoPath, request) {
         parts.push(`--slot ${request.locomotionState}`);
     if (request.loop)
         parts.push('--loop');
-    if (request.autoTrim)
+    // The hand-off must reproduce the creator's confirmed window; --auto-trim only without one.
+    if (request.trimStartSeconds !== undefined && request.trimEndSeconds !== undefined) {
+        parts.push(`--trim-start ${request.trimStartSeconds}`, `--trim-end ${request.trimEndSeconds}`);
+    }
+    else if (request.autoTrim) {
         parts.push('--auto-trim');
+    }
     return parts.join(' ');
 }
 //# sourceMappingURL=motion-sink.js.map

package/dist/editor/motion-sink.js.map

@@ -1 +1 @@
-{"version":3,"file":"motion-sink.js","sourceRoot":"","sources":["../../src/editor/motion-sink.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"motion-sink.js","sourceRoot":"","sources":["../../src/editor/motion-sink.ts"],"names":[],"mappings":"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"}

package/dist/editor/server.js

@@ -39,7 +39,9 @@ import { jobsDirPath, readJobLayout, readRunningJobs, withJobRecord } from '../p
 import { listPreviews, readPreview, removePreview, writePreview } from './previews.js';
 import { findPropAsset, generateAndInstallProp } from '../generate/prop.js';
 import { generateAndInstallAnimationFromVideo } from '../generate/animation-from-video.js';
-import { MOTION_BODY_LIMIT_BYTES, motionCommand, motionDoneMessage, parseMotionVideoRequest } from './motion-sink.js';
+import { analyseTrimForVideo } from '../generate/trim-analysis.js';
+import { uploadProjectFile } from '../http/signed-upload.js';
+import { MOTION_BODY_LIMIT_BYTES, baseContentType, motionCommand, motionDoneMessage, parseMotionVideoRequest } from './motion-sink.js';
 import { resolveEnvironmentForCommand, resolveAuth0ClientId } from '../config/environments.js';
 import { getAccessToken } from '../auth/session.js';
 import { startUploadProxy } from '../forge/upload-proxy.js';
@@ -287,6 +289,13 @@ export async function startEditorServer(options) {
     let hqJob = null;
     /** The Record-motion panel's job, one at a time for the same reason as `hqJob`. */
     let motionJob = null;
+    /**
+     * The clip the panel just recorded, uploaded ahead of submission so the trim
+     * analysis can run while the creator reviews. One at a time, like motionJob;
+     * a new clip replaces it. `videoUrl` doubles as the submit path's upload —
+     * a matching pendingId skips the second upload.
+     */
+    let pendingMotion = null;
     /**
      * A token, or null when nobody is logged in. Never starts a device-code flow.
      *
@@ -674,6 +683,79 @@ export async function startEditorServer(options) {
     const handleHqStatus = (res) => {
         sendJson(res, 200, { ok: true, job: hqJob, worldMtimeMs: lastWrittenMtimeMs });
     };
+    /**
+     * `POST /api/editor/motion-analyze` — the clip the panel just accepted, as raw bytes, ahead of
+     * submission. Logged in: upload it through the signed-URL lane and run the Forger's unbilled
+     * trim analysis in the background; the panel polls `motion-analyze-status` and seeds its trim
+     * handles from the suggestion. Logged out: nothing to run — the panel keeps full-range handles.
+     * Degraded, never blocking: an analysis failure only means no suggestion.
+     */
+    const handleMotionAnalyze = async (req, res) => {
+        const contentType = baseContentType(req.headers['content-type']);
+        if (!contentType.startsWith('video/')) {
+            sendJson(res, 415, { ok: false, error: `Expected a video body; got ${JSON.stringify(contentType || 'nothing')}.` });
+            return;
+        }
+        let body;
+        try {
+            body = await readBodyBuffer(req, MOTION_BODY_LIMIT_BYTES);
+        }
+        catch {
+            sendJson(res, 413, { ok: false, error: `The video is over ${MOTION_BODY_LIMIT_BYTES / 1024 / 1024} MB.` });
+            return;
+        }
+        if (body.length === 0) {
+            sendJson(res, 400, { ok: false, error: 'The video is empty.' });
+            return;
+        }
+        const auth = await resolveAuth();
+        if (auth === null) {
+            pendingMotion = null;
+            sendJson(res, 200, { ok: true, analysing: false });
+            return;
+        }
+        const id = `pm-${Date.now()}`;
+        const pending = { id, videoUrl: null, analysis: 'running', suggestion: null };
+        pendingMotion = pending;
+        sendJson(res, 200, { ok: true, analysing: true, pendingId: id });
+        void (async () => {
+            const extension = contentType === 'video/mp4' ? 'mp4'
+                : contentType === 'video/quicktime' ? 'mov'
+                    : contentType === 'video/x-msvideo' ? 'avi' : 'webm';
+            const uploaded = await uploadProjectFile(auth.environment, auth.token, {
+                gameId: options.metadata.gameId,
+                filename: `motion-${Date.now()}.${extension}`,
+                contentType,
+                bytes: new Uint8Array(body),
+            }, { fetch: globalThis.fetch });
+            pending.videoUrl = uploaded.url;
+            const suggestion = await analyseTrimForVideo({
+                environment: auth.environment,
+                token: auth.token,
+                gameId: options.metadata.gameId,
+                videoUrl: uploaded.url,
+                deps: { fetch: globalThis.fetch, sleep: (ms) => new Promise((resolve) => setTimeout(resolve, ms)) },
+            });
+            if (pendingMotion === pending) {
+                pending.suggestion = suggestion;
+                pending.analysis = 'done';
+            }
+        })().catch((error) => {
+            log(`[editor] trim analysis failed: ${messageOf(error)}`);
+            if (pendingMotion === pending)
+                pending.analysis = 'failed';
+        });
+    };
+    const handleMotionAnalyzeStatus = (res) => {
+        sendJson(res, 200, {
+            ok: true,
+            ...(pendingMotion === null ? { status: 'none' } : {
+                status: pendingMotion.analysis,
+                pendingId: pendingMotion.id,
+                ...(pendingMotion.suggestion !== null ? { suggestion: pendingMotion.suggestion } : {}),
+            }),
+        });
+    };
     /**
      * `POST /api/editor/motion-video` — the Record-motion panel's recording, as raw bytes.
      *
@@ -734,12 +816,21 @@ export async function startEditorServer(options) {
             });
             return;
         }
+        // The analysis step already uploaded this exact clip; a matching pendingId
+        // hands its URL over so the clip is not uploaded to storage twice.
+        const pendingUrl = parsed.pendingId !== undefined && pendingMotion?.id === parsed.pendingId
+            ? pendingMotion.videoUrl
+            : null;
         const run = {
             videoPath,
+            ...(pendingUrl !== null ? { videoUrl: pendingUrl } : {}),
             name: parsed.name,
             ...(parsed.loop !== undefined ? { loop: parsed.loop } : {}),
             ...(parsed.locomotionState !== undefined ? { locomotionState: parsed.locomotionState } : {}),
             ...(parsed.autoTrim !== undefined ? { autoTrim: parsed.autoTrim } : {}),
+            ...(parsed.trimStartSeconds !== undefined && parsed.trimEndSeconds !== undefined
+                ? { trimStartSeconds: parsed.trimStartSeconds, trimEndSeconds: parsed.trimEndSeconds }
+                : {}),
         };
         motionJob = { name: parsed.name, status: 'running', message: 'Uploading the video…' };
         journal.append({ event: 'motion.started', name: parsed.name, ...(run.locomotionState ? { locomotionState: run.locomotionState } : {}) });
@@ -1135,6 +1226,14 @@ export async function startEditorServer(options) {
                 await handleMotionVideo(req, res);
                 return;
             }
+            if (req.method === 'POST' && url === '/api/editor/motion-analyze') {
+                await handleMotionAnalyze(req, res);
+                return;
+            }
+            if (req.method === 'GET' && url === '/api/editor/motion-analyze-status') {
+                handleMotionAnalyzeStatus(res);
+                return;
+            }
             if (req.method === 'GET' && url === '/api/editor/motion-status') {
                 handleMotionStatus(res);
                 return;