diff --git a/MANIFEST.sha256 b/MANIFEST.sha256 index 7d74892..5e8fe0c 100644 --- a/MANIFEST.sha256 +++ b/MANIFEST.sha256 @@ -136,12 +136,12 @@ ea64b8e0aa0dda828047c9c12818be8554429774049b9e8c0482c84b9c4f4071 PACKAGE_VALIDA b470819f16fc179654dc1600721a63f0a5a14e777f4c004d574b499da6886ba5 public_api.py 667f2646e82362d472d91a7cf5dc9a86c95f6637f3bc8c672dd516800b1a598c pyproject.toml 94fdc2d545b2d4077a4d70229fd22ba3ccac21d49d1097d2873f76d04e9a3c7a pytest.ini -2fc53d560ccf7bab434cc45e8cda2a949b79dd3b21afd430acb4cd4e186d93ca README_JA.md -8a22edc0c3a721aa17eef32db8a9396efc1f0ad3d446525307c1047bb120001e README.md +5dd6e61e08c082ae275d3a9abe34c1402b5e98e75a70ca003f704746db070043 README_JA.md +06dd97ecda8433be631dcf337e12262ff372782c7152c744047273a677962dc8 README.md 44127adcfa30ee84bff9cd4b2d0c695355209550e76982d374122008728aa5bc reference_audio.py 5cb9bfd6810d3a93a637451980a4cc5c1436e5b84cfd1c7a111cd192e876351b reference_video.py caa572ea65dafc86850db99f52433d360ac9c4ab36b854292a3dccd5ba32dc76 reference.py -b744f1e497e5ae5d9185bfdb3b31cfef29ae4109c99ac6023290e2b055a6061b REGISTRY_MANIFEST.sha256 +af13aabda9f0deb90e6922f3373cd5fb2c4b61255d84c4d31f0e944fe1db5246 REGISTRY_MANIFEST.sha256 467edb2c188d024c2392aafe7423b3f835e16b10f570da76e2f7dda8a962c1c5 requirements.txt 53827c94b3f588f35bb8eacb404e1bd5e233d25f4ee0fdd286efc7d8ddb52b6f run_storage.py 6056de6c0a5322a8a51ba5a114538dca2ef67788cd1afba10fedd483b95f6afa state_io.py @@ -156,6 +156,7 @@ a41a4de12e6fe5690845f9f0795fa82c4907f0afe2551034fa2a4c95617ac39c tests/decode_c 7e627131904dc6d6f58021fad396185c531858b62dd6febf12c3f95fd1391138 tests/decode_cache/test_store.py db08ce77cc5c5835f2403d4d589394090fa5d25ff3b1840312b2808e1bc203b7 tests/fixtures/v38_a3c_selective_refine_saved_workflow.json 606b3985f2b644fac40c84de3e08d1453e87a988acca51ce9595516a7c60a577 tests/frontend_decode_cache_helper.mjs +868c613654467c2c739e07de5dd9b4679b36f98cd96d631d91e1d4afe5698cf5 tests/frontend_external_int_size.cjs da45ac4b9422f04a6867ff4cff4b12cf1dff88422522b8010a960b5ecfce046a tests/frontend_reference_images_v39.cjs 19bb25dea15f20fac9874b9d18c9b75156446dda7e6da91e8a9e758282c5f777 tests/frontend_review_queue.cjs 36f74c03a40c4b62b90eede070d976bcd1b7f0ea828983d1e61a6cb6d80a0ea8 tests/helpers/r5_process_crash_worker.py @@ -167,6 +168,7 @@ fe23752312d62ddc8c23a3c598ed2f92f2d46e2e4460f06aea91921659092451 tests/test_aud 0b06a5af3420a7157eebcca369521c8146ad546e54f85719b49562555f8f17fb tests/test_easy_load_audio.py 7a46da28616cc9fc355ae9b6a9753dadb3201932d759c086df7513ea790f3f6d tests/test_easy_load_image.py bfcfd77e70711830d087878d78021b754cd7e1ea324d50af0caa72f041b298fc tests/test_easy_load_video.py +72c7a2ce36d8589f1de386805dba9ef1c12a3f99f9cf818e4752d5d26b39d428 tests/test_external_int_size.py 326a97499ffe51935dd3259dbab4ed71fb02955cd3ddb5a52b5c6558a7efc872 tests/test_gpu_diagnostic_runner.py 4926706cb171e4e36e8d7ed46b592b0ed6c9c2e100072feeba497b651e52653b tests/test_issue13_r2_tools.py aaed0385281e1782edc96f1d084fa84bc4e7ec9e0055ec35aaf9a9f8b6e5bfce tests/test_issue13_r25_tools.py @@ -258,7 +260,7 @@ bb5a1530c890d357dc48ea74039340d746e876e8f85e06d4d9a19369f8ff5961 tests/test_v38 14ff6561a127287d0a20887790a978612ef9d291f1d3be7d5e85b37b2c74760e tests/test_v38_ref_encode_cache.py 8b376f45261d045b584f02b4d14cd70c2d6269b9c814d4e62b5c612f6e30e36f tests/test_v38_refine_target.py 03eb5bf6d845b22334fcc800d81b419f1c8d8593fa65a1e0460144456ff2c8ba tests/test_v38_reliability.py -b5159cfaa9dae929194d819437f61027077688d57b0d51a1eaca3567e9134ff7 tests/test_v38_resolution_preset.py +aa72293fe5ba6f4499e1ec95aace3b2e94813fa35cf987a767e77bbf2ae525b1 tests/test_v38_resolution_preset.py 2ac395009e49f9554af8d1a251d93fc5d5e7070bf80f5a0b7b3f7e00cde15077 tests/test_v38_review_cache.py 72a0e3cb334049b66dd36f52c826931067c242fa63557933fd667138b38d6e8d tests/test_v38_review_control.py f62daa235117a3041c66ebb17adedb13c0452c3a2fc0acdd51006d7aa0078a9b tests/test_v38_review_execution_cap.py @@ -406,7 +408,7 @@ fefafd4550511d80bd85ade46a0476f0cf3de13ddb94a908dff6b175f2a0e199 web/easy_bypas 9db0aa94f634578a962d5db49e5c70356040a59df968e3a2e531b327a623081f web/easy_load_image.js 35090816ba7470a7255eb85d003b7e79f8a0065982dacf98a18f41c8ebff655d web/easy_load_video.js 0c68d13a1f8beb7431a32b471f8b0612c42fcc4bf72dd97611a025d158008662 web/easy_v38.js -ee8f14ee287422fc913fad7bceee2af412be7cfc5dd62003ddaeff07f2c1ba98 web/project_id.js +c3e2e606af4e5f3e38d64b1338baedea8cadf26060da2a8618e18bf73f220f24 web/project_id.js ae59273f163a116ece418957c557c4fd8c3285e3c60814679b9361d2e6e6fa02 web/reference_audio_ui.js 46c9f75c9462bf26300332448f4431cca801f38964ca0a49bc2c50a88a7cc40f web/reference_image_ui.js e9d7753f313ebbe3d13e477f5b4e4767a735b0619b52ba54bcc5218f3eb7eb7c web/reference_images_v39.js diff --git a/PROJECT_STATE.md b/PROJECT_STATE.md index 253526c..e3e3de9 100644 --- a/PROJECT_STATE.md +++ b/PROJECT_STATE.md @@ -1,5 +1,26 @@ # Project State +## Issue #25 — external INT dimensions, main publication candidate (2026-10-01) + +- Verified against main `21a857115d2a2e1bfe71a4fcdf417c2d1d0edba8`, installed ComfyUI 0.38.0 / frontend 1.53.6. Source and runtime JS matched before repair. Runtime snapshot: `pre-issue25-external-int-size-20261001_182740` (641 files); source selected-file snapshot: `pre-issue25-external-int-source-20261001_182742` (7 files). +- Generalized Facade input binding for Chunks, Seconds, Width and Height after proxy creation; each configure pass rebinds current slots. Connected dimension controls retain their native Manual reserve values and are not editable. First Image remains size authority; linked dimensions are fallback inputs, not an automatic mode change. Ready text does not guess upstream runtime values. +- Required schemas/defaults/order, Python resolver, Sampling/Run Storage identity, Review snapshot/lifecycle and Fixed cache implementation remain unchanged. Core backend Int nodes retain API link arrays; virtual Primitive nodes may be expanded by ComfyUI itself. +- New actual-JS regression gate: old code failed 20/22 cases, repair passes 22/22; existing Review fixture remains 60/60. Focused CPU gate: 217 PASS. Final full CPU suite: 1569 PASS / 1 skipped in 106.02s; Registry Manifest 143 entries and development Manifest 419 entries match. Protected Production Python 94 files and stored Take metadata are unchanged. The final public tree/commit verification is recorded in the separate publication receipt. +- Runtime JS deployed and SHA-256 verified. After the user opened a fresh Chrome tab, dedicated V38/V39 graphs passed real save/reload, five tab round trips, both/one-axis/unlinked API exports, connected read-only behavior and preserved Manual reserves during actual First Image preview. Editing an upstream INT withdrew V39 Review actions; restoration remains covered by CPU fixtures rather than a new browser restore claim. The original unsaved workflow was preserved. +- User accepted a one-run resolution GPU smoke gate and authorized commit/main publication with README updates. V39 external Core Int 480/640, Manual, existing First Image/Fixed prompt, 1x4 seconds and 20 steps produced 480x640 / 96 frames / 24 fps, with 4-second audio, in 107.318s (Sampling host wall 98.695s). No OOM; all video frames/audio decoded, queue empty. A 2-second proposal was rejected by Core's 4-second minimum before Sampling. The collector's missing per-step WebSocket callbacks were independently verified through the existing Detailed Report (one physical group, 20 steps); original records are preserved. No GPU continuation/quality or broad model acceptance claim. +- Bilingual README explains Manual vs First Image authority, connected displayed reserve values and browser hard-refresh. Package version, official JSONs/ZIPs and historical Releases remain unchanged. Exact local/remote commit IDs and read-back checks will be recorded in an external publication receipt; no new Release or Registry publication. +- Evidence: `D:\Codex\_test_results\ComfyUI-H3-Continuum\issue25-external-int-20261001`. + +## R0 / Fixed conditioning cache reuse — main publication candidate (2026-10-01) + +- Approved scope: Reference-free, Fixed-only V3.9 prompt reuse; no public socket/widget, Sampling, Run Storage, reference routing, official workflow or version change. V3.8 remains unchanged. The user subsequently authorized a main-branch commit/publication and bilingual README update; no Release or Registry publication. +- Authoritative runtime snapshot: `D:\Codex\_snapshots\ComfyUI-H3-Continuum\pre-v39-r0-fixed-cache-20261001_145052` (640 files); source snapshot: `pre-v39-r0-fixed-cache-source-20261001_145125` (513 files). Both changed Production modules matched by SHA-256 before editing. +- `v2/sequence.py` passes the existing cache switch only for resolved Fixed plans. `v3/reference_runtime.py` reuses the existing bounded CLIP cache only when the entire schedule has no selected References, no reference audio/video conditioning, and no terminal-pair policy. Storage/group preflight and per-group metadata remain intact; CLIP special modes and CUDA outputs retain existing uncached fallback. +- CPU: existing focused baseline 27 PASS; the new Fixed integration test showed 2 encodes instead of 1 in old code. After repair focused 49 PASS, full 1558 PASS / 1 skipped. Cache ON/OFF CPU replay preserves latent tensors, seeds and saved descriptors. The first full run had 269 setup errors from inaccessible default temporary storage; a fresh workspace-local basetemp resolved those without Production changes. +- GPU completed after the user's normal backend restart (PID 4832): all 8 planned runs PASS; warm V3.9 hits=2 / encode_calls=0 on all 3 runs. Every run preserves two Sampling calls / 40 steps, seeds, physical geometry and 480x640 / 240-frame / 10-second video+audio. No OOM, queue empty. Warm total medians V38 273.579s / V39 273.779s (+0.200s, +0.073%); ranges overlap. Group preparation V39 0.012874s versus pre-fix 10.762069s (separate session). Sampling host-wall medians 255.961s / 256.350s; not isolated CUDA kernel time. No general quality/Reference/Timeline/long-run claim. +- Final report: `D:\Codex\_test_results\ComfyUI-H3-Continuum\v39-r0-fixed-cache-20261001\gpu_pack\results_20261001_150955\GPU_TEST_REPORT_JA.md`. GPU queue wall sum 2202.594s (36m42.6s). Production Python94 and frozen execution assets remained unchanged during GPU. Publication receipt is recorded separately under that evidence root after remote read-back; no Release/Registry publication. + + ## V3.9.0 main-source publication (2026-09-29) - The authoritative ComfyUI_W worktree was snapshotted before publication to `D:\Codex\_snapshots\ComfyUI-H3-Continuum\pre-v39-main-publication-20260929-20260929_010140` (635 files). The user-selected Workflow (4) remains byte-identical to the supplied JSON (SHA-256 `40199D2500174BA51C040D6983F88D74C4BFBAF19191E728818E6B969B869B0F`). V3.8X2's official JSON and Sampler remain separate. diff --git a/README.md b/README.md index 7848bfd..b071045 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,16 @@ *This V3.8X2 card is retained for comparison. Its “CURRENT MAIN” label describes the time it was made; V3.9 is current now. The V3.8 Sampler and V3.8X2 workflow remain available, but their Reference wiring is not automatically converted to V3.9.* +## External INT Width/Height fix on main (2026-10-01) + +Fixed the visible Width/Height input binding in both V3.8 and V3.9. External INT connections now stay aligned with their displayed controls through workflow save/reload and tab switching. Connected controls are read-only; their displayed numbers are saved Manual reserve values, not a prediction of the upstream node's runtime output. Disconnecting restores local editing. + +To set exact dimensions from Core **Int** nodes, choose **Size Source = Manual** and connect the Width and Height INT inputs. **First Image** still uses the image and Resolution setting; connected dimensions do not override it or automatically change Size Source. If no active First Image is available, the existing Manual fallback applies. Dimension validation and backend input order/defaults are unchanged. + +Validation: **1569 CPU tests passed, 1 skipped**, including 22/22 new frontend regression cases and 60/60 existing Review cases; Chrome save/reload and five tab round trips for both versions. One V3.9 GPU smoke run with external INT values produced exactly **480×640, 96 frames at 24 fps, with 4-second audio** in **107.3 s** (20 sampling steps); the entire saved video decoded successfully. This is a short single-condition check, not long-form or all-model acceptance. Sampling, Run Storage, the earlier Review/cache repairs, official workflow JSONs/ZIPs and historical Releases are unchanged. + +Update Continuum from `main`, then **hard-refresh the browser (Ctrl+F5)** to load the new JavaScript. This fix alone does not require a ComfyUI backend restart; restart normally if the update also brings Python changes or new node definitions. This remains a main-source fix, not a new Release or Registry package. + ## V3.9 performance fix on main (2026-10-01) V3.9 could repeat unnecessary prompt-conditioning preparation when **Prompt Format = Fixed** and **no Reference Images are selected**. This repair reuses the existing bounded conditioning cache when its inputs are unchanged. First Image is supported; List/Timeline prompts, selected Reference Images, Reference Audio, Timeline Video and terminal-pair groups keep their existing paths. This is not the Decode Cache Helper and does not skip Sampling. @@ -32,7 +42,7 @@ In the helper, `All chunks` uses connected images throughout; `Per chunk` provid V3.9.0 is the current source version on `main`. This source update is **not** a new GitHub Release or ComfyUI Registry publication; existing Releases and tags are left in place. Configured 1024×1024 Reference-only GPU/API runs succeeded, but the unchanged default template and browser save/reload remain separate acceptance gates. For a reproducible older environment, use the matching historical Release/tag and workflow; the retained V3.8 Sampler on current `main` specifically supports V3.8X2 workflows. -`pyproject.toml` declares ComfyUI `>=0.32.0`; earlier real-generation/GPU validation used ComfyUI `0.34.2`, and the scoped Fixed cache comparison above used `0.38.0`. The minimum declaration does not establish V3.9 runtime acceptance on 0.32.0. The latest recorded Windows CPU run is `1558 passed / 1 skipped / 0 failed`; the earlier separate Linux rerun report records `1534 passed / 3 skipped / 0 failed` and does not include the new cache tests. Neither replaces browser save/reload or GPU acceptance for the unchanged official template. +`pyproject.toml` declares ComfyUI `>=0.32.0`; earlier real-generation/GPU validation used ComfyUI `0.34.2`, and the scoped Fixed cache comparison above used `0.38.0`. The minimum declaration does not establish V3.9 runtime acceptance on 0.32.0. The latest recorded Windows CPU run is `1569 passed / 1 skipped / 0 failed`; the earlier separate Linux rerun report records `1534 passed / 3 skipped / 0 failed` and does not include the new cache or external INT tests. Neither replaces browser save/reload or GPU acceptance for the unchanged official template. ## V3.9 Reference Images diff --git a/README_JA.md b/README_JA.md index 79900db..7dabe79 100644 --- a/README_JA.md +++ b/README_JA.md @@ -8,6 +8,16 @@ *V3.8X2の画像も比較用に残しています。画像内の「CURRENT MAIN」は作成当時の表記で、現在の`main`はV3.9です。V3.8 SamplerとV3.8X2 Workflowは利用できますが、Reference配線はV3.9へ自動変換されません。* +## main更新:外部INTによるWidth/Height入力の修正(2026-10-01) + +V3.8/V3.9のWidth/Height入力と表示コントロールの対応を修正しました。外部INTの接続位置をWorkflow保存・再読込やタブ切替後も維持します。接続中の欄は編集不可になり、表示する数値は保存済みのManual予備値です。上流ノードが実行時に出す値を推測して表示するものではありません。接続を外すと手動編集に戻ります。 + +Coreの **Int** ノードから正確な幅・高さを指定する場合は、**Size Source = Manual**にしてWidth/HeightのINT入力へ接続してください。**First Image**は引き続き画像とResolution設定からサイズを決めます。INTを接続しても優先順位やSize Sourceは自動で変わりません。有効なFirst Imageがない場合は従来のManualフォールバックを使います。寸法検証、Backend入力順序・初期値は変更していません。 + +確認済み:**全CPU試験1569 PASS/1 skipped**(新Frontend試験22/22・既存Review試験60/60を含む)、両バージョンのChrome保存・再読込とタブ5往復。外部INTを使ったV3.9のGPUテスト1回では、**480×640・24fps・96フレーム・映像/音声とも4秒**を正確に出力しました。20ステップ、全体**107.3秒**で、保存動画の全フレームを正常にデコードできました。短い単一条件の確認であり、長時間継続や全モデルでの受入確認ではありません。Sampling、Run Storage、先行するReview/キャッシュ修正、公式Workflow JSON/ZIP、過去Releaseは変更していません。 + +Continuumを`main`から更新し、**ブラウザーをCtrl+F5で強制更新**してください。このJavaScript修正だけならComfyUI本体の再起動は不要です。同時にPython修正や新ノード定義も更新された場合は通常どおり再起動してください。今回もmainのソース修正で、新Release/Registry公開ではありません。 + ## main更新:V3.9の条件付け準備の速度修正(2026-10-01) **Prompt Format = Fixedかつ有効なReference Imagesがない場合**に、V3.9で余分なプロンプト条件付けの準備が繰り返される経路を修正しました。入力が同じ場合に既存の上限付きconditioningキャッシュを再利用します。First Imageは利用できます。List/Timeline、有効なReference Images、Reference Audio、Timeline Video、終端ペアのgroupは従来の経路を維持します。Decode Cache Helperとは別の修正で、Samplingは省略しません。 @@ -32,7 +42,7 @@ ComfyUIの **Templates → ComfyUI-H3-Continuum** には、今回選んだ[V3.9 V3.9.0は`main`の現行ソースです。今回のmain更新は新しいGitHub ReleaseやComfyUI Registry公開ではなく、過去のReleaseとtagは残します。設定済み1024×1024のReference-only GPU/APIテストは通っていますが、無改変の公式テンプレート初期設定とブラウザー保存・再読込は別の受入項目です。古い環境を厳密に再現するには対応する過去のRelease/tagとWorkflowを使用してください。現行mainにもV3.8 Samplerを残し、V3.8X2 Workflowを使えるようにしています。 -`pyproject.toml`の宣言上はComfyUI `>=0.32.0`ですが、以前の実生成・GPU検証はComfyUI `0.34.2`、上記の限定したFixedキャッシュ比較は`0.38.0`で行いました。最低宣言版でV3.9の実機動作を確認済みという意味ではありません。最新の記録済みWindows CPU試験は`1558 passed / 1 skipped / 0 failed`、以前の別環境Linux再実行報告は`1534 passed / 3 skipped / 0 failed`で、今回追加したキャッシュ試験は含みません。これらは無改変の公式テンプレートの実ブラウザー保存・再読込やGPU受入を代替しません。 +`pyproject.toml`の宣言上はComfyUI `>=0.32.0`ですが、以前の実生成・GPU検証はComfyUI `0.34.2`、上記の限定したFixedキャッシュ比較は`0.38.0`で行いました。最低宣言版でV3.9の実機動作を確認済みという意味ではありません。最新の記録済みWindows CPU試験は`1569 passed / 1 skipped / 0 failed`、以前の別環境Linux再実行報告は`1534 passed / 3 skipped / 0 failed`で、新しいキャッシュ/外部INT試験は含みません。これらは無改変の公式テンプレートの実ブラウザー保存・再読込やGPU受入を代替しません。 ## V3.9 Reference Images diff --git a/REGISTRY_MANIFEST.sha256 b/REGISTRY_MANIFEST.sha256 index a17fa09..50c5ed2 100644 --- a/REGISTRY_MANIFEST.sha256 +++ b/REGISTRY_MANIFEST.sha256 @@ -49,8 +49,8 @@ ecb65a5dbf9e1683c5a3cadd82daaea3a90a2b776f6ebabfbe8b07aa93177422 nodes.py ea64b8e0aa0dda828047c9c12818be8554429774049b9e8c0482c84b9c4f4071 PACKAGE_VALIDATION.txt b470819f16fc179654dc1600721a63f0a5a14e777f4c004d574b499da6886ba5 public_api.py 667f2646e82362d472d91a7cf5dc9a86c95f6637f3bc8c672dd516800b1a598c pyproject.toml -2fc53d560ccf7bab434cc45e8cda2a949b79dd3b21afd430acb4cd4e186d93ca README_JA.md -8a22edc0c3a721aa17eef32db8a9396efc1f0ad3d446525307c1047bb120001e README.md +5dd6e61e08c082ae275d3a9abe34c1402b5e98e75a70ca003f704746db070043 README_JA.md +06dd97ecda8433be631dcf337e12262ff372782c7152c744047273a677962dc8 README.md 44127adcfa30ee84bff9cd4b2d0c695355209550e76982d374122008728aa5bc reference_audio.py 5cb9bfd6810d3a93a637451980a4cc5c1436e5b84cfd1c7a111cd192e876351b reference_video.py caa572ea65dafc86850db99f52433d360ac9c4ab36b854292a3dccd5ba32dc76 reference.py @@ -136,7 +136,7 @@ fefafd4550511d80bd85ade46a0476f0cf3de13ddb94a908dff6b175f2a0e199 web/easy_bypas 9db0aa94f634578a962d5db49e5c70356040a59df968e3a2e531b327a623081f web/easy_load_image.js 35090816ba7470a7255eb85d003b7e79f8a0065982dacf98a18f41c8ebff655d web/easy_load_video.js 0c68d13a1f8beb7431a32b471f8b0612c42fcc4bf72dd97611a025d158008662 web/easy_v38.js -ee8f14ee287422fc913fad7bceee2af412be7cfc5dd62003ddaeff07f2c1ba98 web/project_id.js +c3e2e606af4e5f3e38d64b1338baedea8cadf26060da2a8618e18bf73f220f24 web/project_id.js ae59273f163a116ece418957c557c4fd8c3285e3c60814679b9361d2e6e6fa02 web/reference_audio_ui.js 46c9f75c9462bf26300332448f4431cca801f38964ca0a49bc2c50a88a7cc40f web/reference_image_ui.js e9d7753f313ebbe3d13e477f5b4e4767a735b0619b52ba54bcc5218f3eb7eb7c web/reference_images_v39.js diff --git a/WORKLOG.md b/WORKLOG.md index 053d6af..ad67358 100644 --- a/WORKLOG.md +++ b/WORKLOG.md @@ -2015,3 +2015,29 @@ D:\Codex\_snapshots\ComfyUI-H3-Continuum\pre-rollback-after-00038-fail-20260821_ - Snapshotted the authoritative ComfyUI_W source (635 files) before the version/documentation update. Kept the user's official V3.9 JSON byte-identical and retained the separate V3.8X2 Sampler, workflow JSON and historical GitHub Releases. - Bumped package metadata to 3.9.0, made README EN/JA and install/package guidance V3.9-first, retained V3.8X2 compatibility and both Templates, and reconciled the accepted Timeline Video Experimental documentation from the existing main branch. Updated integrity manifests and release-metadata tests. - Full Windows CPU suite passed `1536 passed / 1 skipped / 0 failed`; `git diff --check` passed. This GitHub main-source publication does not create a tag, new Release, Registry package or new GPU run. Default V3.9 template browser save/reload and GPU acceptance remain pending. + +## 2026-10-01 — Local R0 / Fixed cache repair CPU gate + +- Snapshot verified before changes. Two Production modules now connect reference-free Fixed groups to the existing bounded conditioning cache; no V3.8 execution or public schema changes. +- Baseline 27 PASS; old-code Fixed integration produced two CLIP calls, corrected code one. Added 22 cache/parity/guard cases; focused 49 PASS and full CPU 1558 PASS / 1 skipped after resolving temporary-directory permission errors with a fresh D-drive basetemp. +- GPU conditions and 8-run order are frozen in the local `v39-r0-fixed-cache-20261001/gpu_pack` evidence directory. Backend reload and GPU verification pending; no publication. + +## 2026-10-01 — R0 / Fixed cache GPU completion + +- User restarted ComfyUI_W normally; verified PID 4832 and empty queue, then executed exactly 8 frozen API runs. All successful, no Sampling skip/OOM; all seed/frame/context/AV contracts preserved. Warm V39 cache hits=2, encodes=0 on each of 3 measured runs. +- Same-session warm total V38 273.579s / V39 273.779s (+0.073%), overlapping ranges; Sampling host-wall 255.961s / 256.350s (+0.152%). V39 group preparation 0.012874s versus previous-session 10.762069s. The cache-path fix is confirmed; exact universal performance parity and GPU-kernel claims are not made. +- Existing user backend remains running, runner exited cleanly, no publication. Full evidence and report are in `v39-r0-fixed-cache-20261001/gpu_pack/results_20261001_150955`. + +## 2026-10-01 — R0 / Fixed main publication preparation + +- User authorized main publication after the CPU/GPU gate. Verified main still points to `29e0ce3dd3431ba83ab25f8900e856902ec76c7f`, with the same base tree as this source checkout; saved a verified 10-file pre-publication snapshot. +- Added EN/JA README guidance for the reference-free Fixed cache path, full ComfyUI restart, 1558 CPU PASS / 1 skipped and 8 successful GPU runs. Limited timing claims to the recorded workflow and overlapping post-fix same-session ranges; no universal speed or CUDA-kernel claim. +- Official workflow JSONs/ZIPs, legacy V3.8X2, prior Review repair, package version and historical Releases remain unchanged. Exact local/remote commit IDs and post-publication checks are recorded in a separate publication receipt under the test evidence root. + +## 2026-10-01 — Issue #25 external INT dimensions and main publication preparation + +- Bound current Width/Height input slots to the existing visible Facade after proxy creation, protected linked Manual reserve values and made connected dimension controls read-only. No backend schema, Sampling, Run Storage, Review lifecycle or Fixed cache change. +- Old code failed 20/22 new actual-JS cases; repair passed 22/22, with existing Review fixture 60/60 and focused CPU 217 PASS. Chrome confirmed V38/V39 save/reload, five tab round trips, one/both-axis API links and First Image reserve protection. Actual upstream INT changes still withdraw Review actions. +- Exactly one approved GPU generation completed: V39 480x640 external INT, Manual + First Image, Fixed prompt, 1x4 seconds, 20 steps; 107.318s total / 98.695s Sampling host wall. Saved AV is 4 seconds, 96 video frames at 24 fps; offline full decode passed. Initial 2-second setting was rejected before GPU Sampling. Step count is established by backend diagnostics, not absent WebSocket step callbacks. +- User accepted this resolution smoke gate and requested main commit/push. Added EN/JA README guidance; a verified selected-file pre-publication snapshot protects 10 files. Original workflows/ZIPs, historical Releases and user-managed backend are untouched. Publication receipt and final CPU/integrity results are kept under the Issue25 evidence directory; no new Release/Registry package. +- Final source CPU suite: 1569 PASS / 1 skipped in 106.02s, compileall and diff checks passed. Registry Manifest 143 / development Manifest 419 entries verified; protected Production Python94 and Take metadata hash remain unchanged. Subsequent edits only record these results in documents/manifests and receive the targeted Manifest recheck before commit. diff --git a/tests/frontend_external_int_size.cjs b/tests/frontend_external_int_size.cjs new file mode 100644 index 0000000..6229e48 --- /dev/null +++ b/tests/frontend_external_int_size.cjs @@ -0,0 +1,130 @@ +// Reuse the existing real-production-JS harness; do not copy UI predicates. +const assert = require('node:assert/strict'); +const fs = require('node:fs'); +const path = require('node:path'); +const vm = require('node:vm'); +const ROOT = process.env.H3_TEST_ROOT || path.resolve(__dirname, '..'); +const harness = fs.readFileSync(path.join(__dirname, 'frontend_review_queue.cjs'), 'utf8'); +const marker = harness.indexOf('(async()=>{'); +assert(marker > 0); +const scope = {require, process, console, __dirname, setTimeout, clearTimeout, setImmediate, structuredClone}; +vm.runInNewContext(harness.slice(0, marker) + '\nglobalThis.fixtures={environment,project};', scope); +const {environment, project} = scope.fixtures; +const results = []; +const widget = (e,n,name) => e.w(n,name); +const sources = ['width','height']; +const slot = (name, link=null) => ({name,type:'INT',widget:{name},link}); +function readyInputs(e,n) { + for (const name of ['model','clip','video_vae','sampler','sigmas']) n.inputs.push({name,link:100}); +} +async function test(name, body) { + const e = environment(); + try { await body(e); results.push({name,pass:true}); } + catch(error) { results.push({name,pass:false,error:error.stack}); } + finally { e.close(); } +} +(async()=>{ +for (const nodeClass of ['H3ContinuumSamplerV38','H3ContinuumSamplerV39']) { + await test(`${nodeClass}: current slots bind to dimension and duration Facades`, async e=>{ + const n=e.makeNode(312,'fixture',nodeClass); + for (const [name,label] of [['width','Width'],['height','Height'],['chunks','Chunks'],['chunk_seconds','Seconds per Chunk']]) { + const s=slot(name); n.inputs.push(s); e.f.configureNode(n); + assert.equal(s._widget,e.w(n,label)); + assert.equal(n.getWidgetFromSlot(s),e.w(n,label)); + assert.equal(n.getSlotFromWidget(e.w(n,label)),s); + assert.equal(n.getSlotFromWidget(e.w(n,name)),s); + } + const getter=n.getWidgetFromSlot; e.f.configureNode(n); assert.equal(n.getWidgetFromSlot,getter); + assert.equal(n.inputs.length,4); + }); + await test(`${nodeClass}: restored replacement slots rebind without duplicate sockets`, async e=>{ + const n=e.makeNode(312,'fixture',nodeClass); n.inputs.push(slot('width'),slot('height')); + e.f.configureNode(n); const old=n.inputs; + n.inputs=[slot('width',41),{name:'height',type:'INT',link:42}]; + e.f.configureNode(n); e.f.configureNode(n); + for (const [i,label] of ['Width','Height'].entries()) { + assert.notEqual(n.inputs[i],old[i]); assert.equal(n.inputs[i]._widget,e.w(n,label)); + assert.equal(n.getWidgetFromSlot(n.inputs[i]),e.w(n,label)); + assert.equal(n.getSlotFromWidget(e.w(n,label)),n.inputs[i]); + } + assert.equal(n.inputs.length,2); + }); + for (const linkedAxes of [['width'],['height'],sources]) { + await test(`${nodeClass}: linked ${linkedAxes.join('+')} reserve survives First Image preview`, async e=>{ + const n=e.makeNode(312,'fixture',nodeClass); e.w(n,'width').value=640; e.w(n,'height').value=768; + n.inputs.push(...sources.map((name,i)=>slot(name,linkedAxes.includes(name)?41+i:null)),{name:'first_frame',link:45}); + e.app.graph._nodes.push({id:900,mode:0,imgs:[{naturalWidth:1920,naturalHeight:1080}]}); + e.app.graph.links[45]={origin_id:900,origin_slot:0}; + e.w(n,'size_source').value='First Image'; e.f.configureNode(n); + assert.equal(e.w(n,'size_source').value,'First Image'); + for(const name of linkedAxes) assert.equal(e.w(n,name).value,name==='width'?640:768); + e.w(n,'Size Source').callback('Manual'); e.f.configureNode(n); + for(const name of sources) { + const facade=e.w(n,name==='width'?'Width':'Height'); + assert.equal(facade.disabled,linkedAxes.includes(name)); + if(linkedAxes.includes(name)) { facade.callback(1024); assert.equal(e.w(n,name).value,name==='width'?640:768); } + } + for(const s of n.inputs) if(linkedAxes.includes(s.name))s.link=null; + e.f.configureNode(n); + for(const name of linkedAxes) { + const facade=e.w(n,name==='width'?'Width':'Height'); assert.equal(facade.disabled,false); + assert.equal(facade.value,name==='width'?640:768); facade.callback(1024); assert.equal(e.w(n,name).value,1024); + } + }); + } + for (const linkedAxes of [[],['width'],['height'],sources]) { + await test(`${nodeClass}: Manual summary and API adapter ${linkedAxes.join('+')||'native'}`, async e=>{ + const n=e.makeNode(312,'fixture',nodeClass); readyInputs(e,n); + e.w(n,'run_storage').value='Off'; e.w(n,'width').value=640; e.w(n,'height').value=768; + n.inputs.push(...sources.map((name,i)=>slot(name,linkedAxes.includes(name)?41+i:null))); + e.f.configureNode(n); + const summary=e.w(n,'Ready to Queue').detail; + assert.equal(e.w(n,'Ready to Queue').headline,'Ready to Queue'); + if(linkedAxes.length===2) assert.match(summary,/Width.*Height.*connected/i); + else if(linkedAxes.length===1) { + assert.match(summary,new RegExp(`${linkedAxes[0]}.*connected`,'i')); + assert.match(summary,new RegExp(linkedAxes[0]==='width'?'Height 768':'Width 640')); + } else assert.match(summary,/640.*768/); + const inputs=await e.inputs(n); + for(const name of linkedAxes)inputs[name]=[name==='width'?'901':'902',0]; + const response=await e.api.queuePrompt(0,{output:{[n.id]:{class_type:nodeClass,inputs}},workflow:n.serialize()}); + const actual=e.submissions.at(-1).data.output[n.id].inputs; + for(const name of sources) assert.deepEqual(actual[name],linkedAxes.includes(name)?[name==='width'?'901':'902',0]:name==='width'?640:768); + assert(!Object.hasOwn(actual,'Width')); assert(!Object.hasOwn(actual,'Height')); + await e.emit('execution_success',{prompt_id:response.prompt_id}); + e.w(n,'Size Source').callback('First Image'); e.f.configureNode(n); + const fallback=e.w(n,'Ready to Queue').detail; + if(linkedAxes.length) assert.match(fallback,/Fallback.*connected/i); + else assert.match(fallback,/640.*768/); + }); + } + await test(`${nodeClass}: native reserve and links survive recreated workflow lifecycle`, async e=>{ + const n=e.makeNode(312,'fixture',nodeClass); e.w(n,'width').value=640; e.w(n,'height').value=768; + n.inputs.push(slot('width',41),slot('height',42)); e.f.configureNode(n); + const saved=n.serialize(), savedInputs=JSON.parse(JSON.stringify(n.inputs,(key,value)=>key==='_widget'?undefined:value)); + const nativeCount=saved.widgets_values.length; + for(let i=0;i<5;i++) { + e.app.extension.beforeConfigureGraph?.(); e.app.graph._nodes=[]; + const restored=e.makeNode(312,'fixture',nodeClass,false); e.app.extension.nodeCreated(restored); + restored.configure(saved); restored.inputs=structuredClone(savedInputs); + e.app.extension.loadedGraphNode(restored); await e.finishRestore(); + assert.equal(e.w(restored,'width').value,640); assert.equal(e.w(restored,'height').value,768); + assert.equal(restored.serialize().widgets_values.length,nativeCount); + assert.deepEqual(restored.inputs.map(s=>s.link),[41,42]); + assert.equal(restored.inputs[0]._widget,e.w(restored,'Width')); assert.equal(restored.inputs[1]._widget,e.w(restored,'Height')); + } + }); + await test(`${nodeClass}: external INT edits retain Review safety guard`, async e=>{ + const n=e.makeNode(312,'fixture',nodeClass); + const upstream={id:901,comfyClass:'PrimitiveInt',mode:0,widgets:[{name:'value',value:640}],inputs:[]}; + e.app.graph._nodes.push(upstream); e.app.graph.links[41]={origin_id:901,origin_slot:0}; + n.inputs.push(slot('width',41)); e.w(n,'generation_mode').value='Review Each Chunk'; e.f.configureNode(n); + await e.load(n,project(1)); assert(e.visible(n,'Use it and continue')); + upstream.widgets[0].value=672; n.__h3ContinuumProductionUxRefresh?.(); + assert(e.f.reviewSettingsChanged(n)); assert(!e.visible(n,'Use it and continue')); + upstream.widgets[0].value=640; n.__h3ContinuumProductionUxRefresh?.(); + assert(!e.f.reviewSettingsChanged(n)); assert(e.visible(n,'Use it and continue')); + }); +} +console.log(JSON.stringify(results,null,2)); if(results.some(r=>!r.pass))process.exitCode=1; +})(); diff --git a/tests/test_external_int_size.py b/tests/test_external_int_size.py new file mode 100644 index 0000000..8e0b7e2 --- /dev/null +++ b/tests/test_external_int_size.py @@ -0,0 +1,58 @@ +"""Issue #25 leaves backend dimensions, execution and identity unchanged.""" +import json +import os +import shutil +import subprocess +from pathlib import Path + +import pytest + +from ComfyUI_H3_Continuum_Join.v3.driving_nodes import H3ContinuumSamplerV38, H3ContinuumSamplerV39 +from ComfyUI_H3_Continuum_Join.v3.resolution import resolve_h3_size_source + +ROOT = Path(__file__).resolve().parents[1] + + +@pytest.mark.parametrize('cls', [H3ContinuumSamplerV38, H3ContinuumSamplerV39]) +def test_external_size_schema_remains_native_required_int(cls): + required = cls.INPUT_TYPES()['required'] + assert list(required).index('height') == list(required).index('width') + 1 + for axis in ('width', 'height'): + kind, options = required[axis] + assert kind == 'INT' + assert options['default'] == (736 if axis == 'width' else 416) + assert (options['min'], options['max'], options['step']) == (32, 16384, 32) + assert 'forceInput' not in options and 'defaultInput' not in options + + +@pytest.mark.parametrize('width,height', [(641,768),(640,767),(0,768),(True,768),(640,False),(16416,768)]) +def test_external_resolved_dimension_uses_existing_validation(width, height): + with pytest.raises((TypeError, ValueError)): + resolve_h3_size_source(size_source='Manual', width=width, height=height) + + +def test_external_resolved_dimension_equals_manual_and_missing_first_fallback(): + manual = resolve_h3_size_source(size_source='Manual', width=640, height=768) + assert (manual.width, manual.height) == (640,768) + fallback = resolve_h3_size_source(size_source='First Image', width=640, height=768) + assert (fallback.width, fallback.height) == (manual.width, manual.height) + + +def test_external_dimensions_do_not_override_active_first_image(): + class Image: + shape = (1,1080,1920,3) + expected = resolve_h3_size_source(size_source='First Image', first_frame=Image()) + external = resolve_h3_size_source(size_source='First Image', width=641, height=True, first_frame=Image()) + assert external == expected + + +def test_external_int_frontend_gate(): + runner = shutil.which('node') + assert runner, 'Node.js is required for frontend tests' + result = subprocess.run([runner, str(ROOT/'tests/frontend_external_int_size.cjs')], + env={**os.environ, 'H3_TEST_ROOT':str(ROOT)}, + capture_output=True, text=True, encoding='utf-8', timeout=45) + records = json.loads(result.stdout) + assert len(records) == 22 + failures = [r for r in records if not r['pass']] + assert result.returncode == 0 and not failures, result.stdout + result.stderr diff --git a/tests/test_v38_resolution_preset.py b/tests/test_v38_resolution_preset.py index e1c2eb6..d3e0fb9 100644 --- a/tests/test_v38_resolution_preset.py +++ b/tests/test_v38_resolution_preset.py @@ -415,6 +415,7 @@ def test_size_source_frontend_migrates_legacy_and_disables_the_correct_widgets(t _js_function(source, "setWidgetVisible", "hidePersistentWidget"), _js_function(source, "hidePersistentWidget", "settingValue"), _js_function(source, "attachRefresh", "transientProductionWidgets"), + _js_function(source, "linkedInput", "removeUnusedLegacyInputs"), _js_function( source, "configureResolutionPresetWidgets", diff --git a/web/project_id.js b/web/project_id.js index 61df96d..5b50355 100644 --- a/web/project_id.js +++ b/web/project_id.js @@ -685,6 +685,17 @@ function frameSizeLabel(width, height) { return `${Math.round(Number(width) || 0)} × ${Math.round(Number(height) || 0)}`; } +function manualSizeLabel(node) { + const widthLinked = linkedInput(node, [WIDTH_WIDGET]); + const heightLinked = linkedInput(node, [HEIGHT_WIDGET]); + if (widthLinked && heightLinked) return "Width / Height from connected INT inputs"; + const width = findWidget(node, WIDTH_WIDGET)?.value; + const height = findWidget(node, HEIGHT_WIDGET)?.value; + if (widthLinked) return `Width from connected input • Height ${compactValue(height, 0)}`; + if (heightLinked) return `Width ${compactValue(width, 0)} • Height from connected input`; + return frameSizeLabel(width, height); +} + function requiredConnectionNames(node) { const labels = { model: "Model", @@ -750,15 +761,13 @@ function readySummary(node) { }; } const sizeSource = findWidget(node, SIZE_SOURCE_WIDGET)?.value; - const width = findWidget(node, WIDTH_WIDGET)?.value; - const height = findWidget(node, HEIGHT_WIDGET)?.value; if ( sizeSource === SIZE_SOURCE_FIRST_IMAGE && !activeLinkedInput(node, ["first_frame"]) ) { return { headline: "Check First Image", - detail: `Size Source is First Image, but no active image is connected. Queue fallback: ${frameSizeLabel(width, height)}.`, + detail: `Size Source is First Image, but no active image is connected. ${linkedInput(node, [WIDTH_WIDGET, HEIGHT_WIDGET]) ? "Fallback size" : "Queue fallback"}: ${manualSizeLabel(node)}.`, }; } const chunks = Math.max(1, Number(findWidget(node, CHUNKS_WIDGET)?.value || 1)); @@ -787,7 +796,7 @@ function readySummary(node) { : `${compactValue(chunks)} × ${compactValue(seconds)}s = ${durationLabel(node)}`; const output = sizeSource === SIZE_SOURCE_FIRST_IMAGE ? "First Image" - : `Manual ${frameSizeLabel(width, height)}`; + : `Manual ${manualSizeLabel(node)}`; return { headline: "Ready to Queue", detail: `${duration} • ${output}${reviewing ? " • Review each chunk" : ""}`, @@ -802,6 +811,14 @@ function setWidgetTooltip(widget, tooltip) { } function facadeWidgetTooltip(node, name) { + if ([FACADE_WIDTH_WIDGET, FACADE_HEIGHT_WIDGET].includes(name)) { + const source = name === FACADE_WIDTH_WIDGET ? WIDTH_WIDGET : HEIGHT_WIDGET; + if (linkedInput(node, [source])) return ( + `Connected INT supplies ${name} at execution; the displayed number is the saved Manual reserve. ` + + "Disconnect to edit it. First Image sizing still uses the image and Resolution; " + + "the connected dimension applies only to Manual sizing or a missing-image fallback." + ); + } if (name === FACADE_CHUNKS_WIDGET) { const reviewing = findWidget(node, GENERATION_MODE_WIDGET)?.value === GENERATION_MODE_REVIEW; const chunks = Math.max(1, Number(findWidget(node, CHUNKS_WIDGET)?.value || 1)); @@ -940,6 +957,8 @@ function addFacadeProxyWidget( name, fromSource(source.value), (value) => { + if ([WIDTH_WIDGET, HEIGHT_WIDGET].includes(sourceName) + && linkedInput(node, [sourceName])) return; if (onSet) { onSet(value, source); } else { @@ -976,34 +995,40 @@ function moveFacadeWidgetsToFront(node, orderedNames) { node.widgets.splice(0, node.widgets.length, ...ordered, ...remainder); } -function configureDurationInputSlots(node) { - // Core lays out widget sockets using the direct widget binding, not the - // getWidgetFromSlot override used for drawing and disabled-state lookup. - for (const [source, facade] of [[CHUNKS_WIDGET, FACADE_CHUNKS_WIDGET], ["chunk_seconds", FACADE_SECONDS_WIDGET]]) { - const slot = node.inputs?.find((input) => input.widget?.name === source); - if (slot) slot._widget = findWidget(node, facade); - } - node._widgetSlotsDirty = true; - if (node.__h3ContinuumDurationSlots || typeof node.getWidgetFromSlot !== "function" - || typeof node.getSlotFromWidget !== "function") return; +function configureFacadeInputSlots(node) { const names = new Map([ [CHUNKS_WIDGET, FACADE_CHUNKS_WIDGET], ["chunk_seconds", FACADE_SECONDS_WIDGET], + [WIDTH_WIDGET, FACADE_WIDTH_WIDGET], + [HEIGHT_WIDGET, FACADE_HEIGHT_WIDGET], ]); + // Core lays out widget sockets using the direct widget binding, not the + // getWidgetFromSlot override used for drawing and disabled-state lookup. + // Search current slots on every configure pass: graph restore replaces them. + for (const [source, facade] of names) { + const slot = node.inputs?.find((input) => (input.widget?.name || input.name) === source); + const widget = findWidget(node, facade); + if (slot && widget) slot._widget = widget; + } + node._widgetSlotsDirty = true; + if (node.__h3ContinuumFacadeSlots || typeof node.getWidgetFromSlot !== "function" + || typeof node.getSlotFromWidget !== "function") return; const getWidget = node.getWidgetFromSlot; const getSlot = node.getSlotFromWidget; // Keep Core input names/configuration intact; only map their visible controls. node.getWidgetFromSlot = function(slot) { - const facade = names.get(slot.widget?.name); + const facade = names.get(slot?.widget?.name || slot?.name); return facade ? findWidget(this, facade) : getWidget.call(this, slot); }; node.getSlotFromWidget = function(widget) { for (const [source, facade] of names) { - if (widget?.name === facade) return getSlot.call(this, findWidget(this, source)); + if (widget?.name === facade) return this.inputs?.find( + (input) => (input.widget?.name || input.name) === source, + ) || getSlot.call(this, findWidget(this, source)); } return getSlot.call(this, widget); }; - node.__h3ContinuumDurationSlots = true; + node.__h3ContinuumFacadeSlots = true; } function moveNamedWidgetsToFront(node, orderedNames) { @@ -1090,7 +1115,6 @@ function configureIntuitiveV38Ux(node) { 34, ); const readyWidget = addFacadeInfoWidget(node, FACADE_READY_WIDGET, "ready", 62); - configureDurationInputSlots(node); const outputFacade = addFacadeProxyWidget(node, { type: "combo", @@ -1233,6 +1257,7 @@ function configureIntuitiveV38Ux(node) { ]; node.__h3ContinuumFacadeOrder = orderedNames; moveFacadeWidgetsToFront(node, orderedNames); + configureFacadeInputSlots(node); installProductionSerializationGuard(node); const refresh = () => { @@ -1305,9 +1330,13 @@ function configureIntuitiveV38Ux(node) { customResolution, ); for (const name of [FACADE_WIDTH_WIDGET, FACADE_HEIGHT_WIDGET]) { + const source = name === FACADE_WIDTH_WIDGET ? WIDTH_WIDGET : HEIGHT_WIDGET; + const facade = facadeProductionWidgets(node).find((widget) => widget.name === name); + const connected = linkedInput(node, [source]); + if (facade) facade.disabled = firstImage || connected; setWidgetVisible( - facadeProductionWidgets(node).find((widget) => widget.name === name), - !firstImage, + facade, + !firstImage || connected, ); } setWidgetVisible( @@ -2954,8 +2983,8 @@ function configureResolutionPresetWidgets(node) { ? 1 : 16 / 9; const [width, height] = presetSize(ratio); - widthWidget.value = width; - heightWidget.value = height; + if (!linkedInput(node, [WIDTH_WIDGET])) widthWidget.value = width; + if (!linkedInput(node, [HEIGHT_WIDGET])) heightWidget.value = height; sizeSourceWidget.value = SIZE_SOURCE_MANUAL; }; migrateLegacyAspect(); @@ -2968,12 +2997,14 @@ function configureResolutionPresetWidgets(node) { const firstImage = sizeSourceWidget.value === SIZE_SOURCE_FIRST_IMAGE; const geometry = firstImage ? firstImageGeometry() : null; if (geometry) { - [widthWidget.value, heightWidget.value] = presetSize( + const [width, height] = presetSize( geometry.width / geometry.height, ); + if (!linkedInput(node, [WIDTH_WIDGET])) widthWidget.value = width; + if (!linkedInput(node, [HEIGHT_WIDGET])) heightWidget.value = height; } - widthWidget.disabled = firstImage; - heightWidget.disabled = firstImage; + widthWidget.disabled = firstImage || linkedInput(node, [WIDTH_WIDGET]); + heightWidget.disabled = firstImage || linkedInput(node, [HEIGHT_WIDGET]); presetWidget.disabled = !firstImage; widthWidget.tooltip = firstImage ? "Resolved from First Image at Queue time. The displayed value updates when exact frontend image geometry is available."