@glissade/cli 0.39.0-pre.0 → 0.39.0-pre.1

package/dist/audioMix.js

@@ -13,6 +13,7 @@ var audioMix_exports = /* @__PURE__ */ __exportAll({
 	applyMixGainDb: () => applyMixGainDb,
 	atempoChain: () => atempoChain,
 	gainExpression: () => gainExpression,
+	loudnessFilterNodes: () => loudnessFilterNodes,
 	planAudioMix: () => planAudioMix,
 	resolveAssetPath: () => resolveAssetPath
 });
@@ -61,27 +62,50 @@ function atempoChain(rate) {
 	if (Math.abs(r - 1) > 1e-9 || chain.length === 0) chain.push(`atempo=${r}`);
 	return chain;
 }
+/** The mix sample rate the limiter oversamples around (glissade mixes at 48 kHz). */
+const MIX_RATE = 48e3;
+/** 4× oversampling for the true-peak limiter — reconstructs inter-sample peaks. */
+const TP_OVERSAMPLE = MIX_RATE * 4;
 /**
-* Append the publish-loudness stage to a mix's `-filter_complex`: the graph's
-* final `[aout]` label is renamed and a `volume=<gain>dB` node (plus, for a
-* `gs master` measurement, an `alimiter` holding the true peak at `ceilingDb`)
-* feeds the new `[aout]`. The gain is a single multiply on the FINAL mix node —
-* NOT a second ffmpeg pass — bit-deterministic + golden-hashable. A gain of
-* exactly 0 dB with NO limiter is a no-op (returned unchanged) so an at-target
-* source preserves the prior, un-gained bytes. The limiter is the ONLY non-linear
-* stage; it's baked from committed params so it stays deterministic.
+* True-peak guard (dB): the sample-peak limit is set this far BELOW the ceiling so
+* the downsample-reconstructed TRUE peak lands under `ceilingDb`. Empirically the
+* 4× oversample→limit→downsample residue is ~0.5 dB on worst-case (clipped-noise)
+* content; 0.8 gives a comfortable margin (worst case measured −1.31 dBTP for a −1
+* ceiling) without over-attenuating real beds. WITHOUT the oversample, `alimiter`
+* is a SAMPLE-peak brickwall that leaves the true peak clipping over the ceiling
+* (the 0.39.0-pre.0 defect — mode:'truepeak' didn't hold dBTP).
 */
