@crievo/omni 0.1.3 → 0.1.5

package/studio/web/styles/index.css

@@ -114,3 +114,26 @@
 @import "./pages/agent.css";
 @import "./components/omni.css";
 @import "./components/omni-cards.css";
+
+/* Bencho ports (the /bencho gallery): its own palette, the page, then one file per component */
+@import "./components/bencho/tokens.css";
+@import "./components/bencho/scope.css";
+@import "./components/bencho/gallery.css";
+@import "./components/bencho/pull.css";
+@import "./components/bencho/liq-toggle.css";
+@import "./components/bencho/checklist.css";
+@import "./components/bencho/sound.css";
+@import "./components/bencho/dock.css";
+@import "./components/bencho/slosh.css";
+@import "./components/bencho/liq-create.css";
+@import "./components/bencho/picker.css";
+@import "./components/bencho/slide-confirm.css";
+@import "./components/bencho/image-accordion.css";
+@import "./components/bencho/action-node.css";
+@import "./components/bencho/generate.css";
+@import "./components/bencho/one-time-code.css";
+@import "./components/bencho/upload-dropzone.css";
+@import "./components/bencho/voice-note.css";
+@import "./components/bencho/toast-stack.css";
+@import "./components/toaster.css";
+@import "./components/bencho/stacked-bars.css";

package/studio/web/styles/pages/video/layout.css

@@ -41,10 +41,7 @@
   padding: 4px 24px;
   background: none;
   border-bottom: 1px solid var(--border);
-  overflow-x: auto;
-}
-.rail .stepper {
-  min-width: 900px;
+  /* no scroll box: the stage cards' fans hang below the rail and a scroller would clip them; the cards wrap instead */
 }
 /* sentinel at the rail's natural position (takes no space): when it leaves through the top, the rail
    is stuck and gets the panel background */

package/studio/web/styles/pages/video/sound-timeline.css

@@ -244,6 +244,9 @@
   position: absolute;
   left: 6px;
   top: 4px;
+  display: flex;
+  align-items: center;
+  gap: 6px;
 }
 .sound-header {
   position: absolute;
@@ -670,3 +673,8 @@
   border-top-color: transparent;
   animation: spin 0.8s linear infinite;
 }
+.sound-add-buttons {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 6px;
+}

package/studio/web/styles/theme/identity/shell.css

@@ -89,44 +89,28 @@ main.with-sidebar {
   background: var(--el-nav-active-bg);
   color: var(--el-nav-active-text);
 }
-/* the "Criar vídeo" + inside the Videos row */
+/* the "Criar" pill (components/bencho/CreateMenu) inside the Conteúdos row: it sits over the link at the right edge, as a
+   sibling (a button inside <a> is not valid HTML), and its menu hangs from the pill's top right corner. Out of flow,
+   centred on the row by margin rather than a transform: a transformed box would be a stacking context of its own. */
 .menu .menu-item-with-action {
   position: relative;
   display: flex;
   flex-direction: column;
 }
 .menu .menu-item-with-action > a {
-  padding-right: 36px;
+  padding-right: 100px;
 }
