Skip to content

Commit d7653ee

Browse files
vanceingallsclaude
andcommitted
fix(engine,producer): review fixes — PSC intent, verify-threshold clamp, fail-closed canaries
Addresses miguel-heygen's review on #1998: - Page-side compositing restore preserves explicit caller intent (blocker): resolveConfig now records pageSideCompositingAutoDisabled only when IT turned page-side compositing off because drawElement was on; the compile-time drawElement gates restore page-side compositing only when that flag is set. An explicit enablePageSideCompositing:false from the programmatic API or HF_PAGE_SIDE_COMPOSITING=false stays off. Pinned by two config tests. - HF_DE_VERIFY_MIN_DB clamped to [10, 60] with a warning on out-of-range values: below ~10dB the check passes severe damage; above ~60dB natural encoder differences force a screenshot fallback on every verified render. - de-canary-suite.sh + de-gatecheck.sh run under set -euo pipefail with explicit `|| true` on expected-nonzero commands (render exits handled by the suite's own checks, grep no-match, kill/pkill/wait races) and a hard FAIL when the PSNR compare produces no value — release canaries fail closed. Full suite re-run green (7/7) under the new flags. Co-Authored-By: Claude Fable 5 <[email protected]>
1 parent d7fdf03 commit d7653ee

6 files changed

Lines changed: 55 additions & 17 deletions

File tree

‎packages/engine/src/config.test.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,15 @@ describe("resolveConfig", () => {
279279
const config = resolveConfig({ useDrawElement: true, enablePageSideCompositing: true });
280280
expect(config.useDrawElement).toBe(true);
281281
expect(config.enablePageSideCompositing).toBe(false);
282+
// The auto-disable is recorded so compile-time gates can restore it.
283+
expect(config.pageSideCompositingAutoDisabled).toBe(true);
284+
});
285+
286+
it("does NOT mark auto-disabled when the caller explicitly opted out of page-side compositing", () => {
287+
const config = resolveConfig({ useDrawElement: true, enablePageSideCompositing: false });
288+
expect(config.enablePageSideCompositing).toBe(false);
289+
// Explicit caller intent — a compile-time drawElement gate must not restore it.
290+
expect(config.pageSideCompositingAutoDisabled).not.toBe(true);
282291
});
283292