-function applyMixGainDb(filterComplex, gainDb, limiter) {
-	const chain = [];
-	if (gainDb !== 0) chain.push(`volume=${gainDb}dB`);
+const TP_GUARD_DB = .8;
+/**
+* The publish-loudness filter nodes: a `volume=<gain>dB` multiply, and — for a
+* `gs master` measurement — a REAL true-peak limiter (oversample 4× → `alimiter`
+* at `ceilingDb − guard` → downsample) that actually holds the inter-sample /
+* true peak under `ceilingDb`. Shared by the render `filter_complex` apply and the
+* `gs master` verify pass so the committed limiter and the rendered output are the
+* identical deterministic chain. Empty (a no-op) at 0 dB with no limiter.
+*/
+function loudnessFilterNodes(gainDb, limiter) {
+	const nodes = [];
+	if (gainDb !== 0) nodes.push(`volume=${gainDb}dB`);
 	if (limiter) {
-		const limit = Math.pow(10, limiter.ceilingDb / 20).toFixed(6);
-		chain.push(`alimiter=limit=${limit}:level=disabled`);
+		const limit = Math.pow(10, (limiter.ceilingDb - TP_GUARD_DB) / 20).toFixed(6);
+		nodes.push(`aresample=${TP_OVERSAMPLE}`, `alimiter=limit=${limit}:level=disabled`, `aresample=${MIX_RATE}`);
 	}
-	if (chain.length === 0) return filterComplex;
+	return nodes;
+}
+/**
+* Append the publish-loudness stage to a mix's `-filter_complex`: the graph's
+* final `[aout]` label is renamed and the {@link loudnessFilterNodes} (gain +,
+* for a master, the true-peak limiter) feed the new `[aout]`. Bit-deterministic +
+* golden-hashable. A 0 dB gain with NO limiter is a no-op (returned unchanged) so
+* an at-target source preserves the prior, un-gained bytes.
+*/
+function applyMixGainDb(filterComplex, gainDb, limiter) {
+	const nodes = loudnessFilterNodes(gainDb, limiter);
+	if (nodes.length === 0) return filterComplex;
 	const at = filterComplex.lastIndexOf("[aout]");
 	if (at < 0) throw new AudioMixError("mix filter graph has no [aout] to apply the loudness gain to");
-	return `${filterComplex.slice(0, at) + "[apreg]" + filterComplex.slice(at + 6)};[apreg]${chain.join(",")}[aout]`;
+	return `${filterComplex.slice(0, at) + "[apreg]" + filterComplex.slice(at + 6)};[apreg]${nodes.join(",")}[aout]`;
 }
 /** Build the FFmpeg mix plan for clips that intersect [0, duration]. */
 function planAudioMix(clips, modulePath, duration) {

package/dist/index.d.ts

@@ -633,8 +633,12 @@ declare function planMaster(measures: readonly MemberMeasure[], profile: Publish
   limiter: MasterLimiter | null;
   consistency: 'shared-target' | 'per-asset';
 }): MasterPlan;
-/** The `-af` chain that applies a master's gain + (optional) limiter to a WAV. */
-declare function masterAfChain(gainDb: number, limiter: CommittedLimiter | null): string;
+/**
+ * The `-af` chain that applies a master's gain + (optional) TRUE-peak limiter to a
+ * WAV — the SAME {@link loudnessFilterNodes} the render `filter_complex` applies,
+ * so the `gs master` verify pass measures exactly what a render will produce.
+ */
+declare function masterAfChain(gainDb: number, limiter: CommittedLimiter | null): Promise<string>;
 interface MasterMemberResult {
   readonly id: string;
   readonly loudnessPath: string;
@@ -772,15 +776,21 @@ interface AudioMixPlan {
   filterComplex: string;
   hasEasedGain: boolean;
 }
+/**
+ * The publish-loudness filter nodes: a `volume=<gain>dB` multiply, and — for a
+ * `gs master` measurement — a REAL true-peak limiter (oversample 4× → `alimiter`
+ * at `ceilingDb − guard` → downsample) that actually holds the inter-sample /
+ * true peak under `ceilingDb`. Shared by the render `filter_complex` apply and the
+ * `gs master` verify pass so the committed limiter and the rendered output are the
+ * identical deterministic chain. Empty (a no-op) at 0 dB with no limiter.
+ */
+
 /**
  * Append the publish-loudness stage to a mix's `-filter_complex`: the graph's
- * final `[aout]` label is renamed and a `volume=<gain>dB` node (plus, for a
- * `gs master` measurement, an `alimiter` holding the true peak at `ceilingDb`)
- * feeds the new `[aout]`. The gain is a single multiply on the FINAL mix node —
- * NOT a second ffmpeg pass — bit-deterministic + golden-hashable. A gain of
- * exactly 0 dB with NO limiter is a no-op (returned unchanged) so an at-target
- * source preserves the prior, un-gained bytes. The limiter is the ONLY non-linear
- * stage; it's baked from committed params so it stays deterministic.
+ * final `[aout]` label is renamed and the {@link loudnessFilterNodes} (gain +,
+ * for a master, the true-peak limiter) feed the new `[aout]`. Bit-deterministic +
+ * golden-hashable. A 0 dB gain with NO limiter is a no-op (returned unchanged) so
+ * an at-target source preserves the prior, un-gained bytes.
  */
 declare function applyMixGainDb(filterComplex: string, gainDb: number, limiter?: {
   readonly ceilingDb: number;

package/dist/master.js

@@ -90,12 +90,15 @@ function planMaster(measures, profile, opts) {
 function round2(n) {
 	return Math.round(n * 100) / 100;
 }
-/** The `-af` chain that applies a master's gain + (optional) limiter to a WAV. */
-function masterAfChain(gainDb, limiter) {
-	const chain = [];
-	if (gainDb !== 0) chain.push(`volume=${gainDb}dB`);
-	if (limiter) chain.push(`alimiter=limit=${Math.pow(10, limiter.ceilingDb / 20).toFixed(6)}:level=disabled`);
-	return chain.length ? chain.join(",") : "anull";
+/**
+* The `-af` chain that applies a master's gain + (optional) TRUE-peak limiter to a
+* WAV — the SAME {@link loudnessFilterNodes} the render `filter_complex` applies,
+* so the `gs master` verify pass measures exactly what a render will produce.
+*/
+async function masterAfChain(gainDb, limiter) {
+	const { loudnessFilterNodes } = await import("./audioMix.js").then((n) => n.i);
+	const nodes = loudnessFilterNodes(gainDb, limiter ?? void 0);
+	return nodes.length ? nodes.join(",") : "anull";
 }
 /**
 * `gs master <glissade.master.json>` — measure every member, plan the shared
@@ -154,7 +157,7 @@ async function masterCommand(opts) {
 			const meas = measured[i];
 			const p = plan.members[i];
 			const outWav = join(tmp, `${i}.out.wav`);
-			const af = masterAfChain(p.gain, committedLimiter);
+			const af = await masterAfChain(p.gain, committedLimiter);
 			const r = spawnSync("ffmpeg", [
 				"-hide_banner",
 				"-nostats",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glissade/cli",
-  "version": "0.39.0-pre.0",
+  "version": "0.39.0-pre.1",
   "description": "glissade CLI: headless rendering via backend-skia (+ FFmpeg mux).",
   "license": "Apache-2.0",
   "engines": {
@@ -28,15 +28,15 @@
     "@napi-rs/canvas": "^0.1.65",
     "esbuild": "0.28.0",
     "jiti": "^2.4.2",
-    "@glissade/backend-skia": "0.39.0-pre.0",
-    "@glissade/core": "0.39.0-pre.0",
-    "@glissade/interact": "0.39.0-pre.0",
-    "@glissade/lottie": "0.39.0-pre.0",
-    "@glissade/narrate": "0.39.0-pre.0",
-    "@glissade/player": "0.39.0-pre.0",
-    "@glissade/scene": "0.39.0-pre.0",
-    "@glissade/sfx": "0.39.0-pre.0",
-    "@glissade/svg": "0.39.0-pre.0"
+    "@glissade/backend-skia": "0.39.0-pre.1",
+    "@glissade/core": "0.39.0-pre.1",
+    "@glissade/interact": "0.39.0-pre.1",
+    "@glissade/lottie": "0.39.0-pre.1",
+    "@glissade/narrate": "0.39.0-pre.1",
+    "@glissade/player": "0.39.0-pre.1",
+    "@glissade/scene": "0.39.0-pre.1",
+    "@glissade/sfx": "0.39.0-pre.1",
+    "@glissade/svg": "0.39.0-pre.1"
   },
   "repository": {
     "type": "git",