fluncle 0.74.0 → 0.76.0

package/bin/fluncle.mjs

@@ -462,6 +462,26 @@ function versionMatches(findingTitle, candidateTitle) {
   }
   return !candidateIsRemix;
 }
+function trackLabel(artists, title) {
+  const joined = artists.join(", ");
+  return joined && title ? `${joined} — ${title}` : joined || title;
+}
+function resolveClipTracks(options) {
+  const { inMs, members, outMs, setDurationMs } = options;
+  const cued = members.filter((member) => member.startMs != null).sort((a, b) => a.startMs - b.startMs);
+  if (cued.length === 0) {
+    return [];
+  }
+  const lastIndex = cued.length - 1;
+  return cued.filter((member, index) => {
+    const lo = index === 0 ? Math.min(member.startMs, inMs) : member.startMs;
+    const hi = index === lastIndex ? Math.max(setDurationMs, outMs) : cued[index + 1]?.startMs ?? Number.POSITIVE_INFINITY;
+    return lo < outMs && inMs < hi;
+  }).map((member) => ({
+    label: trackLabel(member.artists, member.title),
+    startMs: member.startMs
+  }));
+}
 function baseTitleMatches(findingTitle, candidateTitle) {
   const want = new Set(tokenize(stripVersionSuffix(findingTitle)));
   const have = new Set(tokenize(stripVersionSuffix(candidateTitle)));
@@ -524,7 +544,7 @@ function parseVersion(version) {
 var currentVersion;
 var init_version = __esm(() => {
   init_output();
-  currentVersion = "0.74.0".trim() ? "0.74.0".trim() : "0.1.0";
+  currentVersion = "0.76.0".trim() ? "0.76.0".trim() : "0.1.0";
 });
 
 // src/update-notifier.ts
@@ -2381,7 +2401,7 @@ function parseVersion2(version) {
 var currentVersion2, latestReleaseUrl = "https://api.github.com/repos/mauricekleine/fluncle/releases/latest";
 var init_version2 = __esm(() => {
   init_output();
-  currentVersion2 = "0.74.0".trim() ? "0.74.0".trim() : "0.1.0";
+  currentVersion2 = "0.76.0".trim() ? "0.76.0".trim() : "0.1.0";
 });
 
 // ../../packages/registry/src/index.ts
@@ -3001,7 +3021,7 @@ var init_src = __esm(() => {
       ],
       kind: "cron",
       name: "cron.healthcheck",
-      operatorNotes: "every 10m. Pure probing, zero LLM tokens. POSTs to the agent-tier record_health op that /status reads.",
+      operatorNotes: "every 10m, run by a rave-02 host systemd timer (docs/agents/hermes/healthcheck-timer/) — decoupled from the Hermes cron gateway so the prober isn't starved by the scheduler it monitors. Pure probing, zero LLM tokens. POSTs to the agent-tier record_health op that /status reads.",
       probeConfig: { cadenceMs: 10 * MINUTE_MS, cronName: "fluncle-healthcheck", kind: "cron" },
       weights: { status: "hidden" }
     },
@@ -3975,47 +3995,132 @@ var init_mixtapes2 = __esm(() => {
 var exports_clips = {};
 __export(exports_clips, {
   setVideoUrl: () => setVideoUrl,
+  resolveClipSansFontFile: () => resolveClipSansFontFile,
+  resolveClipFontFile: () => resolveClipFontFile,
   escapeDrawtextValue: () => escapeDrawtextValue,
   clipsListCommand: () => clipsListCommand,
   clipFootageKey: () => clipFootageKey,
-  clipCutVideoFilter: () => clipCutVideoFilter,
+  clipCutFilterComplex: () => clipCutFilterComplex,
   clipCutFfmpegArgs: () => clipCutFfmpegArgs,
   clipCutCommand: () => clipCutCommand,
+  brandDrawtext: () => brandDrawtext,
   MAX_CLIP_BYTES: () => MAX_CLIP_BYTES,
   CLIP_WIDTH: () => CLIP_WIDTH,
+  CLIP_TITLE_SIZE: () => CLIP_TITLE_SIZE,
+  CLIP_TITLE_COLOR: () => CLIP_TITLE_COLOR,
+  CLIP_SHARP_BORDERW: () => CLIP_SHARP_BORDERW,
+  CLIP_SAFE_BOTTOM: () => CLIP_SAFE_BOTTOM,
   CLIP_MAXRATE: () => CLIP_MAXRATE,
+  CLIP_MARGIN_X: () => CLIP_MARGIN_X,
+  CLIP_LINE_GAP: () => CLIP_LINE_GAP,
   CLIP_HEIGHT: () => CLIP_HEIGHT,
+  CLIP_HALO_FEATHER_SIGMA: () => CLIP_HALO_FEATHER_SIGMA,
+  CLIP_HALO_CORE_SIGMA: () => CLIP_HALO_CORE_SIGMA,
+  CLIP_HALO_COLOR: () => CLIP_HALO_COLOR,
   CLIP_CRF: () => CLIP_CRF,
+  CLIP_COORDINATE_SIZE: () => CLIP_COORDINATE_SIZE,
+  CLIP_COORDINATE_COLOR: () => CLIP_COORDINATE_COLOR,
   CLIP_BUFSIZE: () => CLIP_BUFSIZE,
-  CLIP_AUDIO_BITRATE: () => CLIP_AUDIO_BITRATE
+  CLIP_AUDIO_BITRATE: () => CLIP_AUDIO_BITRATE,
+  BOX_CLIP_SANS_FONT_FILE: () => BOX_CLIP_SANS_FONT_FILE,
+  BOX_CLIP_FONT_FILE: () => BOX_CLIP_FONT_FILE
 });
 import { randomUUID as randomUUID2 } from "node:crypto";
-import { rmSync as rmSync3, statSync as statSync4 } from "node:fs";
+import { existsSync as existsSync4, rmSync as rmSync3, statSync as statSync4 } from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
 import { join as join5 } from "node:path";
 function clipFootageKey(clipId) {
   return `${clipId}/footage.mp4`;
 }
+function resolveFontFile(envVar, bakedPath) {
+  const explicit = process.env[envVar];
+  if (explicit) {
+    return explicit;
+  }
+  return existsSync4(bakedPath) ? bakedPath : undefined;
+}
+function resolveClipFontFile() {
+  return resolveFontFile("CLIP_FONT_FILE", BOX_CLIP_FONT_FILE);
+}
+function resolveClipSansFontFile() {
+  return resolveFontFile("CLIP_SANS_FONT_FILE", BOX_CLIP_SANS_FONT_FILE);
+}
 function setVideoUrl(logId) {
   return `${FOUND_BASE3}/${encodeURIComponent(logId)}/set.mp4`;
 }
 function escapeDrawtextValue(text) {
   return text.replace(/\\/g, "\\\\").replace(/:/g, "\\:").replace(/,/g, "\\,").replace(/%/g, "\\%").replace(/'/g, "'\\''");
 }
-function clipCutVideoFilter(options) {
+function brandDrawtext(options) {
+  const value = escapeDrawtextValue(options.text);
+  const font = options.fontFile ? `:fontfile='${options.fontFile}'` : "";
+  const border = options.borderw && options.borderw > 0 ? `:borderw=${options.borderw}:bordercolor=${CLIP_HALO_COLOR}` : "";
+  const enable = options.enable ? `:enable='${options.enable}'` : "";
+  return `drawtext=text='${value}'${font}:` + `fontcolor=${options.color}:fontsize=${options.size}:` + `x=${options.x}:y=${options.y}${border}${enable}`;
+}
+function resolveTitleLines(options, y) {
+  const inMs = options.inMs ?? 0;
+  const outMs = options.outMs ?? 0;
+  const clipDur = Math.max(0, (outMs - inMs) / 1000);
+  const base = { fontFile: options.sansFontFile, size: CLIP_TITLE_SIZE, x: CLIP_MARGIN_X, y };
+  const resolved = options.members && options.members.length > 0 ? resolveClipTracks({
+    inMs,
+    members: options.members,
+    outMs,
+    setDurationMs: options.setDurationMs ?? 0
+  }) : [];
+  if (resolved.length === 0) {
+    return [{ ...base, text: options.title }];
+  }
+  const clamp = (seconds) => Math.min(Math.max(seconds, 0), clipDur);
+  return resolved.map((track, index) => {
+    const relStart = clamp((track.startMs - inMs) / 1000);
+    const next = resolved[index + 1];
+    const relEnd = next ? clamp((next.startMs - inMs) / 1000) : clipDur;
+    return {
+      ...base,
+      enable: `between(t,${relStart.toFixed(3)},${relEnd.toFixed(3)})`,
+      text: track.label
+    };
+  });
+}
+function clipCutFilterComplex(options) {
   const xOffset = Math.max(0, Math.round(options.xOffset));
   const crop = `crop=ih*9/16:ih:${xOffset}:0,scale=${CLIP_WIDTH}:${CLIP_HEIGHT}`;
-  const font = options.fontFile ? `:fontfile='${options.fontFile}'` : "";
-  const title = escapeDrawtextValue(options.title);
-  const coordinate2 = escapeDrawtextValue(`fluncle://${options.logId}`);
-  const titleDraw = `drawtext=text='${title}'${font}:fontcolor=white:fontsize=46:` + `x=56:y=h-208:box=1:boxcolor=black@0.55:boxborderw=18`;
-  const coordinateDraw = `drawtext=text='${coordinate2}'${font}:fontcolor=0xF4EAD7:fontsize=30:` + `x=56:y=h-132:box=1:boxcolor=black@0.55:boxborderw=12`;
-  return `${crop},${titleDraw},${coordinateDraw}`;
+  const coordinateBox = Math.round(CLIP_COORDINATE_SIZE * 1.18);
+  const titleBottomOffset = CLIP_SAFE_BOTTOM + coordinateBox + CLIP_LINE_GAP;
+  const titleY = `h-${titleBottomOffset}-th`;
+  const titleLines = resolveTitleLines(options, titleY);
+  const coordinate2 = {
+    fontFile: options.oxaniumFontFile,
+    size: CLIP_COORDINATE_SIZE,
+    text: `fluncle://${options.logId}`,
+    x: CLIP_MARGIN_X,
+    y: `h-${CLIP_SAFE_BOTTOM}-th`
+  };
+  const haloGlyphs = [
+    ...titleLines.map((line) => brandDrawtext({ ...line, color: CLIP_HALO_COLOR })),
+    brandDrawtext({ ...coordinate2, color: CLIP_HALO_COLOR })
+  ].join(",");
+  const sharpGlyphs = [
+    ...titleLines.map((line) => brandDrawtext({ ...line, borderw: CLIP_SHARP_BORDERW, color: CLIP_TITLE_COLOR })),
+    brandDrawtext({ ...coordinate2, borderw: CLIP_SHARP_BORDERW, color: CLIP_COORDINATE_COLOR })
+  ].join(",");
+  return [
+    `[0:v]${crop},setsar=1[base]`,
+    `color=c=black@0:s=${CLIP_WIDTH}x${CLIP_HEIGHT},format=rgba,${haloGlyphs}[ink]`,
+    `[ink]split[ink1][ink2]`,
+    `[ink1]gblur=sigma=${CLIP_HALO_CORE_SIGMA}[core]`,
+    `[ink2]gblur=sigma=${CLIP_HALO_FEATHER_SIGMA}[feather]`,
+    `[base][feather]overlay=0:0[b1]`,
+    `[b1][core]overlay=0:0[b2]`,
+    `[b2]${sharpGlyphs}[out]`
+  ].join(";");
 }
 function clipCutFfmpegArgs(options) {
   const inSeconds = (options.inMs / 1000).toFixed(3);
   const durationSeconds = ((options.outMs - options.inMs) / 1000).toFixed(3);
-  const filter = clipCutVideoFilter(options);
+  const filter = clipCutFilterComplex(options);
   return [
     "-y",
     "-ss",
@@ -4024,8 +4129,12 @@ function clipCutFfmpegArgs(options) {
     options.setUrl,
     "-t",
     durationSeconds,
-    "-vf",
+    "-filter_complex",
     filter,
+    "-map",
+    "[out]",
+    "-map",
+    "0:a?",
     "-c:v",
     "libx264",
     "-preset",
@@ -4079,11 +4188,14 @@ async function clipCutCommand(clipId, onProgress = () => {}) {
   try {
     onProgress(`Clip ${clipId}: cutting [${clip.inMs}–${clip.outMs}ms] from ${mixtape.logId}…`);
     await runClipCut({
-      fontFile: process.env.CLIP_FONT_FILE,
       inMs: clip.inMs,
       logId: mixtape.logId,
+      members: mixtape.members,
       outMs: clip.outMs,
       outputPath,
+      oxaniumFontFile: resolveClipFontFile(),
+      sansFontFile: resolveClipSansFontFile(),
+      setDurationMs: mixtape.durationMs ?? 0,
       setUrl,
       title: mixtape.title,
       xOffset: clip.xOffset
@@ -4144,8 +4256,9 @@ async function runClipCut(options) {
     throw new CliError2("ffmpeg_failed", `ffmpeg failed to cut the clip${detail ? `: ${detail}` : ""}`);
   }
 }
-var FOUND_BASE3 = "https://found.fluncle.com", CLIP_WIDTH = 1080, CLIP_HEIGHT = 1920, CLIP_CRF = 21, CLIP_MAXRATE = "10M", CLIP_BUFSIZE = "20M", CLIP_AUDIO_BITRATE = "192k", MAX_CLIP_BYTES;
+var FOUND_BASE3 = "https://found.fluncle.com", CLIP_WIDTH = 1080, CLIP_HEIGHT = 1920, CLIP_CRF = 21, CLIP_MAXRATE = "10M", CLIP_BUFSIZE = "20M", CLIP_AUDIO_BITRATE = "192k", MAX_CLIP_BYTES, CLIP_TITLE_COLOR = "0xf4ead7", CLIP_COORDINATE_COLOR = "0xb7ab95", CLIP_HALO_COLOR = "0x090a0b", CLIP_HALO_CORE_SIGMA = 3, CLIP_HALO_FEATHER_SIGMA = 9, CLIP_SHARP_BORDERW = 1, CLIP_MARGIN_X = 96, CLIP_SAFE_BOTTOM = 230, CLIP_LINE_GAP = 10, CLIP_TITLE_SIZE = 40, CLIP_COORDINATE_SIZE = 22, BOX_CLIP_FONT_FILE = "/opt/fonts/Oxanium-SemiBold.ttf", BOX_CLIP_SANS_FONT_FILE = "/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf";
 var init_clips = __esm(() => {
+  init_util();
   init_api();
   init_output();
   MAX_CLIP_BYTES = 100 * 1024 * 1024;
@@ -4160,7 +4273,7 @@ __export(exports_newsletter, {
   newsletterDraftCommand: () => newsletterDraftCommand,
   newsletterDeleteCommand: () => newsletterDeleteCommand
 });
-import { existsSync as existsSync4, readFileSync as readFileSync4 } from "node:fs";
+import { existsSync as existsSync5, readFileSync as readFileSync4 } from "node:fs";
 function buildBody3(options, { requireContent }) {
   const body = {};
   if (options.contentFile !== undefined) {
@@ -4180,7 +4293,7 @@ function buildBody3(options, { requireContent }) {
   return body;
 }
 function readContentFile(filePath) {
-  if (!existsSync4(filePath)) {
+  if (!existsSync5(filePath)) {
     throw new CliError2("file_not_found", `Content file not found: ${filePath}`);
   }
   const text = readFileSync4(filePath, "utf-8");
@@ -4822,7 +4935,7 @@ var init_format2 = __esm(() => {
 });
 
 // src/cli.ts
-import { existsSync as existsSync5, readFileSync as readFileSync5 } from "fs";
+import { existsSync as existsSync6, readFileSync as readFileSync5 } from "fs";
 import path2 from "path";
 
 // ../../node_modules/commander/lib/error.js
@@ -7499,7 +7612,7 @@ async function runTrackVideo(idOrLogId, options, trackVideoCommand2) {
       return;
     }
     const candidate = path2.join(dir, name);
-    return existsSync5(candidate) ? candidate : undefined;
+    return existsSync6(candidate) ? candidate : undefined;
   };
   const resolveFile = (explicit, name) => {
     if (explicit) {

package/package.json

@@ -31,5 +31,5 @@
     "url": "git+https://github.com/mauricekleine/fluncle.git"
   },
   "type": "module",
-  "version": "0.74.0"
+  "version": "0.76.0"
 }