-.menu .menu-action {
+.menu .menu-create {
   position: absolute;
   top: 50%;
-  right: 4px;
-  transform: translateY(-50%);
-  display: inline-flex;
-  align-items: center;
-  gap: 4px;
-  height: 24px;
-  padding: 0 8px 0 6px;
-  font: 500 12px / 1 var(--sans);
-  border: 0;
-  border-radius: var(--el-radius-nav);
-  background: transparent;
-  color: var(--text-2);
-  cursor: pointer;
-}
-.menu .menu-action svg {
-  width: 12px;
-  height: 12px;
-}
-.menu .menu-action:hover,
-.menu .menu-action:focus-visible {
-  background: var(--surface-2);
-  color: var(--text);
+  right: 3px;
+  margin-top: calc(var(--pill-h) / -2);
 }
 @media (max-width: 900px) {
   .menu {
     width: auto;
+    /* the bar has no fixed height to scroll in, and the create menu hangs below it */
+    overflow: visible;
   }
   .brand {
     margin-bottom: 0;
@@ -213,7 +197,7 @@ main.with-sidebar {
   }
   .menu-collapsed .brand-omni,
   .menu-collapsed .menu-label,
-  .menu-collapsed .menu-action {
+  .menu-collapsed .menu-create {
     display: none;
   }
   .menu-collapsed .menu-group-name {

package/tools/omnichat.mjs

@@ -1033,10 +1033,16 @@ async function status() {
   const pause = readJson(PAUSE_FILE);
   if (isPaused(pause, Date.now())) s.pause = pause;
   if (cloudOwns()) {
-    await Promise.all(videosWithRule().map(d => pullRecord(d).catch(() => {})));
-    /* the cloud answers: its pause and its token are the ones that count */
+    /* the cloud answers: its pause and its token are the ones that count; its posts' updated_at say
+       which records changed since the mirror, and only those are pulled */
     try {
       const c = await cloudApi("GET", "/api/status");
+      const at = new Map((c.posts ?? []).map(p => [String(p.media_id), p.updated_at]));
+      await Promise.all(
+        videosWithRule()
+          .filter(d => at.has(String(mediaOf(d))))
+          .map(d => pullRecord(d, at.get(String(mediaOf(d)))).catch(() => {})),
+      );
       s.cloud = { ready: true, active: !!c.active, expires: c.account?.expires ?? null };
       if (!c.active) s.cloud.reason = "a cloud não está respondendo (cloud push)";
       if (c.account?.paused_until && Date.parse(c.account.paused_until) > Date.now())
@@ -1167,19 +1173,26 @@ function syncRule(dir) {
 }
 const flushCloud = () => Promise.all(pendingCloud.splice(0));
 
-/* the cloud's record mirrored into omnichat-record.json: the studio and the log read the file */
-async function pullRecord(dir) {
+/* The cloud's record mirrored into omnichat-record.json: the studio and the log read the file.
+   `cloudAt`: the post's updated_at from /api/status; when the mirror already has that version, nothing is
+   asked (the studio's status runs every few minutes, and each record that leaves Neon counts against the
+   free plan's monthly transfer). */
+async function pullRecord(dir, cloudAt = null) {
   if (!cloudOwns()) return;
   const media = mediaOf(dir);
   if (!media) return;
+  const file = recordFile(dir);
+  if (cloudAt && readJson(file)?.cloud_updated_at === cloudAt) return;
   try {
     const out = await cloudApi("GET", `/api/posts/${media}`);
-    const file = recordFile(dir);
     const all = readJson(file) ?? {};
     /* only a change is written: the write is a studio notice, and the notice makes the page read (and
        pull) again, so an unchanged record written anyway loops against the cloud */
-    if (JSON.stringify(all.instagram ?? null) === JSON.stringify(out.record ?? null)) return;
+    const at = out.updated_at ?? null;
+    if (JSON.stringify(all.instagram ?? null) === JSON.stringify(out.record ?? null) && all.cloud_updated_at === at)
+      return;
     all.instagram = out.record;
+    all.cloud_updated_at = at;
     delete all.cloud;
     writeJson(file, all);
   } catch (e) {

package/tools/sound.mjs

@@ -8,6 +8,8 @@
      node tools/sound.mjs kit [role|text]                 lists the global kit by role
      node tools/sound.mjs kit adopt videos/<slug> <name> --role <role> [--as <name-in-kit>]
                                                           moves an effect captured for the video into the kit
+     node tools/sound.mjs import videos/<slug> <file> [name] [--title <text>]
+                                                          a track the user sent (the editor's upload), as an MP3 of the video's sfx/
      node tools/sound.mjs effects videos/<slug> [text]    lists the effects captured for the video
      node tools/sound.mjs videos/<slug>                   prepares the video's sound/
 
@@ -16,7 +18,9 @@
    by every video, each effect with a role (click, pop, tick, typing, confirm,
    whoosh, transition, riser, impact, glitch, bed, texture); and the video's
    sfx/ (sfx/sources.json), for what the kit lacks. No other audio saved on the
-   computer gets in. With a search open in Chrome (sound.source.search in the
+   computer gets in, except a track the user sends on purpose through the
+   editor's upload (`import`): it goes to the video's sfx/ as an MP3 with
+   source "upload", only for that video, never into the kit. With a search open in Chrome (sound.source.search in the
    config), the `capture` code plays the previews and returns each one's URL
    (audiocdn.epidemicsound.com/lqmp3/<id>.mp3); `download` writes the MP3 to
    the kit or the video's sfx/ and records the origin. An effect outside both
@@ -79,7 +83,7 @@
    queue turn (tools/job-queue.mjs).
    ============================================================================ */
 
-import { readFileSync, writeFileSync, existsSync, mkdirSync, statSync } from "node:fs";
+import { readFileSync, writeFileSync, existsSync, mkdirSync, rmSync, statSync } from "node:fs";
 import { spawnSync } from "node:child_process";
 import { join, resolve, basename, relative } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -406,6 +410,62 @@ async function download(videoDir, url, name, search, role) {
   );
 }
 
+/* A track the user sent from the editor (the upload): any audio file becomes an MP3 in the video's sfx/,
+   registered with the origin "upload". It is the user's own file, so it is theirs to license; it stays in
+   this video (adopt refuses it) and never reaches the kit. */
+function importUpload(videoDir, file, wanted, title) {
+  const dir = resolve(videoDir ?? "");
+  if (!existsSync(join(dir, "scenes.json"))) throw new Error(`${dir} não é a pasta de um vídeo (falta scenes.json)`);
+  if (!file || !existsSync(file)) throw new Error(`o arquivo “${file}” não existe`);
+  const base = (wanted || basename(file)).replace(/\.[A-Za-z0-9]{1,5}$/, "");
+  const slug =
+    base
+      .normalize("NFD")
+      .replace(/[\u0300-\u036f]/g, "")
+      .toLowerCase()
+      .replace(/[^a-z0-9._-]+/g, "-")
+      .replace(/^[^a-z0-9]+|[^a-z0-9]+$/g, "") || "musica";
+  const taken = n =>
+    !!sources(dir)[`${n}.mp3`] || !!kitSources()[`${n}.mp3`] || existsSync(join(effectsDir(dir), `${n}.mp3`));
+  let n = slug;
+  for (let i = 2; taken(n); i++) n = `${slug}-${i}`;
+  const name = `${n}.mp3`;
+  mkdirSync(effectsDir(dir), { recursive: true });
+  const out = join(effectsDir(dir), name);
+  /* an MP3 is kept as it is (without cover art or tags); anything else is encoded */
+  const isMp3 = /\.mp3$/i.test(file);
+  try {
+    run("ffmpeg", [
+      "-y",
+      "-v",
+      "error",
+      "-i",
+      file,
+      "-vn",
+      "-map_metadata",
+      "-1",
+      ...(isMp3 ? ["-c:a", "copy"] : ["-c:a", "libmp3lame", "-q:a", "2"]),
+      out,
+    ]);
+    const med = measureEffect(out);
+    if (!(med.duration > 0)) throw new Error("o arquivo não tem áudio");
+  } catch (e) {
+    rmSync(out, { force: true });
+    throw new Error(`não consegui ler “${basename(file)}” como áudio: ${String(e.message).slice(0, 200)}`);
+  }
+  cache.delete(out);
+  const list = sources(dir);
+  list[name] = {
+    source: "upload",
+    title: title || basename(file).replace(/\.[A-Za-z0-9]{1,5}$/, ""),
+    uploaded_at: new Date().toISOString().slice(0, 10),
+  };
+  writeFileSync(join(effectsDir(dir), "sources.json"), JSON.stringify(list, null, 1) + "\n");
+  const m = measureEffect(out);
+  console.log(`${name} ← ${list[name].title} · enviado pelo usuário`);
+  console.log(m.music ? `   ${m.duration.toFixed(0)}s · trilha (só música de fundo)` : `   ${describe(m)}`);
+}
+
 const describe = m =>
   `${m.duration.toFixed(2)}s · pico em ${m.peak_s}s (${m.peak_db} dB) · útil até ${m.useful_end_s}s · volume ${m.volume_lufs} LUFS`;
 
@@ -437,6 +497,8 @@ function adopt(videoDir, name, role, as) {
   if (!ROLES[role]) throw new Error(`--role é obrigatório: ${Object.keys(ROLES).join(", ")}`);
   const source = sources(dir)[name];
   if (!source) throw new Error(`“${name}” não está em ${join(effectsDir(dir), "sources.json")}`);
+  if (source.source === "upload")
+    throw new Error(`“${name}” foi enviado pelo usuário para este vídeo: o kit só recebe áudio da Epidemic`);
   const newName = `${(as ?? name).replace(/\.mp3$/i, "")}.mp3`;
   if (!NAME.test(newName)) throw new Error(`nome “${newName}”: letras, números, ponto, hífen e sublinhado`);
   const list = kitSources();
@@ -1295,9 +1357,11 @@ if (isMainModule(import.meta.url)) {
   try {
     const option = n => (i => (i < 0 ? undefined : rest.splice(i, 2)[1]))(rest.indexOf(`--${n}`));
     const search = option("search"),
-      role = option("role");
+      role = option("role"),
+      title = option("title");
     if (cmd === "capture") capture(+(rest[0] ?? 8));
     else if (cmd === "download") await download(rest[0], rest[1], rest[2], search, role);
+    else if (cmd === "import") importUpload(rest[0], rest[1], rest[2], title);
     else if (cmd === "effects") effects(rest[0], rest[1]);
     else if (cmd === "kit" && rest[0] === "adopt") adopt(rest[1], rest[2], role, option("as") ?? rest[3]);
     else if (cmd === "kit") kit(rest[0]);