284293
it("leaves page-side compositing on when fast capture is off", () => {

‎packages/engine/src/config.ts‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,13 @@ export interface EngineConfig {
8181
* true. Kill switch: `HF_DE_WORKER_ENCODE=false`.
8282
*/
8383
enableDrawElementWorkerEncode: boolean;
84+
/**
85+
* INTERNAL. Set by resolveConfig when it disabled enablePageSideCompositing
86+
* solely because drawElement was on. Lets the producer's compile-time gates
87+
* restore page-side compositing without overriding an explicit caller/env
88+
* opt-out. Not intended to be set by callers.
89+
*/
90+
pageSideCompositingAutoDisabled?: boolean;
8491
/**
8592
* Low-memory render profile. When `true`, the orchestrator collapses the
8693
* pipeline to its cheapest shape on memory-constrained hosts: it skips the
@@ -554,8 +561,13 @@ export function resolveConfig(overrides?: Partial<EngineConfig>): EngineConfig {
554561
// transitions fall back to the Node-side layered blend rather than silently
555562
// dropping. This keeps the flag self-consistent and avoids a per-session
556563
// incompatibility warning on every fast-capture render.
557-
if (merged.useDrawElement) {
564+
if (merged.useDrawElement && merged.enablePageSideCompositing) {
558565
merged.enablePageSideCompositing = false;
566+
// Record that THIS resolution (not the caller) turned page-side
567+
// compositing off, so a later compile-time drawElement gate can restore
568+
// it without clobbering an explicit enablePageSideCompositing:false from
569+
// the programmatic API or HF_PAGE_SIDE_COMPOSITING=false.
570+
merged.pageSideCompositingAutoDisabled = true;
559571
}
560572

561573
return {

‎packages/producer/de-canary-suite.sh‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# diverting them IS the pass condition)
1010
# any — either outcome passes (known-flaky DE damage: fallback ~2/3 of runs)
1111
# Exit nonzero on any FAIL. Usage: COMP_ROOT=/tmp/cc-all bash de-canary-suite.sh
12-
set -u
12+
set -euo pipefail
1313
cd "$(dirname "$0")"
1414
ROOT="${COMP_ROOT:-/tmp/cc-all}"
1515
OUT="${1:-/tmp/de-canary-suite}"
@@ -35,7 +35,7 @@ echo "$CANARIES" | grep -v '^\s*$' | while read -r pre expect _; do
3535
dir=$(find "$ROOT/" -maxdepth 1 -type d -name "${pre}*" | head -1)
3636
if [ -z "$dir" ]; then echo "FAIL $pre: comp not found under $ROOT"; exit 1; fi
3737
log="$OUT/$pre.log"
38-
env $DE_ENV BUN_RUNTIME_TRANSPILER_CACHE_PATH=0 bun we-render.mjs "$dir" "$OUT/$pre-de.mp4" </dev/null >"$log" 2>&1
38+
env $DE_ENV BUN_RUNTIME_TRANSPILER_CACHE_PATH=0 bun we-render.mjs "$dir" "$OUT/$pre-de.mp4" </dev/null >"$log" 2>&1 || true
3939
if ! grep -q "RENDER_OK" "$log"; then echo "FAIL $pre: render did not complete (see $log)"; exit 1; fi
4040
if grep -q "re-rendering via screenshot" "$log"; then verdict=fallback; else verdict=clean; fi
4141
case "$expect" in
@@ -48,10 +48,11 @@ echo "$CANARIES" | grep -v '^\s*$' | while read -r pre expect _; do
4848
# DE-vs-screenshot agreement is marginal/intermittent — the check would fail
4949
# on their intrinsic divergence, not on a regression.
5050
if [ "$verdict" = clean ] && [ "$expect" != any ]; then
51-
env $SS_ENV BUN_RUNTIME_TRANSPILER_CACHE_PATH=0 bun we-render.mjs "$dir" "$OUT/$pre-ss.mp4" </dev/null >"$OUT/$pre-ss.log" 2>&1
51+
env $SS_ENV BUN_RUNTIME_TRANSPILER_CACHE_PATH=0 bun we-render.mjs "$dir" "$OUT/$pre-ss.mp4" </dev/null >"$OUT/$pre-ss.log" 2>&1 || true
5252
if ! grep -q "RENDER_OK" "$OUT/$pre-ss.log"; then echo "FAIL $pre: screenshot arm failed"; exit 1; fi
5353
db=$(ffmpeg -nostdin -hide_banner -i "$OUT/$pre-de.mp4" -i "$OUT/$pre-ss.mp4" -lavfi psnr -f null - 2>&1 \
54-
| grep -oE "average:(inf|[0-9.]+)" | head -1 | cut -d: -f2)
54+
| grep -oE "average:(inf|[0-9.]+)" | head -1 | cut -d: -f2 || true)
55+
if [ -z "$db" ]; then echo "FAIL $pre: PSNR compare produced no value"; exit 1; fi
5556
if [ "$db" != "inf" ] && awk -v d="$db" -v m="$MIN_DB" 'BEGIN{exit !(d<m)}'; then
5657
echo "FAIL $pre: DE-vs-screenshot ${db}dB < ${MIN_DB}dB"; exit 1
5758
fi

‎packages/producer/de-gatecheck.sh‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# ("drawElement canvas injected" OR "falling back to ... — <reason>"), so launch the fast
44
# render, wait for that line, kill before frames render. Writes /tmp/gatecheck/<pre>.txt.
55
# Resumable. PAR workers. Usage: PAR=4 bash de-gatecheck.sh
6-
set -u
6+
set -euo pipefail
77
cd "$(dirname "$0")"
88
OUT=/tmp/gatecheck; mkdir -p "$OUT"
99
PAR=${PAR:-4}
@@ -13,7 +13,7 @@ export GPU OUT CAP
1313
worker(){
1414
local pre=$1
1515
[ -f "$OUT/$pre.txt" ] && return
16-
local dir; dir=$(find /tmp/cc-all/ -maxdepth 1 -type d -name "${pre}*"|head -1)
16+
local dir; dir=$(find /tmp/cc-all/ -maxdepth 1 -type d -name "${pre}*" | head -1 || true)
1717
[ -z "$dir" ] && { echo "$pre NODIR" > "$OUT/$pre.txt"; return; }
1818
local log=/tmp/gc-$pre.log
1919
( eval "env $GPU bun we-render.mjs \"$dir\" /tmp/gc-$pre.mp4" >"$log" 2>&1 </dev/null ) & local p=$!
@@ -24,16 +24,18 @@ worker(){
2424
[ "$t" -ge "${CAP:-120}" ] && break
2525
done
2626
# kill the render tree (don't need full render)
27-
for c in $(pgrep -P "$p" 2>/dev/null); do kill -9 "$c" 2>/dev/null; done; kill -9 "$p" 2>/dev/null
28-
pkill -f "we-render.mjs $dir" 2>/dev/null; wait "$p" 2>/dev/null
27+
for c in $(pgrep -P "$p" 2>/dev/null || true); do kill -9 "$c" 2>/dev/null || true; done
28+
kill -9 "$p" 2>/dev/null || true
29+
pkill -f "we-render.mjs $dir" 2>/dev/null || true
30+
wait "$p" 2>/dev/null || true
2931
if grep -q "drawElement canvas injected" "$log" 2>/dev/null; then
3032
echo "$pre drawelement" > "$OUT/$pre.txt"
3133
else
32-
local reason; reason=$(grep -oE "falling back to (screenshot|beginframe) capture — [^(]*" "$log" | head -1 | sed -E 's/.*— //')
34+
local reason; reason=$(grep -oE "falling back to (screenshot|beginframe) capture — [^(]*" "$log" | head -1 | sed -E 's/.*— //' || true)
3335
# Compile-time gates (3D / mix-blend-mode) log a different shape than the
3436
# engine's init-time gates — "Fast capture: composition uses X — disabling".
3537
if [ -z "$reason" ]; then
36-
reason=$(grep -oE "Fast capture: composition uses [a-z0-9 -]*" "$log" | head -1 | sed -E 's/.*uses /compile:/')
38+
reason=$(grep -oE "Fast capture: composition uses [a-z0-9 -]*" "$log" | head -1 | sed -E 's/.*uses /compile:/' || true)
3739
fi
3840
# Compat-hint routing (raw rAF etc.): "fast capture: falling back to screenshot — render-mode ..."
3941
if [ -z "$reason" ] && grep -q "render-mode compatibility hint" "$log" 2>/dev/null; then
@@ -47,5 +49,5 @@ worker(){
4749
rm -f /tmp/gc-$pre.mp4 /tmp/gc-$pre.log
4850
}
4951
export -f worker
50-
awk '{print $1}' "$SAMPLE" | xargs -P "$PAR" -I{} bash -c 'worker "$@"' _ {}
52+
awk '{print $1}' "$SAMPLE" | xargs -P "$PAR" -I{} bash -c 'set -uo pipefail; worker "$@"' _ {} || true
5153
echo "GATECHECK_DONE ($(ls "$OUT"/*.txt 2>/dev/null | wc -l | tr -d ' ') comps)"

‎packages/producer/src/services/render/stages/captureStreamingStage.ts‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,20 @@ async function runWorkerEncodePipelineLoop(
199199
// agreement measures ≥45, damage <30) → verification error.
200200
// A DrawElementVerificationError propagates to the orchestrator, which
201201
// re-renders the whole job via the screenshot path (never-wrong fallback).
202+
// Clamp to a defensible band: below ~10dB even severe damage passes (the
203+
// check stops meaning anything); above ~60dB natural DE-vs-screenshot
204+
// encoder differences (~45dB+) would force a screenshot fallback on every
205+
// verified render. Out-of-range or malformed values fall back to 32.
202206
const verifyMinDbRaw = Number(process.env.HF_DE_VERIFY_MIN_DB ?? "32");
203-
const verifyMinDb = Number.isFinite(verifyMinDbRaw) ? verifyMinDbRaw : 32;
207+
const verifyMinDb =
208+
Number.isFinite(verifyMinDbRaw) && verifyMinDbRaw >= 10 && verifyMinDbRaw <= 60
209+
? verifyMinDbRaw
210+
: 32;
211+
if (process.env.HF_DE_VERIFY_MIN_DB !== undefined && verifyMinDb !== verifyMinDbRaw) {
212+
log.warn("[Render] HF_DE_VERIFY_MIN_DB out of range [10,60]; using 32", {
213+
raw: process.env.HF_DE_VERIFY_MIN_DB,
214+
});
215+
}
204216
const sizes: number[] = [];
205217
// Absolute floor lowers once a small frame proves deterministic (dark /
206218
// low-detail content), so a dark stretch doesn't re-capture every frame.

‎packages/producer/src/services/render/stages/compileStage.ts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,13 @@ export async function runCompileStage(input: CompileStageInput): Promise<Compile
208208
);
209209
}
210210
// Whenever a compile-time gate cleared useDrawElement, restore page-side
211-
// compositing to its configured value — resolveConfig turned it off on the
212-
// assumption drawElement would run, and leaving it off would silently push
213-
// shader transitions onto the slower Node-side blend.
214-
if (!cfg.useDrawElement && process.env.HF_PAGE_SIDE_COMPOSITING !== "false") {
211+
// compositing — but ONLY when resolveConfig auto-disabled it because
212+
// drawElement was going to run. An explicit enablePageSideCompositing:false
213+
// from the programmatic API or HF_PAGE_SIDE_COMPOSITING=false never had the
214+
// auto-disabled flag set and stays off.
215+
if (!cfg.useDrawElement && cfg.pageSideCompositingAutoDisabled) {
215216
cfg.enablePageSideCompositing = true;
217+
cfg.pageSideCompositingAutoDisabled = false;
216218
}
217219
const callerForced = cfg.forceScreenshot || (needsAlpha && !cfg.useDrawElement);
218220
const { forceScreenshot: hintForced } = applyRenderModeHints(callerForced, compiled, log);

0 commit comments

Comments
 (0)