worklog: Task 40 — v7.13 merge of the parallel v7.12 line into the OVE-Directory build
This commit is contained in:
Z User
parent
b161685026
commit
05d2c626ca
1 changed files with 36 additions and 0 deletions
36
worklog.md
36
worklog.md
|
|
@ -2292,3 +2292,39 @@ BROWSER E2E (agent-browser + pixel measurement + VLM, ALL PASS):
|
||||||
|
|
||||||
Stage Summary:
|
Stage Summary:
|
||||||
- v7.12 shipped: scripts can move the whole picture — bgrot spins, bgx/bgy slide, bgzoom draws in / blows out — with the speed riding the music exactly the way the classic AVS plugins did it (beatage envelopes drive the rate, [beat] flips the spin on hard hits, persist keeps the fade slow so colors blend). The eleventh Zai-Magic preset "osc-rotations" demonstrates the full recipe: a stationary centered oscilloscope with mirror-symmetric color (left/right shift together, center holds its own hue) over a beat-accelerated, hard-hit-flipping rotating background.
|
- v7.12 shipped: scripts can move the whole picture — bgrot spins, bgx/bgy slide, bgzoom draws in / blows out — with the speed riding the music exactly the way the classic AVS plugins did it (beatage envelopes drive the rate, [beat] flips the spin on hard hits, persist keeps the fade slow so colors blend). The eleventh Zai-Magic preset "osc-rotations" demonstrates the full recipe: a stationary centered oscilloscope with mirror-symmetric color (left/right shift together, center holds its own hue) over a beat-accelerated, hard-hit-flipping rotating background.
|
||||||
|
|
||||||
|
---
|
||||||
|
Task ID: 40
|
||||||
|
Agent: main (Z.ai Code)
|
||||||
|
Task: v7.13 (user request): merge the two parallel development lines. The user supplied the v7.12 build ("updated script editor variables and the osc-rotations preset") as an encrypted zip on Google Drive (password: z.ai) and asked to compare it with this tree's "Upload to OVE-Directory" version (v7.11) and merge the improvements into one build.
|
||||||
|
|
||||||
|
MERGE ARCHAEOLOGY:
|
||||||
|
- The Drive zip (openvisengine.zip, 374 MB, AES-encrypted, compression type 99 — Python zipfile can't read it; pyzipper could) extracted to /home/z/drive-712/v712-full: APP_VERSION 7.12, worklog Tasks 37-39 (v7.10.1 spectrum fix, v7.11 wake lock/respectful-Demo/one-click-Save, v7.12 bg movement + osc-rotations). The partial ove-src12/ extraction from the earlier session verified identical (114/115 sha256; the one mismatch was a Drive-fetch artifact named "globals.css CSS").
|
||||||
|
- Divergence map via the zip's own .git: BOTH repos share commit d59d398 (tree 953bae5... — IDENTICAL hash on both sides, a true common ancestor at v7.10). After it: this tree shipped v7.11 = the OVE-Directory (directory-tab.tsx, upload-dialog.tsx, /api/ove-directory proxy, lib/ove-directory.ts); the zip tree shipped 7.10.1 + 7.11-wake-lock + 7.12. The ONLY overlapping files were script-tab.tsx, version.ts, release-notes.ts (+ demo-track binaries, identical on both sides).
|
||||||
|
|
||||||
|
Work Log:
|
||||||
|
- Git 3-way merge: zip repo fetched as remote v712, `git merge 1ea335a` — everything auto-merged (engine.ts applyBackground + bgrot/bgx/bgy/bgzoom, audio.ts SPEC_TOP_HZ 16 kHz cap, rust-agent/spectrum.rs mirror, embedded-presets.ts osc-rotations + EMBEDDED_SEED_VERSION 7.12, wake-lock.ts NEW, audio-source.ts + page.tsx manualChoice/respectful-Demo, presets-tab.tsx, share-dialogs.tsx, store.ts markManualChoice, help-panel.tsx bg* rows + sv span) except three conflicts.
|
||||||
|
- script-tab.tsx (hand-merged): both sides' state blocks kept side by side — ours' uploadOpen/canUpload (Upload to OVE-Directory, gated on ✔ Compiled OK + no runtime error) + theirs' pendingName/rename* states (one-click Save + "Give This Preset a Name"); toolbar now carries the dual Save (target save / one-click new) AND the Upload button; Hash⇢Script import sets pendingName + clears editTarget + markManualChoice; UploadToDirectoryDialog mounted. Verified byte-lossless: diff vs the v7.12 original removes ONLY comment lines (theirs' code 100% intact; ours' upload code added).
|
||||||
|
- version.ts + release-notes.ts (hand-merged into ONE timeline): NEW 7.13 entry ("one build, every feature") on top, then 7.12 (bg movement + osc-rotations), 7.11 (the OVE-Directory), 7.10.2 (the parallel line's wake-lock/respectful-Demo/one-click-Save release — RENUMBERED from its original 7.11 so the list reads monotonically; noted in the 7.13 text), 7.10.1 (spectrum edge), 7.10 and below untouched. APP_VERSION = '7.13'. Drift guard green.
|
||||||
|
- engine.ts / audio.ts / embedded-presets.ts / wake-lock.ts / help-panel.tsx / audio-source.ts verified BYTE-IDENTICAL to the validated v7.12 originals (cmp) — the parallel line's E2E-proven behavior carries over by construction.
|
||||||
|
|
||||||
|
ENVIRONMENT RECOVERY (sandbox quirks, not code):
|
||||||
|
- The merge swapped db/custom.db underneath the running server → Prisma "readonly database" (dead inode); fixed by restart.
|
||||||
|
- Turbopack's persistent cache panicked twice ("Failed to restore task data — corrupted database") after file replacements/kills; fixed with rm -rf .next + clean start.
|
||||||
|
- Directly-spawned background servers were reaped when the Bash session ended; the stable path is the system's own .zscripts/dev.sh (disowned bun run dev). Server now up: / 200, /api/presets 200, /api/ove-directory/* 200.
|
||||||
|
- EMBEDDED_SEED_VERSION gate fired on first hit (7.10 -> 7.12): DB re-seeded to 106 presets incl. osc-rotations (verified in SQLite: seed=7.12, count=106, osc-rotations=1).
|
||||||
|
|
||||||
|
E2E (agent-browser + pixel measurement + VLM, ALL PASS):
|
||||||
|
- Fresh boot: title "OVE -- Open Visualization Engine (v7.13)"; tree root/embedded 106 = Amp Picks 66 + Dynamics 9 + Envision 15 + Synth-C 5 + Zai-Magic 11; osc-rotations sorts last in Zai-Magic as designed.
|
||||||
|
- osc-rotations live on Demo Track (dblclick-load via the treeitem's inner button): footer "SRC: DEMO · Demo Track · FPS 59-60 · PTS 512 · BPM 139.9 locked · SCRIPT: osc-rotations". Two frames 1.2 s apart: 20% of sampled pixels changed (animating). Zone means: mid-band 69.7/255 (the scope) vs corners 3.3-13.8/255 — outer-zone content can ONLY be rotation-carried (the line is confined to the middle), i.e. applyBackground is rotating the picture in the merged build.
|
||||||
|
- VLM on the clean capture: (1) bright horizontal oscillating waveform at the vertical center ✓; (2) colorful smeared trail masses at corners/edges "consistent with a rotating background layer smearing trails around the stationary center waveform" ✓; (3) mirror-symmetric hues — yellow/gold at BOTH extremes, warm pink/magenta in the middle ✓; (4) no UI defects ✓.
|
||||||
|
- Script tab: Apply / Save / Script⇢Hash / Hash⇢Script / Upload to OVE-Directory / New / Help ALL present; with a compiling script both Save and Upload enabled (upload title carries the publish/fix-then-apply guidance); Upload dialog opens with the share-string description.
|
||||||
|
- One-click Save flow: New (template) -> strip the name header -> Save -> saved as "Empty Name" -> "Give This Preset a Name" dialog opened automatically -> renamed to "Merge Test v713" -> "Preset renamed" toast; test preset removed from localStorage afterwards.
|
||||||
|
- Directory tab: live listing via the proxy (1 script, sort controls, "Spectrum Bars · LINES · Average: 4.5 · 2 votes", Get button).
|
||||||
|
- Help panel: bgrot / bgx / bgy / bgzoom rows + example formulas all present.
|
||||||
|
- What's New dialog: 7.13 "One build, every feature" FIRST with CURRENT badge; 7.12, 7.10.2 in the merged timeline; drift guard silent.
|
||||||
|
- Responsive: 375x812 no horizontal overflow (scrollWidth 375 = clientWidth), footer pushed to document end (docH 1651); 1280x800 footer sticks to viewport bottom (800 = 800).
|
||||||
|
- Console: 0 errors, 0 warnings (wake lock degrades silently in headless — no navigator.wakeLock); dev.log 0 errors. Test-browser localStorage cleaned afterwards.
|
||||||
|
|
||||||
|
Stage Summary:
|
||||||
|
- v7.13 shipped: the parallel line is merged — the spectrum 16 kHz cap, the screen wake lock, the respectful Demo button, the one-click Save with auto-naming + rename dialog, the AVS-style background movement family (bgrot/bgx/bgy/bgzoom) and the eleventh Zai-Magic preset "osc-rotations" all run in the same build as the community OVE-Directory, with one clean version timeline (the parallel wake-lock release folded in as 7.10.2). Only three files needed hand-merging; every engine-side change is byte-identical to its validated original.
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue