From 67a0d80117bd8332d2768d093dff343001c87d60 Mon Sep 17 00:00:00 2001 From: ukr8b3g-cmyk Date: Wed, 26 Aug 2026 03:24:08 +0900 Subject: [PATCH] Release v3.5.3 maintenance hotfix --- AGENTS.md | 2 +- CHANGELOG.md | 8 +++ MANIFEST.sha256 | 35 +++++----- PACKAGE_INFO_JA.txt | 8 ++- PACKAGE_VALIDATION.txt | 6 +- PROJECT_STATE.md | 13 +++- README.md | 12 +++- README_JA.md | 12 +++- WORKLOG.md | 12 ++++ docs/images/v31b-auto-resume.png | Bin 12860 -> 23828 bytes .../workflows/MiniMax_H3_Continuum_V34.json | 5 +- .../MiniMax_H3_Continuum_V34_turbo.json | 5 +- .../workflows/MiniMax_H3_Continuum_V35.json | 5 +- ...ontinuum_V351_LBH_Conditioning_Bridge.json | 4 +- metadata.ini | 2 +- pyproject.toml | 2 +- reference.py | 26 ++++---- tests/test_public_workflow_integrity.py | 61 ++++++++++++++++++ tests/test_release_metadata.py | 2 +- tests/test_v217_stable_facade.py | 2 +- tests/test_v34_hybrid_reference.py | 21 ++++++ version.py | 2 +- 22 files changed, 184 insertions(+), 61 deletions(-) create mode 100644 tests/test_public_workflow_integrity.py diff --git a/AGENTS.md b/AGENTS.md index a970c95..2612cc7 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -1,7 +1,7 @@ # AGENTS.md ## Scope -MiniMax H3 Continuum V3.5.2 for ComfyUI. Treat V3.5.2 as the current public baseline; preserve V3.4 node IDs, public contracts, and saved-workflow loading without letting legacy controls change current behavior. +MiniMax H3 Continuum V3.5.3 for ComfyUI. Treat V3.5.3 as the current maintenance baseline; preserve V3.4 node IDs, public contracts, and saved-workflow loading without letting legacy controls change current behavior. ## Non-negotiable rules - Follow ComfyUI Core behavior for user-facing validation. Continuum-only prompt restrictions, model allowlists, compatibility gates, and policy-based execution stops are prohibited. diff --git a/CHANGELOG.md b/CHANGELOG.md index 162deba..196b1b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## 3.5.3 + +- Repaired the public Conditioning Bridge workflow's Width/Height input slots and added serialization-integrity checks for every published workflow. +- Removed stale orphan link IDs from the public V3.4, V3.4 Turbo, and V3.5 workflow files. +- Corrected Hybrid First/Last + Reference warning messages so public `` numbering remains absolute and matches the accepted runtime behavior. +- Losslessly re-encoded one unreferenced legacy PNG that strict image decoders could not read. +- Preserved all V3.5.2 generation, Sampling, Conditioning, Terminal Merge, Assembly, Seam, Run Storage, Prompt/CLIP cache, Video Guide optimization, and V3.4 compatibility contracts. + ## 3.5.2 - Added a conservative V3.5-only Prompt/CLIP cross-run LRU cache for unchanged T2VA, I2VA, and FL2VA conditioning. Reference, scheduled, tokenizer-option, and hook-modified CLIP paths bypass the cache; V3.4 is unchanged. diff --git a/MANIFEST.sha256 b/MANIFEST.sha256 index ccf7d22..7d43098 100644 --- a/MANIFEST.sha256 +++ b/MANIFEST.sha256 @@ -1,8 +1,8 @@ dca65fb1393e67f59c6f81f9411e3e745eb8f1097e9a2adf7ffc6f4e3901ca9f __init__.py 4f6feeb2f63a9285b0e76fb2e2618058c7d7c279af1632e1a6ccabcc9ec9a45a .github/workflows/tests.yml 0a2f69d4cec89d440f5d5aa1ec68a7c9a741382d313f80dcddf96d13f70b3e68 .gitignore -a7cfeb430af9d510110b5e2fb6c024a954fa83b856f985ce27da608fc508bab6 AGENTS.md -7f0a4b24a14abae40a98bbc9f66112e74fd4b80a8820f7f15ec6a9dd1ab5455e CHANGELOG.md +46cc7e0f2a5d04d01de4962165b0623966b303839911779c9c31ef9f541fe519 AGENTS.md +6d2fc05374d2a352fda63133d0754d19b532b6663a21e799087ebaa60acb3d9e CHANGELOG.md e97e47c7585e81d9ec5fd32c0ca0b64699fd4610cd03e9d6575a91c30a10ca4e compatibility.py 4d62508f900af9f93ec320afb900c27cc9a300d1e0c0a94714258498c5ede5fc conditioning.py 71e3df269e226b1ecad597f9831c2a10b2215c8a3783652e9e9f536e99ce46c9 constants.py @@ -17,7 +17,7 @@ de5f8fbce6bc423817acf7dc86bb0c8805a1fd962afdb2722cde7395f117eb56 docs/images/h3 a384e26f3b088607c616be1a2b038365147d92da0961d8f47060fed09f795062 docs/images/h3-continuum-sampler.png 46c52e21c8f99a75c678e7abf20e381c8140860be2662bad528a6cbfc5f3295d docs/images/h3-continuum-v33-settings.png 321311da5d2c30953dc2061ca8fdd6e10b84511a15a9bc87704f000dd687cd0a docs/images/h3-continuum-v33-streamlined-ui.png -759d18e15e0cf139630259db38123a824be565ec844a3d7ac020b74ff8537b25 docs/images/v31b-auto-resume.png +e93b6f4f8da5b2191f2d7715476eff1ab6c44fd96db689618a4bc0aa307c7b5d docs/images/v31b-auto-resume.png c9573d4393236276d032c4503f8ed8bd19c6ef24e84eec6f64f8a4c47aabc718 docs/images/v34-driving-audio-connection.png 1b9bff0d32ab1928dd85d04700be563458484748a7bfafe4db293c4950ce6bc8 docs/images/v34-regenerate-from.png 65efc844c3f116e0a46bc35390bb46e3968df44fd44ea65a63629a3953371605 docs/images/v34-sampler-spectrum-assemble.png @@ -54,10 +54,10 @@ b8275c8cecde12aee0418cea456d1e7f4b875cbb1bce32f1f3d9e06a44dd0be1 examples/v2_pr 4e410aed8d7f6ebf11c98d4f71571e46855e4619c2bcbec921df70f29189b6b1 examples/workflows/MiniMax_H3_Continuum_V32.json 55bc60447d6cd783b9df049d04b6cebb6e4a633981434ac2b28e5a1527d4f4b4 examples/workflows/MiniMax_H3_Continuum_V33_turbo.json 4e410aed8d7f6ebf11c98d4f71571e46855e4619c2bcbec921df70f29189b6b1 examples/workflows/MiniMax_H3_Continuum_V33.json -5eab33c110e07ec08ac66f289f20c295a90ca026ea5231ad6121755a28a2ded8 examples/workflows/MiniMax_H3_Continuum_V34_turbo.json -660e955c983e41947f5abfd89e66fbe5759ffda01e6c1a7164d580b0c41b2120 examples/workflows/MiniMax_H3_Continuum_V34.json -ed31ddd3d0af5e6f8dbd609e5ef51872322dbe52eaad8cae35e16342ac53dbfa examples/workflows/MiniMax_H3_Continuum_V35.json -03bcfd11087c82e89ddb70773432dd08baaf2ab119632e88ee1948bcc6686fd3 examples/workflows/MiniMax_H3_Continuum_V351_LBH_Conditioning_Bridge.json +3d57fa510f98e0874b73ae74c9402f14611c167ef99269dc9ba025ffcaa34973 examples/workflows/MiniMax_H3_Continuum_V34_turbo.json +a8460ca5092511f6d22da3363331ba8bff4feab01c569e539811049ea1add051 examples/workflows/MiniMax_H3_Continuum_V34.json +ea8c245d36909672710bc9f535f37195e48d7151b0cb2217bcaaca5fcc6d02c0 examples/workflows/MiniMax_H3_Continuum_V35.json +9f1a0766b97ead788989fb6eb69a6b36ad236d7a924eea4a88e4a1696e2db6d8 examples/workflows/MiniMax_H3_Continuum_V351_LBH_Conditioning_Bridge.json e8f41dee2240f1fcc6e8fd12448856513483ff3ae0427b2c554bb351f9ae8047 graph_contract.py 3d14acac341c63207995e2bd45cd407fdb3e2308273b1c90605adfe6f2e0bd8f hardening.py 6abdbc29472c7f9d447085b189fc47b69e110b94ef83192f9689d04000408843 INSTALL_JA.txt @@ -66,19 +66,19 @@ d74073e7ee292ebeba913af4288284f9f197cd91fceed6c62bf6c66b784c7cec install_window 6aa3f5780baa7bb0c0672b5f01a2f77e5f209da93f6373468cb274ea2f643d4b layout_adapter.py c44abbd789091bbead01250dbd5453e60539d2665c69f162335fdbd2936019c2 LICENSE d3e213005670e94dee33a240349a4d245cf9a3b6602099f11ed30cf5a32e2c21 media.py -73d8520121ae6e22c58e8455d09c6e9dd09949469f8b2a5485d200c7ee3244f8 metadata.ini +18bea054b11cc97ba5774b35a9367ddafc3ab9678c824f48f4deb354005fb1ba metadata.ini ef705a476e3f5bbd05559e7a0e7d3dfb9275badef0f8f65fb1a36ce27fbcb537 model_patch.py 420f00c8193d527017720b26d6f7011d69c8f68a157b21c0102246cc98ad3a13 nodes.py -7f1869c2eac19f79b1aae6a65362b4eb84dba8b812028abf7d3d29d780cac4c2 PACKAGE_INFO_JA.txt -9a52ebfe476c666633c3dac690a1cb4e0e4d34b2591f23e05fe1100a997c668a PACKAGE_VALIDATION.txt +13fc76ef7422d369a915b6e29bab0c76833e25ea7671ab3efcb8287042a8545a PACKAGE_INFO_JA.txt +ce593d6d23f049152181c46c84f7801b29cdceab0106dac6b27f156d8f2cde1c PACKAGE_VALIDATION.txt b470819f16fc179654dc1600721a63f0a5a14e777f4c004d574b499da6886ba5 public_api.py -5ee4d404553ea773c58aee9714e29ab4f23f01a9281911c8ef5b59bb323eb12f pyproject.toml +aa95491a3959ad3c2218cb0bb711fe88fc687b726f710473c3bafd783a34202e pyproject.toml 94fdc2d545b2d4077a4d70229fd22ba3ccac21d49d1097d2873f76d04e9a3c7a pytest.ini -5eccc59d235902f0c8b26e155cb012132d29c8a13ec9f10c444ccca9f08b0128 README_JA.md -436e388894537812c9a478286332f864efaa04728e694011b4cf878016e54da6 README.md +a6d2f4bb803fe68f99df400cf2bb8d43ad4003af2ae69c67c7a77f0829d404df README_JA.md +a83046936584194eb3df9a534755ec723e95d2a91c9cfce5455effb6a71fac36 README.md 5d89c366b4f076fa73a2695557e0af749bf95df1dad0d55dbb2fe5b1c2519ad7 reference_audio.py a0266ab4434b8e9844219d2b6dd8a168d198dd8f142775be01a39b81dc196b91 reference_video.py -2995924fcb7bac27b548b01187d8276d2ab103c6f43416cf85400de3846c6297 reference.py +564f5f2bf29665059845a98b9ca3e9a1309566aab73bcaa96f95fab8251ab06c reference.py 467edb2c188d024c2392aafe7423b3f835e16b10f570da76e2f7dda8a962c1c5 requirements.txt e02b523b5b1c1272c912c16d547050cc9bb9feb6c348743015bb5d059a4ead06 run_storage.py 6056de6c0a5322a8a51ba5a114538dca2ef67788cd1afba10fedd483b95f6afa state_io.py @@ -99,7 +99,8 @@ d2a02c120e01d360ddca17a92d5bc53b12c9f0734d06440b3fc2fad2e754e549 tests/test_p23 114530f8bc4b0a6cd416581636c85d494a07e5dcca93afe9c82f4a5aaaed9dc7 tests/test_p31_prompt_conditioning_cache.py 403a0ff300330ac1f97642bf0681e80b83eec18e8911c03952ddf203ce794e5a tests/test_p46a_reference_video_memory.py 1ae0369943ba2fb13f21ad0cf56ee58621ba09bf20174379595e157a1775c7fd tests/test_public_api.py -bc66ab71ea7dcb81aa856fcf254841f402ab150964f6133a6de765a3ff5c9f65 tests/test_release_metadata.py +892d3e3e022a527652dd995508c8bbb650c370caf9ee66fa3eb1f7fd288bba38 tests/test_public_workflow_integrity.py +da7f883fb0ab8ea740bd2f9b578ad254a093b6778572e5698fc83797b3673022 tests/test_release_metadata.py d4c53d2c260b635d70fa211029d608f63776e0a56c20253475fa47c58363f8a7 tests/test_state_io.py 98a33c75b33ff0c10a68e04bd856e4e43b3e70b6ae1ea458a2b21b4e4d74f46d tests/test_state.py 58c06925ccf06c4feee19b927b3515c540c0536aa5f3f8d29be35b8e919915a7 tests/test_temporal.py @@ -112,7 +113,7 @@ d4c53d2c260b635d70fa211029d608f63776e0a56c20253475fa47c58363f8a7 tests/test_sta b42bcc0983147462d96c6b71cc4a38e846995dafa6eebefc3ae0d9bb36caf359 tests/test_v2_sequence_orchestration.py 0b5b20a8318862d167f135720e0489b8d4f93406d67c6646e052e35b03dcb876 tests/test_v2_session.py 58438c3ed814adf40cefde098a37cae00ddcb703b7e5548bbbb295e54bed5a6d tests/test_v2_widget_migration.py -419c358962225d7c8893bb426b653d1dc175197d2567b0af60b38bdbb549e011 tests/test_v217_stable_facade.py +f8d585eb4f31bc315b64294213fa25b52ca0d2ba8da2ff02ab571fb1b6db01e4 tests/test_v217_stable_facade.py 78bc478a5e4edda902c80849c911782a99e75c06dfb04127391b6cc5b27b28e1 tests/test_v3_hardening.py eb5b27f8f0d79529c56ef344a5601703642c3cba5388c9768116223e2ed58a36 tests/test_v3_video_seam.py 1f5310587d05eb5058ec94d9985138d25aa22b22fb0dd5c68518f2f2053116a4 tests/test_v31_run_storage.py @@ -167,6 +168,6 @@ da5edf3b4392c41e12ef73a0cd21799be42a327b18bd5a6989447b75163dcab1 v3/second_pass 23a412ce55797cbe6ea19c4379053855ff21bca233e3c373577225b761cc03d0 v3/second_pass.py 4178dcfa442abdb06ce276e05bd7bcbaa6da28469ba5e57d3da3c663de4e4a9d v3/video_seam_v35.py 2f07ace1462644f0bee553827b3571535de4d0c2d9ef847bd9e0ca73a4eed5cb v3/video_seam.py -631055f46ad8be92f560c51aa33c6278ff2ce368a69293f6f510714b53ef1acc version.py +070b70636a92548ec75250fa75dae59f66fb72771cd4f70dc6dcfa619dd0d39e version.py 96b2f9aa1d20677433c46d225b8da26ab5379e4f0419e6d5e091a5c821898bb3 web/project_id.js 0cf8d49bcb71b30437dc893f6218dc4cfb1cd244b647e4fbc2861dea2271a33a web/reference_audio_ui.js diff --git a/PACKAGE_INFO_JA.txt b/PACKAGE_INFO_JA.txt index 588f8b9..526a9a1 100644 --- a/PACKAGE_INFO_JA.txt +++ b/PACKAGE_INFO_JA.txt @@ -1,7 +1,13 @@ -ComfyUI-H3-Continuum V3.5.2 +ComfyUI-H3-Continuum V3.5.3 MiniMax H3の5秒ChunkをAV latent contextで継続し、長尺映像として組み立てるComfyUIカスタムノードです。 +V3.5.3: +- 公開Conditioning Bridge WorkflowのWidth/Height接続を修正 +- 公開V3.4/V3.5 Workflowの孤立link IDを清掃し、全配布Workflowのserialization整合性テストを追加 +- Hybrid First/Last+Referenceの``警告を公開番号のまま表示 +- 生成契約、Node/socket、V3.5.2最適化、V3.4互換性は不変 + V3.5.2: - 同一Prompt / CLIP条件の繰り返し生成でCPU conditioning結果を再利用 - Referenceや特殊CLIP経路は安全側でcache bypass diff --git a/PACKAGE_VALIDATION.txt b/PACKAGE_VALIDATION.txt index 15111cb..9b60b0c 100644 --- a/PACKAGE_VALIDATION.txt +++ b/PACKAGE_VALIDATION.txt @@ -1,6 +1,6 @@ -ComfyUI-H3-Continuum V3.5.2 package validation +ComfyUI-H3-Continuum V3.5.3 package validation -Status: V3.5.2 stabilization and optimization release. Stable V3.5 paths, Conditioning Bridge, Reference Audio, Prompt/CLIP cache reuse, and Video Guide memory optimization are validated. Seed widgets use standard ComfyUI behavior. Integrated Hi-Res Fix remains Experimental. +Status: V3.5.3 distribution-integrity maintenance hotfix. V3.5.2 generation behavior and optimization contracts are unchanged. Stable V3.5 paths, Conditioning Bridge, Reference Audio, Prompt/CLIP cache reuse, and Video Guide memory optimization remain validated. Seed widgets use standard ComfyUI behavior. Integrated Hi-Res Fix remains Experimental. Required automated checks: - python -m compileall -q . @@ -30,7 +30,7 @@ Validated runtime paths include: - Audio Seam Auto - Video Seam Auto guarded transient and micro-flash correction -Latest verified automated result: 485 passed. +Latest verified automated result: 495 passed. Hi-Res Fix and Auto 2 remain experimental. Main 3x5 2x is not accepted on the tested RTX 5060 Ti 16 GiB because the terminal 77T Second Pass group exceeded VRAM; longer Reference/Hybrid acceptance remains pending. diff --git a/PROJECT_STATE.md b/PROJECT_STATE.md index a425555..88e726f 100644 --- a/PROJECT_STATE.md +++ b/PROJECT_STATE.md @@ -12,6 +12,17 @@ Updated: 2026-08-26 +## V3.5.3 maintenance hotfix (2026-08-26) + +- V3.5.3 is a distribution-integrity maintenance hotfix over published V3.5.2. Sampling, Conditioning payloads, Terminal Merge, Assembly, Seam, Run Storage, Prompt/CLIP caching, Video Guide optimization, V3.4 compatibility, node IDs, and backend socket keys are unchanged. +- Repaired the public Conditioning Bridge workflow links `349`/`350` so the shared Width/Height controls target Sampler V3.5 input slots `16`/`17`; removed stale output link IDs `171`/`172`/`173` from the public V3.4, V3.4 Turbo, and V3.5 workflows. +- `validate_reference_prompts()` now preserves absolute public `` numbers for Hybrid First/Last + Reference warnings. This matches the previously accepted ComfyUI_W behavior and changes report text only. +- Re-encoded the unreferenced legacy `docs/images/v31b-auto-resume.png` without changing any displayed pixel. All 19 packaged PNG files pass strict Pillow verification. +- Added regressions for all eight public workflow graphs and the Hybrid warning numbers. Focused validation is `30 passed`; canonical full pytest is `495 passed`, and the source/runtime V3.5.3 verifier passes native PackedLayout, Fixed 3x5 planning, and complete node registration. +- The release Manifest now contains 173 files and verifies every recorded SHA-256, including the new public-workflow integrity regression. +- Production files `reference.py`, `version.py`, and `metadata.ini` are synchronized to ComfyUI_W with exact SHA-256 equality. ComfyUI_WAN is excluded because that secondary runtime is an incomplete older copy and must not be partially relabeled as V3.5.3. +- Accepted snapshots are `pre-v353-maintenance-hotfix-source-accepted-20260826_030732` (199 tracked files, revision `70cbbcd`) and `pre-v353-maintenance-hotfix-comfyui-w-accepted-20260826_030731` (14 present target files). Commit and push have not been performed. + ## V3.5.2 final release gate (2026-08-26) - V3.5.2 is the release-candidate baseline for the Stabilization & Optimization Update. It adds no generation mode and preserves all V3.5.x workflow contracts plus V3.4 Node IDs/backend socket keys. @@ -131,7 +142,7 @@ Updated: 2026-08-26 ## Baseline -- Release-candidate baseline: V3.5.2 (published baseline remains V3.5.1 until commit/push) +- Release-candidate baseline: V3.5.3 maintenance hotfix (published baseline remains V3.5.2 until commit/push) - Authoritative working repository: `D:\Codex\_git_push_work\ComfyUI-H3-Continuum` - Primary tested runtime: `D:\StabilityMatrix\Data\Packages\ComfyUI_W\custom_nodes\ComfyUI-H3-Continuum` - Secondary runtime: `D:\StabilityMatrix\Data\Packages\ComfyUI_WAN\custom_nodes\ComfyUI-H3-Continuum` diff --git a/README.md b/README.md index 31937a8..b88e9ea 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,13 @@ -# ComfyUI-H3-Continuum 3.5.2 +# ComfyUI-H3-Continuum 3.5.3 Long-form MiniMax H3 video generation for ComfyUI with Continuum-aware Second Pass refinement, optional Hi-Res Fix, low-memory disk-backed assembly, restartable chunks, persistent references, and optional Spectrum interoperability. +## V3.5.3 Maintenance Hotfix + +V3.5.3 is a distribution-integrity maintenance release. It repairs the public Conditioning Bridge workflow's Width/Height links, removes stale orphan link IDs from the published V3.4/V3.5 templates, corrects Hybrid `` warning numbering, and repairs one legacy PNG for strict image decoders. + +There are no changes to generation behavior, nodes, sockets, Sampling, Conditioning payloads, Terminal Merge, Assembly, Seam, Run Storage, Prompt/CLIP caching, Video Guide optimization, or V3.4 compatibility. Existing V3.5.x workflows continue to load unchanged. + ## V3.5.2 Stabilization & Optimization Update V3.5.2 adds no new generation mode. It stabilizes the V3.5.x release, removes repeated Prompt/CLIP work when safe, and lowers temporary memory for long Video Guide inputs while preserving existing workflow and generation contracts. @@ -29,7 +35,7 @@ Prompt/CLIP figures measure only the conditioning subphase, not total generation The measured Sage-only production baselines on the tested RTX 5060 Ti 16 GB / 64 GB system were 168.069 seconds for 1×5-second 576×576 T2VA and 379.765 seconds for 3×5-second 640×640 FL2VA Long Terminal Merge. These are configuration-specific baselines, not universal speed guarantees. Sampling remained the dominant cost; Continuum Assemble + Seam stayed below 1%. -> **V3.5.2 is the current release.** V3.4 node IDs, backend socket keys, and saved-workflow loading remain intentionally supported. Sampling, Conditioning, Terminal Merge, Assembly, Seam, Run Storage, and standard ComfyUI seed behavior are unchanged. The withdrawn experimental Last Queued Seed override is not included. +> **V3.5.3 is the current maintenance release.** V3.5.2 remains the accepted Stabilization & Optimization baseline. V3.4 node IDs, backend socket keys, and saved-workflow loading remain intentionally supported. Sampling, Conditioning, Terminal Merge, Assembly, Seam, Run Storage, and standard ComfyUI seed behavior are unchanged. The withdrawn experimental Last Queued Seed override is not included. ## V3.5.1 Reference Audio & Compatibility Update @@ -601,7 +607,7 @@ Use a 24 fps source for `Video Guide Frames`. `Load Video (Upload)` may accept f ## Current validation status -The V3.5.2 release passes `485` automated tests, source/runtime registration verification, native PackedLayout, Fixed 3x5 prompt planning, JavaScript UI harnesses, release metadata consistency, Prompt/CLIP MISS-to-HIT output equality, and Video Guide bit-exact GPU A/B acceptance. Earlier representative GPU acceptance also covers the V3.5 Conditioning Bridge path, Reference Audio/Image retention, Second Pass/Hi-Res paths, and accepted 3x5 FL2VA Long Terminal Merge latents through Core Video/Audio VAE Decode and Assemble V3.5 Auto. +The V3.5.3 maintenance gate passes `495` automated tests, including all published-workflow link integrity and Hybrid public-picture warning regressions. Source/runtime registration verification, native PackedLayout, Fixed 3x5 prompt planning, JavaScript UI harnesses, release metadata consistency, Prompt/CLIP MISS-to-HIT output equality, and Video Guide bit-exact GPU A/B acceptance remain valid. Earlier representative GPU acceptance also covers the V3.5 Conditioning Bridge path, Reference Audio/Image retention, Second Pass/Hi-Res paths, and accepted 3x5 FL2VA Long Terminal Merge latents through Core Video/Audio VAE Decode and Assemble V3.5 Auto. V3.4 compatibility paths have been exercised locally with: diff --git a/README_JA.md b/README_JA.md index 8f28901..285bfed 100644 --- a/README_JA.md +++ b/README_JA.md @@ -1,7 +1,13 @@ -# ComfyUI-H3-Continuum 3.5.2 +# ComfyUI-H3-Continuum 3.5.3 MiniMax H3を複数チャンクで連続生成し、直前チャンク末尾の**映像latent / 音声latentを直接**次チャンクへ継承するComfyUIカスタムノードです。チャンク間でVideo/Audio VAEのDecode→Encodeは行いません。 +## V3.5.3 Maintenance Hotfix + +V3.5.3は配布整合性だけを修正するメンテナンス版です。公開Conditioning Bridge WorkflowのWidth/Height接続、V3.4/V3.5テンプレート内の孤立link ID、Hybridの``警告番号、厳密な画像decoderで読めなかった旧PNG 1件を修正しました。 + +生成動作、Node、socket、Sampling、Conditioning payload、Terminal Merge、Assembly、Seam、Run Storage、Prompt/CLIP cache、Video Guide最適化、V3.4互換性は変更していません。既存V3.5.x Workflowはそのまま読み込めます。 + ## V3.5.2 Stabilization & Optimization Update V3.5.2は新しい生成モードを追加する版ではありません。V3.5.xを安定化し、安全な条件で繰り返しPrompt/CLIP処理を省略し、長いVideo Guide入力の一時メモリを削減します。既存Workflowと生成契約は維持します。 @@ -29,7 +35,7 @@ Prompt/CLIPの数値はconditioning区間だけで、総生成時間ではあり RTX 5060 Ti 16 GB/RAM 64 GBの検証環境で測定したSage-only Production baselineは、576×576 T2VA 1×5秒が168.069秒、640×640 FL2VA Long Terminal Merge 3×5秒が379.765秒です。環境・設定固有の測定値であり、すべての環境に対する速度保証ではありません。Samplingが最大コストで、Continuum Assemble + Seamは1%未満でした。 -**V3.5.2が現在の正式版です。** V3.4 Node ID、backend socket key、保存済みWorkflow読込は維持します。Sampling、Conditioning、Terminal Merge、Assembly、Seam、Run Storage、ComfyUI標準Seed動作は変更していません。撤回済みの実験的Last Queued Seed overrideは含まれていません。 +**V3.5.3が現在のメンテナンス版です。** V3.5.2は受入済みStabilization & Optimization baselineとして維持します。V3.4 Node ID、backend socket key、保存済みWorkflow読込は維持します。Sampling、Conditioning、Terminal Merge、Assembly、Seam、Run Storage、ComfyUI標準Seed動作は変更していません。撤回済みの実験的Last Queued Seed overrideは含まれていません。 ## V3.5.1 Reference Audio/互換性更新 @@ -250,7 +256,7 @@ ZIPを展開して、`ComfyUI-H3-Continuum`フォルダーを`ComfyUI/custom_nod ## 検査 -V3.5.2正式版は全`485 passed`、source/runtime登録検証、PackedLayout、Fixed 3×5 Prompt Plan、JavaScript UI harness、release metadata、Prompt/CLIP MISS→HIT出力一致、Video Guide bit-exact GPU A/Bを通過しています。以前の代表GPU受入にはConditioning Bridge、Reference Audio/Image保持、Second Pass/Hi-Res経路、3×5秒FL2VA Long Terminal MergeからCore Video/Audio VAE Decode、Assemble V3.5 Autoまでを含みます。 +V3.5.3 maintenance gateは全`495 passed`で、全公開Workflowのlink整合性とHybrid公開Picture番号の警告回帰を含みます。source/runtime登録検証、PackedLayout、Fixed 3×5 Prompt Plan、JavaScript UI harness、release metadata、Prompt/CLIP MISS→HIT出力一致、Video Guide bit-exact GPU A/Bも引き続き有効です。以前の代表GPU受入にはConditioning Bridge、Reference Audio/Image保持、Second Pass/Hi-Res経路、3×5秒FL2VA Long Terminal MergeからCore Video/Audio VAE Decode、Assemble V3.5 Autoまでを含みます。 Main Hi-Res Fixの3×5秒2xは、RTX 5060 Ti 16 GiBで37T groupの1152×1152 Second Pass完了後、Terminal Mergeの77T group最初の推論時にCUDA OOMとなり未受入です。Reference/Hybrid固有の1×5秒Second Passは受入済みですが、長尺Reference/Hybridは未確認です。Disk-backedが保証する低メモリ範囲はContinuum Assemblyであり、Core Decodeや下流ノードが別の全量copyを作る可能性は残ります。 diff --git a/WORKLOG.md b/WORKLOG.md index d0f8ee1..e88b019 100644 --- a/WORKLOG.md +++ b/WORKLOG.md @@ -1,5 +1,17 @@ # Work Log +## 2026-08-26 - V3.5.3 distribution-integrity maintenance hotfix + +- Kept published V3.5.2 generation and optimization behavior frozen; no Sampling, Conditioning payload, Terminal Merge, Assembly, Seam, Run Storage, Prompt/CLIP cache, Video Guide, V3.4, node, or socket contract was changed. +- Created accepted source/runtime snapshots `pre-v353-maintenance-hotfix-source-accepted-20260826_030732` and `pre-v353-maintenance-hotfix-comfyui-w-accepted-20260826_030731` after the standard full snapshot stopped only on the known inaccessible `.pytest_cache`. +- Repaired Conditioning Bridge workflow links `349`/`350` from stale Sampler input slots `14`/`15` to Width/Height slots `16`/`17`; removed orphan output links `171`/`172`/`173` from the public V3.4, V3.4 Turbo, and V3.5 workflows. +- Replaced source-only Hybrid warning renumbering with the accepted absolute public `` behavior already present in ComfyUI_W. Added two regressions covering unavailable and missing Hybrid references. +- Added an eight-workflow serialization-integrity regression covering node/link uniqueness, endpoints, slot bounds, reciprocal input/output references, and types. The focused release/hotfix result is `30 passed`; canonical full pytest is `495 passed` with only the known `pynvml` FutureWarning. +- Regenerated the release Manifest with 173 entries, added the public-workflow integrity regression, and verified every recorded SHA-256. +- Losslessly re-encoded the unreferenced legacy `v31b-auto-resume.png`; strict Pillow verification passes all 19 packaged PNGs and an independent pixel comparison found zero changed pixels. +- Synchronized only `reference.py`, `version.py`, and `metadata.ini` to the primary ComfyUI_W runtime and verified exact source/runtime SHA-256 equality. Runtime verification reports V3.5.3, native PackedLayout PASS, Fixed 3x5 planning PASS, and complete node registration. The incomplete ComfyUI_WAN copy was intentionally not modified. +- No GPU generation was rerun because the only Python behavior change is report warning text and the remaining changes are package/workflow metadata. Commit and push were not performed. + ## 2026-08-26 - V3.5.2 README final audit and publication authorization - Re-audited English/Japanese README chapter order, historical/current-version wording, withdrawn controls, local links, image references, and validation claims before publication. diff --git a/docs/images/v31b-auto-resume.png b/docs/images/v31b-auto-resume.png index af5f9d2c00cdaa40a6953d2abf4c0caac383e35b..22323ff825d53bfb0075610cd66e41aff1e8291e 100644 GIT binary patch literal 23828 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 z%0A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 diff --git a/examples/workflows/MiniMax_H3_Continuum_V34.json b/examples/workflows/MiniMax_H3_Continuum_V34.json index 061c30f..df1682f 100644 --- a/examples/workflows/MiniMax_H3_Continuum_V34.json +++ b/examples/workflows/MiniMax_H3_Continuum_V34.json @@ -648,7 +648,6 @@ "name": "IMAGE", "type": "IMAGE", "links": [ - 171, 208 ] }, @@ -693,7 +692,6 @@ "name": "IMAGE", "type": "IMAGE", "links": [ - 172, 207 ] }, @@ -838,7 +836,6 @@ "name": "IMAGE", "type": "IMAGE", "links": [ - 173, 206 ] }, @@ -2401,4 +2398,4 @@ "VHS_KeepIntermediate": true }, "version": 0.4 -} \ No newline at end of file +} diff --git a/examples/workflows/MiniMax_H3_Continuum_V34_turbo.json b/examples/workflows/MiniMax_H3_Continuum_V34_turbo.json index 98c8210..4455f66 100644 --- a/examples/workflows/MiniMax_H3_Continuum_V34_turbo.json +++ b/examples/workflows/MiniMax_H3_Continuum_V34_turbo.json @@ -648,7 +648,6 @@ "name": "IMAGE", "type": "IMAGE", "links": [ - 171, 208 ] }, @@ -693,7 +692,6 @@ "name": "IMAGE", "type": "IMAGE", "links": [ - 172, 207 ] }, @@ -838,7 +836,6 @@ "name": "IMAGE", "type": "IMAGE", "links": [ - 173, 206 ] }, @@ -2436,4 +2433,4 @@ "VHS_KeepIntermediate": true }, "version": 0.4 -} \ No newline at end of file +} diff --git a/examples/workflows/MiniMax_H3_Continuum_V35.json b/examples/workflows/MiniMax_H3_Continuum_V35.json index 3eaaac1..9bd647a 100644 --- a/examples/workflows/MiniMax_H3_Continuum_V35.json +++ b/examples/workflows/MiniMax_H3_Continuum_V35.json @@ -1664,7 +1664,6 @@ "name": "IMAGE", "type": "IMAGE", "links": [ - 171, 315 ] }, @@ -1709,7 +1708,6 @@ "name": "IMAGE", "type": "IMAGE", "links": [ - 172, 316 ] }, @@ -1754,7 +1752,6 @@ "name": "IMAGE", "type": "IMAGE", "links": [ - 173, 317 ] }, @@ -3234,4 +3231,4 @@ ] }, "version": 0.4 -} \ No newline at end of file +} diff --git a/examples/workflows/MiniMax_H3_Continuum_V351_LBH_Conditioning_Bridge.json b/examples/workflows/MiniMax_H3_Continuum_V351_LBH_Conditioning_Bridge.json index 9d13cc1..8e181a8 100644 --- a/examples/workflows/MiniMax_H3_Continuum_V351_LBH_Conditioning_Bridge.json +++ b/examples/workflows/MiniMax_H3_Continuum_V351_LBH_Conditioning_Bridge.json @@ -2726,7 +2726,7 @@ 120, 0, 305, - 14, + 16, "INT" ], [ @@ -2734,7 +2734,7 @@ 120, 1, 305, - 15, + 17, "INT" ] ], diff --git a/metadata.ini b/metadata.ini index 3f21d1d..2ea7e1e 100644 --- a/metadata.ini +++ b/metadata.ini @@ -1,4 +1,4 @@ [project] name = H3 Continuum -version = 3.5.2 +version = 3.5.3 description = Native MiniMax H3 continuation with Second Pass, experimental Hi-Res Fix, and disk-backed assembly. diff --git a/pyproject.toml b/pyproject.toml index 5610cfd..bb2650d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "comfyui-h3-continuum" -version = "3.5.2" +version = "3.5.3" description = "Integrated N-chunk continuation for ComfyUI native MiniMax H3 video and audio" readme = "README.md" requires-python = ">=3.10" diff --git a/reference.py b/reference.py index 48711eb..b7fcad0 100644 --- a/reference.py +++ b/reference.py @@ -236,20 +236,18 @@ def validate_reference_prompts( reference_count: int, picture_offset: int = 0, ) -> str: - if picture_offset > 0: - def _shift_picture_tag(match: re.Match[str]) -> str: - number = int(match.group(1)) - if number <= picture_offset: - return "" - return f"" - - shifted = [_PICTURE_TAG.sub(_shift_picture_tag, str(prompt)) for prompt in prompts] - return validate_reference_prompts(shifted, reference_count) - + reference_count = max(0, int(reference_count)) + picture_offset = max(0, int(picture_offset)) found: set[int] = set() for prompt in prompts: found.update(int(value) for value in _PICTURE_TAG.findall(str(prompt))) - invalid = sorted(value for value in found if value < 1 or value > reference_count) + + first_reference = picture_offset + 1 + last_reference = picture_offset + reference_count + found_references = { + value for value in found if first_reference <= value <= last_reference + } + invalid = sorted(value for value in found if value < 1 or value > last_reference) warnings: list[str] = [] if invalid: unavailable = ", ".join(f"" for value in invalid) @@ -260,12 +258,14 @@ def validate_reference_prompts( "unavailable reference may be ignored or hallucinated. Enable the " "corresponding Reference Image input or remove the unavailable tag." ) - missing = sorted(set(range(1, reference_count + 1)) - found) + + expected_references = set(range(first_reference, last_reference + 1)) + missing = sorted(expected_references - found_references) if missing: labels = ", ".join(f"" for value in missing) detail = ( "the prompt contains no tag" - if not found + if picture_offset == 0 and not found else f"connected reference {labels} is not explicitly mentioned in the prompt" ) warnings.append( diff --git a/tests/test_public_workflow_integrity.py b/tests/test_public_workflow_integrity.py new file mode 100644 index 0000000..e25f1d8 --- /dev/null +++ b/tests/test_public_workflow_integrity.py @@ -0,0 +1,61 @@ +from __future__ import annotations + +import json +from pathlib import Path + +import pytest + + +ROOT = Path(__file__).resolve().parents[1] +WORKFLOW_DIR = ROOT / "examples" / "workflows" +WORKFLOWS = sorted(WORKFLOW_DIR.glob("*.json")) + + +@pytest.mark.parametrize("workflow_path", WORKFLOWS, ids=lambda path: path.name) +def test_public_workflow_links_are_serialization_consistent(workflow_path: Path) -> None: + workflow = json.loads(workflow_path.read_text(encoding="utf-8")) + workflow = json.loads(json.dumps(workflow, ensure_ascii=False)) + nodes = {int(node["id"]): node for node in workflow["nodes"]} + links = {int(link[0]): link for link in workflow["links"]} + + assert len(nodes) == len(workflow["nodes"]), "duplicate node ID" + assert len(links) == len(workflow["links"]), "duplicate link ID" + + for link_id, link in links.items(): + _, source_id, source_slot, target_id, target_slot, link_type = link + source = nodes[int(source_id)] + target = nodes[int(target_id)] + outputs = source.get("outputs") or [] + inputs = target.get("inputs") or [] + + assert 0 <= int(source_slot) < len(outputs), f"link {link_id}: invalid source slot" + assert 0 <= int(target_slot) < len(inputs), f"link {link_id}: invalid target slot" + assert link_id in (outputs[int(source_slot)].get("links") or []), ( + f"link {link_id}: source output does not reference the link" + ) + assert inputs[int(target_slot)].get("link") == link_id, ( + f"link {link_id}: target input does not reference the link" + ) + + endpoint_types = { + value + for value in ( + outputs[int(source_slot)].get("type"), + inputs[int(target_slot)].get("type"), + link_type, + ) + if value not in (None, "*") + } + assert len(endpoint_types) <= 1, f"link {link_id}: endpoint type mismatch" + + for node in nodes.values(): + for output in node.get("outputs") or []: + for link_id in output.get("links") or []: + assert int(link_id) in links, f"node {node['id']}: dangling output link {link_id}" + for input_ in node.get("inputs") or []: + link_id = input_.get("link") + if link_id is not None: + assert int(link_id) in links, f"node {node['id']}: dangling input link {link_id}" + + if links: + assert int(workflow["last_link_id"]) >= max(links) diff --git a/tests/test_release_metadata.py b/tests/test_release_metadata.py index fb3fcbe..e8257fc 100644 --- a/tests/test_release_metadata.py +++ b/tests/test_release_metadata.py @@ -6,7 +6,7 @@ import tomllib ROOT = Path(__file__).resolve().parents[1] -EXPECTED_VERSION = "3.5.2" +EXPECTED_VERSION = "3.5.3" def test_v35_release_metadata_is_consistent(): diff --git a/tests/test_v217_stable_facade.py b/tests/test_v217_stable_facade.py index 12c71b5..9f3e65e 100644 --- a/tests/test_v217_stable_facade.py +++ b/tests/test_v217_stable_facade.py @@ -145,4 +145,4 @@ def test_v217_result_pack_expands_legacy_outputs(): def test_v217_has_no_frontend_display_controller(): assert not (ROOT / "web" / "h3_continuum_v2.js").exists() version_source = (ROOT / "version.py").read_text(encoding="utf-8") - assert 'PACKAGE_VERSION = "3.5.2"' in version_source + assert 'PACKAGE_VERSION = "3.5.3"' in version_source diff --git a/tests/test_v34_hybrid_reference.py b/tests/test_v34_hybrid_reference.py index 3b63dff..2fbd396 100644 --- a/tests/test_v34_hybrid_reference.py +++ b/tests/test_v34_hybrid_reference.py @@ -57,6 +57,27 @@ def test_hybrid_prompt_validation_offsets_reference_numbers() -> None: ) == "" +def test_hybrid_prompt_validation_keeps_public_picture_numbers_in_warnings() -> None: + warning = validate_reference_prompts( + [" starts the shot and is unavailable."], + 1, + picture_offset=2, + ) + assert "unavailable " in warning + assert "connected reference " in warning + assert "unavailable " not in warning + + +def test_hybrid_prompt_validation_reports_the_missing_reference_number() -> None: + warning = validate_reference_prompts( + [" starts the shot."], + 1, + picture_offset=2, + ) + assert "connected reference " in warning + assert "the prompt contains no tag" not in warning + + def test_pure_fl_identity_is_unchanged() -> None: assert combine_hybrid_visual_identity( keyframe_identity_hash="fl-identity", diff --git a/version.py b/version.py index e8732d3..207381b 100644 --- a/version.py +++ b/version.py @@ -1,6 +1,6 @@ """Package version and public schema identifiers.""" -PACKAGE_VERSION = "3.5.2" +PACKAGE_VERSION = "3.5.3" STATE_SCHEMA_VERSION = 1 PLAN_SCHEMA_VERSION = 1 PUBLIC_API_VERSION = 3