Compare commits

...
35 Commits
Author SHA1 Message Date
ketle-manandClaude Sonnet 5 f356826e9f release: v0.3.89 — Lab機能への実動作確認フィードバック3件を反映(Get from Image・スタイル追記・Modelタブフィルター✕)
Get from ImageをLabタブに現在読み込まれている画像から取得する方式に変更。
スタイル適用を{prompt}置換ではなく常時カンマ区切り追記(既存プロンプトを消さない)に変更。
GenerateUI ModelタブのCheckpoint/VAE/Diffusion Model/ControlNet/Hypernetwork/Lora各フィルターに
オーバーレイ✕クリアボタンを追加。詳細はDEVLOG.md参照。

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-09 19:43:33 +09:00
ketle-manandClaude Sonnet 5 003f3408fc release: v0.3.88 — Labタブ Promptセルにスタイル適用・画像/GenerateUIからのプロンプト取得、Checkpoint/VAEフィルター、Plan JSONサブタブを追加
Promptセル編集モーダルにGet from GenerateUI/Get from Image/Styleボタンを追加(Styleは
GenerateUIツールバー上部のチェックボックス・ドロップダウンをそのまま参照)。
Checkpoint/VAEセルにModelタブ同様のフィルター入力+オーバーレイ✕クリアボタンを追加。
Labに3つ目のサブタブ「Plan JSON」を新設し、現在のプランをJSONとして確認・編集・
Settingへ適用できるようにした。詳細はDEVLOG.md参照。

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-09 19:16:19 +09:00
ketle-manandClaude Sonnet 5 54198f196a release: v0.3.87 — GenerateUIタブに実験的なLabサブタブ(I2Iバッチ生成・キーフレーム方式)を追加
Checkpoint/VAE/Prompt/KSamplerを列ごとに独立したキーフレームで管理し、任意の回数目から
値を変更できるI2Iバッチ生成機能。ワークフローを直接書き換えず、実行時にクローンして適用。
Plan Save/Save As/Load(json/pngドロップ対応)、画像連鎖生成、Eagle自動保存連携、
インデックス画像(最大9枚コンタクトシート)に対応。詳細はDEVLOG.md参照。

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-09 12:15:07 +09:00
ketle-manandClaude Sonnet 5 3ff76aacc6 release: v0.3.86 — GalleryMetadataStoreの競合状態を修正
画像を一括生成(I2I)等でメタデータ保存リクエストが短時間に連発すると、バックグラウンドのフォルダインデックススレッドと競合し「dictionary changed size during iteration」が発生していた不具合を修正。GalleryMetadataStoreの共有辞書アクセスをthreading.RLockで保護した。

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-08 15:50:46 +09:00
ketle-manandClaude Sonnet 5 ec8be7ee6f release: v0.3.85 — Generate UI連携ブリッジ(T2I)にデフォルトワークフロー・Negative対応を追加
_wfmReceiveGenerateRequestをI2I/Inpaint連携と同じパターンに拡張し、
negative/workflowData/workflowFilename引数を追加。Comic Creator側の
「画像を一括生成」(T2I)からデフォルトワークフローを指定できるようになった。

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-07 22:53:00 +09:00
ketle-manandClaude Sonnet 5 117fcad22a fix: release v0.3.84 — ernie_t2i.json実行時のPrompt outputs failed validationエラーを修正
サブグラフ境界のwidget値(width/height等)が複数の内部ノードへfan-outする場合
(EmptyFlux2LatentImage.widthへの実ウィジェット注入 + PreviewAny.sourceという
ウィジェット表現を持たないワイルドカード必須入力への中継)、_flattenSubgraphs
のinputPortTargetsが最後の1ターゲットで上書きされ、片方が未接続のまま
Required input is missing: sourceで検証エラーになっていた。全fan-outターゲット
を追跡し、非ウィジェット入力にはリテラル値を直接注入するよう修正。
実サーバーへの/promptバリデーションおよび実ブラウザでのGenerate実行で確認。

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-07 21:45:00 +09:00
ketle-manandClaude Sonnet 5 feed327c23 release: v0.3.83 — Flux.2 Klein / Ernie Imageのプロンプト表示不具合を修正
CLIPTextEncode.textがPrimitiveStringMultilineへのリンク参照になっているパターン
(Metadata/IタブのresolveLinkedTextがvalueキー未対応)と、ComfySwitchNode経由で
生プロンプト/LLM強化版のどちらかに切り替わるErnie Imageのプロンプト強化トグル
(LLM出力は静的解析不能なため両分岐を辿りリテラルへ解決できる方を採用)に対応。
GenerateUIタブ・Metadataタブ・サイドパネルIタブの3箇所を修正し、実ブラウザで
3ワークフローすべての表示を確認。ヘルプにErnie Imageの表記を追加。

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-07 19:31:37 +09:00
ketle-manandClaude Sonnet 5 82ddbb340c release: v0.3.82 — Metadata/Iタブのプロンプト抽出修正・widgets_values/Rerouteバグ修正
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-07 13:17:13 +09:00
ketle-manandClaude Sonnet 5 31f02962f5 ヘルプ・対応フォーマット表記にLongCat/Boogu/HiDream E1/FireRedを追加
GenerateUIタブ(helpGen2)・Metadataタブ(helpMetadata5)のヘルプ、および
Metadataタブ内の対応フォーマット補足(metaFormatTodo)を3言語(EN/JA/ZH)で更新。
併せてmetaFormatTodoにMage-Flowが未記載だった既存の抜けも修正。

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-07 13:10:01 +09:00
ketle-manandClaude Sonnet 5 413f0d5068 MetadataタブとサイドパネルIタブのプロンプト抽出をImage Edit系ワークフローに対応
Flux.2 Klein/LongCat/Boogu/HiDream E1/FireRedをAI TOOL Chatで実際に生成し
Metadataタブで確認したところ、qwen_image_edit2509/2511・longcat・boogu・
Fireredの画像でプロンプトが表示されない問題が見つかった(同じ画像を
GenerateUIタブへ読み込むと正しく表示されるため、GenerateUIタブ側の解析
[comfyui-workflow.js]とは別に実装されているMetadataタブ独自のプロンプト
抽出ロジックが未対応と判明)。

原因は主に2点:
- PNGは`prompt`チャンク(既にAPI形式)が`workflow`チャンクより優先して読まれる
  ため、extractPromptsAPI()のtextMap構築が常に使われるが、そこは"text"/
  "text_g"キーのみを見ており、TextEncodeQwenImageEdit(Plus)/TextEncodeBooguEdit
  が使う"prompt"キーを見ていなかった。
- SamplerCustomAdvancedはpositive/negativeを直接持たずGuiderノード
  (CFGGuider/DualCFGGuider/BasicGuider)経由のため、サンプラーのinputsを
  直接見るだけのrole判定では見つけられなかった(Flux.2 Klein/HiDream E1)。

extractPromptsAPI/extractPromptsFromNodeSet双方に、guider経由のinputsを
辿る処理、TextEncodeBooguEditの1ノード2ロール(prompt/negative_prompt)対応、
InstructPixToPixConditioning経由の追加ホップ解決を追加。node_sets_menu.js
(ComfyUIサイドパネルのIタブ、web/comfyui/はESモジュールをimportできない
制約からcomfyui-workflow.js/metadata-tab.js相当のロジックを`_wfm`接頭辞で
ローカル複製している)にも同じ修正を適用。

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-07 13:02:47 +09:00
ketle-manandClaude Sonnet 5 bec84ac30b release: v0.3.81 — Flux.2 Klein / LongCat / Boogu / HiDream E1 / FireRed Image Edit対応
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-06 17:40:33 +09:00
ketle-manandClaude Sonnet 5 61e16ddce0 Rerouteノードを透過解決し、hidream_comicの400エラーを修正
HiDream E1ワークフロー(hidream_comic.json)はUNETLoaderの出力をBasicScheduler/
DualCFGGuiderへ分岐させるのにRerouteノードを使っていた。RerouteはUI専用の
パススルーノードでComfyUIバックエンドにノードクラスが存在しないため、
そのままAPIペイロードに含めると「missing_node_type」の400エラーになっていた
(実機でGenerateして初めて発覚)。

_resolveBypassSource()をReroute対応に拡張し、Bypass(mode:4)ノードと同様に
配線を実際の入力元まで直結して解決するようにした。Rerouteの入力型は多くの場合
汎用型"*"のまま保存されており、Bypass用の型一致検索では見つからないため、
Reroute(常に1入力1出力)は型チェックを省略して唯一の入力を辿るようにしている。
convertUiToApi本体のノードループでもReroute自体をAPIペイロードから除外する。

実機でGenerate実行し、エラーなく生成できることを確認済み。

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-06 15:39:48 +09:00
ketle-manandClaude Sonnet 5 174a67a569 LongCat/Boogu/HiDream E1/FireRedのImage Editワークフローに対応
GenerateUIタブでの検出範囲を拡張:
- TextEncodeQwenImageEdit(Plus無し版)とFluxGuidance/FluxKontextMultiReferenceLatentMethod
  のCOND_PASSTHROUGH対応(LongCat)
- SamplerCustomをSamplerCustomAdvancedと分離し、自身が持つpositive/negative/cfg/noise_seed
  を正しく読み取るよう修正、TextEncodeBooguEdit対応(Boogu)
- DualCFGGuiderをguiderとして認識(cfg_condsを代表cfg値に)、InstructPixToPixConditioning
  のrole伝播中継に対応(HiDream E1)
- KSamplerのseed/steps/cfg/denoiseがリンク(Primitive経由)で非数値の場合にundefined化

あわせて、サブグラフ展開処理(_flattenSubgraphs)のwidgets_valuesノーマライズを実機検証で
発見した既存バグごと全面的に書き直した。従来は「widgets_values長とwidget数が完全一致する
場合のみ」ノーマライズが働く設計で、seed直後のcontrol_after_generate拡張値('fixed'等)が
挟まるノード(KSampler等)では条件が成立せず、リンクされたwidget(steps/cfg等)のエントリが
除去されないまま後続処理に渡り、cfg/denoiseなどの値が一つずつズレて上書きされていた
(Flux.2 KleinのEmptyFlux2LatentImage、Firered_comicのKSamplerで実際に発生)。
_simulateWidgetValues/_stripLegacyLinkedWidgetValues/_findInjectedWidgetIndexとして、
legacy-full形式かどうかの自動判定・control_after_generate込みの正確な位置計算・注入を
共通ロジックに統一した。

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-06 14:52:04 +09:00
ketle-manandClaude Sonnet 5 d903f33a31 Flux.2 Klein(Advanced Sampling)ワークフローのGenerateUI対応
CFGGuider+RandomNoise+SamplerCustomAdvanced+KSamplerSelect+Flux2Schedulerという
KSamplerを使わない構成を、SamplerCustomAdvanced起点でたどってSettingsパネルの
Seed/Steps/CFG/Sampler欄に集約表示・編集できるようにした。EmptyFlux2LatentImageも
Latentパネルに対応させ、GetImageSizeへリンクされたwidth/heightは空欄+説明表示にして
誤上書きを防止。CFGGuider/BasicGuiderをpositive/negative判定の起点にも追加。

あわせて実機検証で見つかった既存バグを修正:
- サブグラフ内部完結リンク(GetImageSize等)の扱いが誤り、widgets_values変換で
  batch_sizeが1024になったりCLIPTextEncodeのtextが消えたりしていた不具合
- 同ロールのプロンプトノードが複数ある場合にドロップダウン選択とテキスト内容が
  食い違う不具合
- ミュート/バイパスしたサブグラフの内部ノードにmodeが伝播せず、無効なパイプライン
  のノードがModelタブ等のデフォルト表示に紛れ込む不具合

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-05 15:55:55 +09:00
ketle-manandClaude Sonnet 5 afed788537 release: v0.3.80 — Comic Creator Semi-Automatic Manga bridges (LLM prompt draft + batch generate)
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-04 14:14:55 +09:00
ketle-manandClaude Sonnet 5 ee020cb0c0 Comic Creator「半自動マンガ作成」向けブリッジを追加(LLMプロンプト下書き・バッチ画像生成)
gallery-tab.jsに_wfmReceiveLLMPromptRequest/_wfmReceiveGenerateRequestを追加。既存のI2I/Inpaint連携と同じ配置パターンで、Comic Creator側からiframe越しに呼び出される。ai-tab.jsのcallLLM/loadAiSettings/isValidBackendUrlをexportし再利用。

Comic Creator側からKaptureで実機E2E確認済み(Ollama接続でのLLM呼び出し、t2iワークフローでの画像生成とも成功)。

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-03 20:22:18 +09:00
ketle-manandClaude Sonnet 5 f6942eb7fa release: v0.3.79 — AI TOOL Chat Skills (SVG quality + Skill Creator), Help tab card redesign
- AI TOOL Chat: new "Skills" system — selectable .md system-prompt files
  (frontmatter name/description) managed in-pane via a wildcard-manager-style
  list+editor, backed by a new /api/wfm/skills service (skill_service.py /
  skill_routes.py). Bundled with two starter skills: "SVG Icon Generator"
  (explicit part-decomposition technique that fixes unrecognizable SVG output
  from smaller local models) and "Skill Creator" (a meta-skill that
  interviews the user and drafts a new skill as a ```skill block, with a
  one-click "Save as new skill" button).
- Help tab: every page now opens with a title + "Open tab" jump button and
  splits its content into topic-focused cards instead of one long bullet
  list, matching a pattern independently adopted by a sibling project that
  had in turn been modeled on this app's own help UI. Content itself is
  unchanged — only regrouped — except for fixing a duplicated Settings-pane
  bullet and filling in Tagger/Troubleshooting text that only existed in the
  i18n dictionary and never reached the page markup.
- Version bump bundles the previously-committed sidebar Info tab Mage-Flow/
  subgraph fix into this release.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-02 12:02:46 +09:00
ketle-manandClaude Sonnet 5 bdfd0edb7a Sidebar Info tab: match Metadata tab's Mage-Flow/subgraph workflow support
node_sets_menu.js duplicated a convertUiToApi()-equivalent (subgraph
flattening with outer widget value injection, DynamicCombo support) and
added TextEncodeMageFlowEdit-specific prompt handling, mirroring the
v0.3.78 Metadata tab changes — web/comfyui/ can't import static/js/
modules (different serving URL), so the same local-duplication pattern
used for AI backend URL resolution was followed here too.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-07-31 18:45:10 +09:00
ketle-manandClaude Sonnet 5 e1ffadbdca release: v0.3.78 — Eagle SVG support, subgraph workflow support (Mage-Flow), structured AI summary
- Eagle integration: SVG auto-save for both standard SaveSVGNode and comfyui-tosvg's Save SVG String node
- GenerateUI/Metadata tabs: subgraph-containing workflows (Mage-Flow etc.) no longer blocked as unsupported App format; outer subgraph widget values now correctly injected into internal nodes; DynamicCombo widget type support
- Workflow tab: AI summary now uses structured analysis instead of raw JSON truncation; accurate P/I/-> node counts and format badge for newer node types
- Workflow/Gallery tabs: Send to Canvas toast now distinguishes direct-load from drag-required fallback

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-07-31 14:29:24 +09:00
ketle-manandClaude Sonnet 5 65ef71b4ad release: v0.3.77 — Gallery SVG support, Chat SVG generation without a workflow
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-07-30 16:19:19 +09:00
ketle-manandClaude Sonnet 5 49019dfb05 DEVLOGに含まれるユーザー固有のパスを汎用表現に置き換え
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-07-29 13:41:28 +09:00
ketle-manandClaude Sonnet 5 78d9bba904 release: v0.3.76 — Comic Creator I2I execution bridge
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-07-29 13:29:37 +09:00
ketle-manandClaude Sonnet 5 f8435ed770 release: v0.3.75 — Lemonade Server backend support, Bypass/Mute node fix
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-07-26 10:04:09 +09:00
ketle-manandClaude Sonnet 5 b2ef333dfe release: v0.3.74 — Chat image attachment (TOOLS drop zone) + I2I generation
Shares the TOOLS pane's existing image drop zone as the Chat pane's
attachment mechanism: images are sent to the LLM as vision input and,
when generate_image is called, used as the base for image-to-image
generation via a new Chat I2I Generation dedicated workflow setting.
Also adjusts chat bubble image sizing and documents verified models
(Gemma 4:e4b, Qwen 3.5:9b, Ministral 3:3b).

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-07-25 19:25:53 +09:00
ketle-manandClaude Sonnet 5 dfb33e831d release: v0.3.73 — Chat image generation via Tool Calling, Default Checkpoint safeguard
Adds LLM Tool Calling-driven image generation to the AI TOOL Chat pane
(generate_image tool, GenerateUI pipeline reuse, dedicated workflow option,
allow-toggle), plus a Settings > Default Checkpoint safeguard and a fix for
convertUiToApi() silently substituting missing checkpoints without warning.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-07-25 13:03:06 +09:00
ketle-man 64c21b1224 release: v0.3.72 — Comic Creator Inpaint integration, cross-realm Blob fix 2026-07-24 10:54:17 +09:00
ketle-manandClaude Sonnet 5 8f43412e96 release: v0.3.71 — Inpaint機能追加(GenerateUI マスクスロット・Image Edit Inpaintタブ・Mask Editor One対応・専用ワークフロー)
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-07-23 20:40:13 +09:00
ketle-manandClaude Sonnet 5 b1e665b46b release: v0.3.70 — Ollama summary fix, Image Edit Layer 1 + mask overlay, GenerateUI prompt revert & weight editing
- Workflow AI summary: use the Ollama URL/model saved in Settings instead of a
  hardcoded default model tag that caused a 404 against locally installed models
- Image Edit: New button now auto-adds an empty Layer 1 (matching image-load behavior)
- Image Edit: mask overlay is now shown only for the active mask layer
- GenerateUI Input: Revert button (↺) next to Apply reverts the textarea to the
  node's currently applied value
- GenerateUI Input: Ctrl+Up/Down adjusts prompt emphasis weight in (text:weight)
  syntax by ±0.05, A1111/native ComfyUI style
- Comic Creator I2I integration (window._wfmReceiveImageForI2I) carried over from
  v0.3.69 that had been implemented but not yet committed

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-07-16 00:59:41 +09:00
ketle-manandClaude Sonnet 5 335ee517cc release: v0.3.69 — Lora batch fixes, prompt auto-sync, Comic Creator Send CC
Lora batch generation:
- Fix `Prompt outputs failed validation` errors for LoRAs that actually
  exist. Root cause: ComfyUI on Windows returns `\`-separated LoRA enum
  values while WFS tracked LoRAs internally with `/`. Added a shared
  `comfyEditor.resolveLoraName()` helper and applied it consistently to
  Lora Single apply, Stack apply, the Models tab GenUI Model button, and
  Lora batch generation.
- Add a pre-flight check before batch runs on standard LoraLoader
  workflows: warns if a selected LoRA isn't yet recognized by ComfyUI's
  model list (suggests Refresh/restart) instead of silently failing
  each queued prompt.
- Batch-applied LoRAs now auto-append their `<lora:...>` syntax and
  CivitAI trained words to the Positive prompt, rebuilt from the
  original prompt each time (not accumulated), and restore the prompt
  to its pre-batch state on completion, stop, or error.

Models tab:
- Add a Close button to the model detail modal's button row (next to
  Save / GenUI PP·NP / Delete) to cut down on mouse travel during
  repeated batch edits.

Gallery tab:
- Add Send CC button (shown only when embedded as an iframe inside
  ComfyUI Comic Creator, renamed from "Comic Creater") that sends the
  selected image into Comic Creator's selected panel/overlay via its
  existing insertImageFromUrl(url) helper.

Help / docs:
- New help entry helpGen19 (EN/JA/ZH) describing the Lora batch prompt
  sync, restore, and pre-flight check behavior.
- README and DEVLOG updated for v0.3.69.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-07-12 22:21:49 +09:00
ketle-manandClaude Sonnet 5 8509eee527 release: v0.3.68 — MASK EDITOR ONE section always visible
Show the MASK EDITOR ONE / MASK EDITOR ONE (COLOR) properties section
at all times in Draw and Mask Paint mode, instead of hiding it when no
ABR brushes are imported yet. Header text is green when brushes are
available and gray otherwise, with the Select button disabled until a
brush exists. Prompted by a report that ABR brushes "don't show up" —
SAM3/BiRefNet were confirmed working; the real cause was an empty
brushes/ folder hiding the whole section.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-07-01 19:18:10 +09:00
ketle-manandClaude Sonnet 4.6 202deab5d6 release: v0.3.67 — Alt+Click Apply & Generate
GenerateUI タブの Apply ボタンを Alt+Click すると Apply と Generate を
1操作で実行できる機能を追加。

- Positive Prompt / Checkpoint / KSampler 等の Apply ボタン対象
- Apply 成功時のみ生成をトリガー(ノード未存在時は何もしない)
- カスタムイベント (wfm:apply-and-generate) 経由で循環参照を回避
- ボタンに title 属性でヒントを表示
- ヘルプ helpGen18 を EN/JA/ZH で追加

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-30 22:15:03 +09:00
ketle-manandClaude Sonnet 4.6 8a86895262 release: v0.3.66 — Mask ツール 5サブツール追加(Color / Alpha / Text / Vector / Shape)
- Image Edit — Mask Tool: 5つの新サブツールを追加(すべて Mask Editor One 不要)
  - Color: クリック位置の色類似度でマスク選択(Tolerance / Feather / Mode)
  - Alpha: 画像の透明チャンネルをマスクとして抽出(Threshold / Invert / Extract Alpha)
  - Text: テキストスタンプマスク(Font / Size / Bold / Italic / Align / Mode、Ctrl+Enter確定)
  - Vector: Catmull-Rom スプラインポリゴン(Enter 確定 / Backspace 取消 / Esc リセット)
  - Shape: 矩形・楕円ドラッグ描画(Shift で正方形/正円、青点線プレビュー)
- Image Edit — MaskEditorOneTools.js 新規作成(5クラス + MASK_TEXT_FONTS 定数)
- Image Edit — DrawTool: ABRブラシ対応(spacing / angle / sizeJitter / rotationJitter)
- Image Edit — LayerManager: マスクレイヤーサムネイルをグレースケール(黒背景)表示に変更
- Image Edit — レイヤーアイコンの明度改善(opacity 0.5 → 0.85)
- Help — Support ページに ComfyUI Image Feeder・Mask Editor One リポジトリリンク追加
- Help — ヘルプ i18n 更新(英 / 日 / 中 3言語、mask-9〜mask-13 新規追加)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-29 17:28:35 +09:00
ketle-manandClaude Sonnet 4.6 cbec20633e release: v0.3.65 — Mask Editor One 連携修正・トップバーアイコン修正・Mask ABRブラシ対応
- Mask Editor One store_image API フィールド名不一致修正 (image_b64 → bg_image_b64、後方互換対応)
- トップバーアイコン消滅バグ修正: MutationObserver でVue再レンダリング後もSVGを再適用
- Mask Tool ABRブラシライブラリ対応 (Mask Editor One v0.1.9+ 必須)
  - プロパティパネルに Select ボタン・Spacing・Angle・Sz Jitter・Rot. Jitter コントロール追加
  - ABRボタンをオプションバーからプロパティパネルに移動
  - ブラシサイズJitter時の0px防止 (IndexSizeError修正)
- Mask ブラシカーソルをキャンバス外では非表示に
- ヘルプ更新: Mask Tool (SAM3・ABRブラシ) / BG Remove (BiRefNet) / i18n 3言語
- README 更新: v0.3.65 / Mask Editor One 必須要件・機能説明追記
- DEVLOG 更新: v0.3.65 エントリ追加

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-29 12:04:20 +09:00
ketle-manandClaude Sonnet 4.6 8b82a3103d feat: Image Edit mask Add/Subtract, BiRefNet BG Remove, SAM3 segmentation
- LayerManager: add `operation` property (add/subtract) to mask layers with toJSON/fromJSON support and toggleOperation()
- _updateCompositeView: detect consecutive maskApply mask groups, composite with lighten(add)/destination-out(subtract) matching Mask Editor One logic
- Layer panel: A/S toggle button on mask layers (green=add, red=subtract); sync MaskTool.mode on layer select
- BG Remove: BiRefNet option via Mask Editor One API (store_image → birefnet/remove_bg → grayscale-to-RGBA)
- Mask tool: SAM3 button with text prompt, max masks selector, multi-select thumbnails, Add/Erase mode, Apply Selected
- Bugfix: maskApply mask at layers end (no target) now falls back to overlay-only instead of disappearing
- Bugfix: brush cursor dot appearing outside Image Edit tab (rect.width===0 guard)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-28 16:15:29 +09:00
ketle-manandClaude Sonnet 4.6 d70905d032 fix: Image Edit ツールメニューを画像読み込み前にも表示
Select/Draw/Text/Shape の _renderToolOptions 条件に
this._xxxTool の存在チェックが含まれており、画像読み込み前は
全ツールが null → else(coming soon)に落ちていた。

コンストラクタでデフォルト値で早期初期化することで修正。
_initCanvases() での再生成と衝突しない。

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-28 14:11:00 +09:00
45 changed files with 12567 additions and 657 deletions
+1100 -2
View File
File diff suppressed because it is too large Load Diff
+313 -32
View File
@@ -3,58 +3,63 @@
A comprehensive workflow, asset management, and generation UI plugin for [ComfyUI](https://github.com/comfyanonymous/ComfyUI).
**📁 Management** — organize all your assets in one studio
- Workflow, model, image, and prompt management
- AI-powered prompt writing assistance, translation, and tag generation
- File drop & Gallery-linked metadata viewing — inspect and reuse generation settings instantly
**⚡ GenerateUI** — a productivity-focused generation tab connected to every other tab
- Batch generation across models, samplers, prompts, and workflows
- Image Feeder for continuous folder-based generation
- Lab: experimental I2I batch generation with independent per-iteration keyframes for Checkpoint/VAE/Prompt/KSampler
**📚 Workflow Studio Library** — a multi-function side panel for smooth ComfyUI integration
- Drag & drop models, nodes, prompts, and workflows straight onto the canvas
- **Send to Canvas**: click "Send to Canvas" (Workflow tab) or "Copy & Send Canvas" (Gallery tab) to send the workflow directly to the ComfyUI canvas — UI and API formats both supported
- View metadata from images / JSON, then drop the detected models and prompts onto the canvas
- Built-in AI tools (translation and more)
![Workflow Studio](https://img.shields.io/badge/ComfyUI-Custom_Node-blue)
![Version](https://img.shields.io/badge/version-0.3.63-green)
![Version](https://img.shields.io/badge/version-0.3.89-green)
## Screenshots
| Workflow Tab | Models Tab |
|:---:|:---:|
| Workflow Tab | Models Tab |
| :-------------------------------------: | :---------------------------------: |
| ![Workflow Tab](docs/1_workflowtab.png) | ![Models Tab](docs/2_modelstab.png) |
| Prompt Input Assistance | Gen UI Feeder |
|:---:|:---:|
| Prompt Input Assistance | Gen UI Feeder |
| :----------------------------------------------------------: | :---------------------------------------: |
| ![Prompt Input Assistance](docs/3_PromptInputAssistance.png) | ![Gen UI Feeder](docs/4_GenUI_feeder.png) |
| GenUI LoRA Stack | GenUI Batch |
|:---:|:---:|
| GenUI LoRA Stack | GenUI Batch |
| :---------------------------------------------: | :-------------------------------------: |
| ![GenUI LoRA Stack](docs/9_GenUI_LoraStack.png) | ![GenUI Batch](docs/10_GenUI_Batch.png) |
| Models Multi-select Menu | Top Bar |
|:---:|:---:|
| Models Multi-select Menu | Top Bar |
| :-----------------------------------------------------------: | :---------------------------: |
| ![Models Multi-select Menu](docs/11_multiple_select_menu.png) | ![Top Bar](docs/5_topbar.png) |
| WS Library | Library Information |
|:---:|:---:|
| WS Library | Library Information |
| :----------------------------------: | :---------------------------------------------------: |
| ![WS Library](docs/6_ws_library.png) | ![Library Information](docs/7_library_Infomation.png) |
| Tagger Tab | Image Edit Tab |
|:---:|:---:|
| Tagger Tab | Image Edit Tab |
| :-------------------------------: | :--------------------------------------: |
| ![Tagger Tab](docs/12_Tagger.png) | ![Image Edit Tab](docs/13_ImageEdit.png) |
| Customize | |
|:---:|:---:|
| ![Customize](docs/8_Customize.png) | |
| Customize | |
| :--------------------------------: | :-: |
| ![Customize](docs/8_Customize.png) | |
---
## Features
### Workflow Tab
- **Thumbnail / Table views** — switch between view modes to browse your workflow library
- **Thumbnail side panel** — preview workflow canvas snapshots in the side panel
- **Badge filtering** — filter by user-defined badges (free labels you assign to each workflow)
@@ -68,18 +73,24 @@ A comprehensive workflow, asset management, and generation UI plugin for [ComfyU
- **Clear all filters (✕ Clear)** — rightmost toolbar button; resets search text, group filter, and badge filter (ALL) in one click
### Canvas Snapshot (v0.1.2)
- **One-click capture** — click the camera button in ComfyUI's top bar to snapshot the current workflow canvas
- **Auto-save as thumbnail** — the snapshot is saved directly to the workflow data folder as a PNG thumbnail
- **Embedded workflow metadata** — workflow JSON is embedded in the PNG (tEXt chunk), compatible with ComfyUI's drag-and-drop import
- **Auto-import** — the captured workflow is automatically imported and appears in the Workflow tab
### GenerateUI Tab (v0.3.5)
- **5-tab layout** — Input / Model / Settings / Feeder / Batch tabs; Input, Model, and Settings each include a Raw JSON column on the right for instant preview and direct editing
- **6-tab layout** — Input / Model / Settings / Feeder / Batch / **Lab** tabs; Input, Model, and Settings each include a Raw JSON column on the right for instant preview and direct editing
- **Save button** — located at the right end of the subtab row; opens a filename dialog (default: current workflow name) and saves the current workflow as a `.json` file to the Workflow tab via the import API
- **Input tab** — Prompt and Image inner tabs (drag-and-drop upload); Prompt tab shows Positive Prompt and Negative Prompt textareas, plus an **Embeddings selector** at the bottom (Filter + Select + Weight input + Paste button); Paste inserts `(embedding:Name:weight)` at the cursor position of the last focused textarea (defaults to Positive when neither is focused); Raw JSON (540px) in the right column
- **Revert button** (v0.3.70) — a ↺ button next to each Apply button reverts the textarea to the node's currently applied value (the reverse of Apply)
- **Emphasis weight editing** (v0.3.70) — select text (or just place the cursor on a word/parenthesis block) and press Ctrl+↑/↓ to adjust `(text:weight)` by ±0.05, A1111/native-ComfyUI style; parentheses are removed automatically when the weight returns to 1.0
- **Mask slot for inpainting** (v0.3.71) — LoadImage slots whose MASK output feeds an inpaint node (e.g. `VAEEncodeForInpaint`) show an additional Mask drop zone; when a mask is set, image + mask are composited into a single RGBA upload (mask baked into the alpha channel) matching ComfyUI's native alpha→MASK extraction — no extra nodes required
- **Model tab** — Checkpoint, VAE, LoRA, ControlNet, Diffusion Model (UNETLoader / UnetLoaderGGUF / LoaderGGUF), Text Encoder (CLIPLoader / DualCLIPLoader / ClipLoaderGGUF / DualClipLoaderGGUF — single clip: type + device; dual clip: two clip selectors + type + device), **Hypernetwork** (with Strength field) selectors with filter; Raw JSON on the right
- **Settings tab** — KSampler and Latent Image side by side at 50% width each; Raw JSON on the right
- **Always-visible Raw JSON** — edit the API-format JSON directly from any tab with syntax highlighting; Apply button reloads the workflow; built-in **search bar** (always shown) finds all matches as you type with count display (`3/12`); navigate with ↑/↓ buttons or Enter / Shift+Enter; Escape or ✕ clears; current match highlighted in orange, other matches in yellow
- **Bypass/Mute node handling** (v0.3.75) — loading a UI-format workflow with Bypass-mode nodes now reroutes their wires to the upstream source (matching same-type input/output slots, recursively through chained bypasses) instead of leaving a dangling reference that failed validation; Mute-mode nodes are excluded without rerouting, same as ComfyUI itself; when either is present, a note listing the affected nodes appears above the Raw JSON search bar in the Input/Model/Settings tabs
- **One-click generation** — queue prompts to ComfyUI without leaving the studio
- **Seed control** — randomize, lock, or manually set seeds; seed input and mode selector stacked vertically for readability
- **Style selector** — checkbox and dropdown next to the Reset Workflow button; enable to apply a Fooocus-style JSON to positive and negative prompts at generation time; style files (`*.json`) are loaded from `user/default/Workflow-Studio/style/`; the style's `{prompt}` placeholder is replaced with the original prompt text, or the style is appended if no placeholder exists; `negative_prompt` is appended to the existing negative prompt; styles are applied to a per-generation copy and do not modify the loaded workflow
@@ -88,13 +99,16 @@ A comprehensive workflow, asset management, and generation UI plugin for [ComfyU
- **Left pane** — 4 tabs: **Checkpoints** (file-tree; Filter / All / None), **Sampler** (KSampler sampler list), **Scheduler** (KSampler scheduler list), **Style** (flat list of all styles from `Workflow-Studio/style/`; All / None buttons)
- **Center pane** — group-based selection with inner tabs (Checkpoint | Lora | Prompt | Workflow); Checkpoint/Lora groups come from the Models tab, Prompt groups from the Prompt tab, Workflow groups from the Workflow tab — check a group to add all its members, expand ▶ to select individually
- **Right pane (Batch Queue)** — 7 columns: Checkpoint / Lora / Prompt / Workflow / Sampler / Scheduler / **Style**; each column header has an enable checkbox (radio behavior: only one at a time); count shown per column; Style batch applies each selected style sequentially to a workflow copy
- **UI-to-API conversion** — automatic conversion supporting subgraphs (nested workflows), COMBO types, and display-only node exclusion; improved analysis covers SDXL multi-hop CONDITIONING chains, CLIPTextEncodeSDXL, SDXLPromptStyler, KSamplerAdvanced, and more
- **Lora batch prompt sync** (v0.3.69) — for each selected LoRA, its syntax (`<lora:name:strength_model:strength_clip>`) and CivitAI trained words are automatically appended to the Positive prompt (rebuilt from the original prompt each time, not accumulated), then restored to the pre-batch state when the batch completes or is stopped; if a selected LoRA is not yet recognized by ComfyUI's model list, a warning toast suggests a Refresh or restart
- **UI-to-API conversion** — automatic conversion supporting subgraphs (nested workflows), COMBO types, and display-only node exclusion; improved analysis covers SDXL multi-hop CONDITIONING chains, CLIPTextEncodeSDXL, SDXLPromptStyler, KSamplerAdvanced, and Guider-based "Advanced Sampling" workflows (`SamplerCustomAdvanced`/`SamplerCustom` + `CFGGuider`/`DualCFGGuider`/`BasicGuider` + `RandomNoise` + `KSamplerSelect` + `*Scheduler` — Flux.2 Klein, LongCat, Boogu, HiDream E1, etc.)
- **Eagle integration** — auto-save generated images to [Eagle](https://eagle.cool/) with metadata
### Feeder subtab (v0.3.5 / v0.3.42)
Two independent modes selectable via **[Image Loop] / [Gallery]** toggle buttons at the top of the left pane (persisted in `localStorage`).
**Image Loop mode** — requires the **[comfyui-image-feeder](https://github.com/ketle-man/comfyui-image-feeder)** custom node.
- **ImageFeeder node control** — select the target node from a dropdown auto-populated from the loaded workflow; edit all node parameters (Directory, Sort Mode, Index, Start/End Index, Batch Size, Seed, Use Selection) and Apply to the workflow
- **Image library** — 3-pane layout: folder tree (left) browsing `user/default/image-loop-data/`, image grid with checkbox selection (center), preview panel with resolution and file size (right)
- **Selection management** — check individual images; All / None buttons for the current folder; selected files are reflected in `selected_files` on Apply
@@ -107,13 +121,29 @@ Two independent modes selectable via **[Image Loop] / [Gallery]** toggle buttons
- **Seed** — Run loop uses the right-pane seed setting (Random / Fixed / Increment / Decrement); the node's own Seed field only affects random sort order
**Gallery mode** (v0.3.42) — no external plugin required; uses the built-in **WFS_GalleryFeeder** custom node.
- **WFS_GalleryFeeder node** — reads images directly from a Gallery group and outputs them one at a time; inputs: `group_name`, `index`, `sort_mode` (filename_asc / filename_desc / random), `seed`
- **Node & group selector** — pick the WFS_GalleryFeeder node from the loaded workflow and choose which Gallery group to feed images from; `__Feeder__` group is auto-created on first open
- **Image grid** — center pane shows all images in the selected group; click any image to update the Index to that position
- **After Gen modes** — Loop (wrap at end and continue indefinitely), Increment (stop automatically when last image is reached), Fixed (always use the same index)
- **Run / Stop controls** — left pane Run / Stop buttons manage the generation loop; After Gen combo (loop / increment / fixed), ▶ Run, and ■ Stop widgets are also available directly on the WFS_GalleryFeeder node in the ComfyUI canvas (`gallery_feeder_extension.js`)
### Lab subtab (v0.3.87 – v0.3.89)
An experimental I2I batch generator: runs the workflow currently loaded in GenerateUI N times, letting Checkpoint / VAE / Prompt / KSampler each change independently starting at a chosen iteration — unlike the Batch tab's single-axis queue, every column keeps its own list of change points. Never mutates the loaded workflow; every iteration runs on a fresh clone.
- **Setting / Results / Plan JSON sub-panels** — Setting: image drop zone + 4 keyframe columns + run controls; Results: source image and up to 9 generated thumbnails (click to enlarge); Plan JSON: the current plan as raw editable JSON (v0.3.88)
- **Per-column keyframes** — Checkpoint, VAE, Prompt, KSampler each hold an independent list of `{iteration, value}` keyframes; +/− per column adds/removes a keyframe (iteration #1 is fixed and can't be removed); click a cell to edit its value, the iteration it starts applying from, and a "revert to #1's setting" checkbox; the effective value at iteration N is the latest keyframe with iteration ≤ N, carried forward until the next one changes it
- **Checkpoint / VAE cell filtering** (v0.3.88) — a Filter... box above the value dropdown narrows the list live, same as GenerateUI's Model tab; overlay ✕ clear button matches the Models/Nodes/Workflow/Gallery tab search boxes
- **Prompt cell extras** (v0.3.88, refined in v0.3.89) — **Get from GenerateUI** fills Positive/Negative from the workflow currently loaded in GenerateUI; **Get from Image** extracts a prompt from the image currently loaded in Lab's own Image drop zone (same detection as the Metadata tab; no separate file picker); **Style** appends whichever style is currently selected in GenerateUI's own top-bar Style checkbox/dropdown to the Positive/Negative text below, comma-separated after any existing text — it never clears what's already there (Lab has no separate style picker of its own)
- **Use generated image for next** — optional checkbox that chains iterations: from iteration 2 onward the previous iteration's first output image is fed back in as the I2I source instead of the original dropped image, using ComfyUI's `"name [type]"` annotated-filename reference (no re-upload needed)
- **Plan files** — Plan Save (silently overwrites the loaded plan) / Save As (always asks for a new name) / Plan Clear; plans are stored as `<name>.json` in `user/default/Workflow-Studio/lab_plan/`, alongside an auto-generated `<name>.png` index image (a 3-per-row contact sheet of up to 9 result thumbnails)
- **Plan Load** — same drag-and-drop / click-to-browse drop zone as the Image slot; drop a plan's `.json` (read directly in the browser) or its `.png` index-image thumbnail (fetches the matching `.json` by filename)
- **Plan JSON tab** (v0.3.88) — view/edit the current plan as raw JSON (same shape saved to disk); Refresh re-reads it from the Setting tab, Apply to Setting parses your edits and writes them back into the Setting tab's columns/note/batch/chain-image/source-image/results — the same effect as loading that JSON as a plan file, without saving it first
- **Eagle integration** — every image Lab generates is auto-saved to Eagle the same way as GenerateUI's own Generate button, if enabled in the Settings tab
### Prompt Tab
- **3-column layout** — AI Assistant (left), Presets/Preset Manager tab-panel (center), Wildcard support (right)
- **AI chat assistant** — powered by [Ollama](https://ollama.com/), generate and refine prompts interactively
- **Image attachment** — attach reference images for vision-capable models
@@ -127,16 +157,18 @@ Two independent modes selectable via **[Image Loop] / [Gallery]** toggle buttons
- **Wildcard file manager** — create, view, and edit `.txt` / `.yaml` wildcard files stored in `user/default/Workflow-Studio/wildcard/`; click a filename in the file picker to insert `__filename__` at cursor
### Metadata Tab (v0.3.8)
- **3-column layout** — Drop zone (left) | Model info (center) | LoRA + Prompt (right)
- **File drop** — drop a ComfyUI-generated PNG / WebP or workflow JSON onto the drop zone (or click to open a file picker); PNG/WebP images are shown as a preview
- **Model extraction** — automatically extracts Checkpoint, VAE, Diffusion Model, and Text Encoder names from the workflow; supports both standard and subgraph-based workflows (Flux.2 Dev/Klein, Qwen-Image-Edit/2511/Layered, Z-Image Base/Turbo, Ernie Image, WAN2.2); node types covered: UNETLoader, UnetLoaderGGUF, UNETLoaderGGUF (e.g. HiDream GGUF), CLIPLoader, DualCLIPLoader, TripleCLIPLoader, QuadrupleCLIPLoader (e.g. HiDream 4-CLIP)
- **Model extraction** — automatically extracts Checkpoint, VAE, Diffusion Model, and Text Encoder names from the workflow; supports both standard and subgraph-based workflows (Flux.2 Dev/Klein, Qwen-Image-Edit/2511/Layered, Z-Image Base/Turbo, Ernie Image, WAN2.2, Mage-Flow, LongCat, Boogu, HiDream E1, FireRed); node types covered: UNETLoader, UnetLoaderGGUF, UNETLoaderGGUF (e.g. HiDream GGUF), CLIPLoader, DualCLIPLoader, TripleCLIPLoader, QuadrupleCLIPLoader (e.g. HiDream 4-CLIP)
- **LoRA extraction** — lists all LoRA models with `strength_model / strength_clip` values
- **Prompt extraction** — lists prompts with POS / NEG badges when positive/negative can be determined; when distinction is not possible (e.g. `SamplerCustomAdvanced`, intermediate nodes, cross-level connections), prompts are shown without a badge as plain **Text**; click any entry to view the full text below
- **Prompt actions** — Copy to clipboard, **GenUI:P/N** (set GenerateUI positive/negative prompt), **Prompt:P/N** (set Prompt tab preset positive/negative)
- **Format support** — ComfyUI PNG/WebP/JSON (standard + Flux.2 / Qwen-Image / Z-Image / Ernie Image / WAN2.2 subgraph workflows), SD WebUI, SD Forge, Fooocus
- **Format support** — ComfyUI PNG/WebP/JSON (standard + Flux.2 / Qwen-Image / Z-Image / Ernie Image / WAN2.2 / Mage-Flow / LongCat / Boogu / HiDream E1 / FireRed subgraph workflows), SD WebUI, SD Forge, Fooocus
- **Format note** — supported formats and covered model types are always shown in the left column
### Settings Tab
- **2-column layout** — left column for all settings; right column shows the Theme panel fixed in place (sticky)
- **Collapsible sections** — all settings organized in accordion panels for a clean layout
- **Theme selection** — 13 built-in themes with visual swatch preview (Dark, Pop, Minimalist, Cyberpunk, Glassmorphism, Neumorphism, Retro Pixel, Pastel, Brutalism, Earthy, Material, Monotone, Corporate)
@@ -148,6 +180,7 @@ Two independent modes selectable via **[Image Loop] / [Gallery]** toggle buttons
- **CivitAI Host** — choose which site opens when clicking a model link: `civitai.com` (SFW only) or `civitai.red` (unrestricted); saved to `settings.json` and synced to `localStorage` for the Models tab to use without extra fetches
- **CivitAI API Key** — optional Bearer token for authenticated CivitAI access; stored in `settings.json` (excluded from data exports); environment variable `CIVITAI_API_KEY` takes priority if set
- **Default workflow** — set a workflow to auto-load on startup
- **Default Checkpoint** (v0.3.73) — optional checkbox to force every checkpoint loader node's model to a chosen default whenever a workflow is loaded into GenerateUI; a safeguard against generation errors or garbled images from a stale/mismatched checkpoint saved in the workflow file
- **Data Management** — export all plugin data (settings, metadata, prompts, etc.) to a single JSON file; import to restore data (useful when migrating or reinstalling); API keys are excluded from exports for security
- **Text Size** — one slider (10–28 px) adjusts font size for all prompt and chat textareas at once: Generate UI positive/negative prompts, AI Assistant chat input, Preset prompts, Wildcard prompt and file editor, and Metadata prompt full preview; takes effect immediately and saved with Save Settings
- **RAW JSON Colors** — customize the 6 syntax highlight colors for the Raw JSON editor in Generate UI: Default Text (base), Name/Scheduler (yellow), Title (pink), Width/Height (green), Prompt/Text (cyan), Image/File (red); changes apply immediately on color pick; Reset Defaults restores the original scheme; saved to `localStorage` under `wfm_settings.jsonColors` and applied on startup
@@ -156,6 +189,7 @@ Two independent modes selectable via **[Image Loop] / [Gallery]** toggle buttons
- **Language** — English / Japanese / Chinese
### Gallery Tab (v0.3.44)
- **Image browser** — browse ComfyUI output images (Thumbnail / Table views) with server-side scanning optimized for 6,000+ image libraries
- **Thumbnail / Table views** — switch view modes; Favorites column shown leftmost in Table view
- **Folder management** — create subfolders ("+ New") or delete the selected folder with all contents ("Del") from the folder tree header
@@ -173,13 +207,16 @@ Two independent modes selectable via **[Image Loop] / [Gallery]** toggle buttons
- **Load GenUI button** — loads the embedded ComfyUI workflow from the selected image directly into the GenerateUI tab; shows a warning toast if no workflow is embedded or the format is unsupported; Metadata button is styled green, Load GenUI button uses the primary accent color
- **Image Edit button** — toolbar button; sends the selected image directly to the Image Edit tab as the base layer
- **Send GenUI Image button** — toolbar button (next to Image Edit); uploads the selected image to ComfyUI and sets it as the input for the first LoadImage node in the GenerateUI tab; automatically switches to GenerateUI → Input → Image; requires a workflow with at least one LoadImage node to be loaded
- **Send CC button** (v0.3.69) — toolbar button, shown only when this Gallery tab is embedded as an iframe inside ComfyUI Comic Creator (a separate custom node); sends the selected image directly into Comic Creator's currently selected panel/overlay
- **Search clear (✕)** — inline ✕ button appears inside the search box whenever text is entered; click to clear immediately
- **Clear all filters (✕ Clear)** — rightmost toolbar button; resets search text, tag filter, group filter, and favorites filter in one click (sort order is preserved)
- **Workflow auto-save** — images generated from the Generate UI tab have their workflow automatically saved to gallery metadata
- **Output folder configurable** — set the scanned output folder from Settings tab
- **SVG file support** (v0.3.77) — `.svg` files are browsable, previewable (detail panel and lightbox), and included in favorites/tags/groups/move/delete/export alongside raster formats; served as-is with no rasterized thumbnail, since `<img>` scales vector graphics natively at any size
- **Performance** — server-side 256px JPEG thumbnail generation with disk cache (`data/thumb_cache/`); infinite-scroll paging (50 images per page, IntersectionObserver); folder-level mtime cache (60s TTL); bulk operations use single-request API endpoints
### Nodes Tab (v0.1.7)
- **Node Browser** — browse all installed ComfyUI nodes from `/object_info` API with Card/Table views
- **Search & Filter** — full-text search, filter by category, package, tags, groups, and favorites
- **Package badges** — color-coded badges generated from package names
@@ -191,6 +228,7 @@ Two independent modes selectable via **[Image Loop] / [Gallery]** toggle buttons
- **Clear all filters (✕ Clear)** — rightmost toolbar button; resets search text, category, package, tag, group, and favorites filter in one click
### Models Tab (v0.2.3)
- **Model Browser** — browse all installed ComfyUI models (Checkpoint, LoRA, VAE, ControlNet, UNET, TextEncoder, Hypernetwork, Embedding) with sub-tab switching
- **Thumbnail / Table views** — switch between view modes with pagination (24 items per page); Table view includes **Type** and **Base Model** columns sourced from cached CivitAI data, displayed between the Subdirectory and Extension columns; Enable/Disable column labeled **E/D**
- **Table column sort** — click any column header to sort ascending (▲), click again for descending (▼), click a third time to clear; active column highlighted in accent color
@@ -215,6 +253,7 @@ Two independent modes selectable via **[Image Loop] / [Gallery]** toggle buttons
- **Clear all filters (✕ Clear)** — rightmost toolbar button; resets search text, tag filter, folder filter, group filter, favorites filter, and status filter in one click
### Tagger Tab (v0.3.38)
- **3 sub-tabs** — Single / Batch / DB for single-image tagging, folder batch processing, and tag database management
- **Model support** — WD Tagger (ONNX, NCHW/NHWC auto-detect), SwinV2 (ONNX), DeepDanbooru (.h5, requires TensorFlow); place each model in its own subfolder under `ComfyUI/models/tagger/<model-name>/` containing the `.onnx` + `selected_tags.csv` (or `.h5` + label file)
- **Threshold sliders** — General threshold (default 0.35) and Character threshold for `character:` prefix tags (default 0.85); sliders update the display value in real time
@@ -225,19 +264,21 @@ Two independent modes selectable via **[Image Loop] / [Gallery]** toggle buttons
- **DB tab** — searchable SQLite database of all tagged images; click a row to open the edit panel and modify WD Tags / VLM Tags; Save updates the record, Delete removes it; Export CSV downloads all records
- **Dependencies** — install into ComfyUI's embedded Python: `python_embedded\python.exe -m pip install -r requirements.txt`; for GPU inference use `onnxruntime-gpu`; TensorFlow (DeepDanbooru) is optional and commented out in `requirements.txt`
### Image Edit Tab (v0.3.61)
### Image Edit Tab (v0.3.65)
- **Layer-based image editor** — compose images with multiple layers (Image, Text, Draw, Mask types) and export the composite as PNG
- **Loading images** — drag & drop onto the canvas, Upload button, or send from the Gallery tab via the **Image Edit** toolbar button; first image becomes Layer 1 (auto-locked), subsequent images are added as new layers scaled to fit the canvas
- **New button** — create a blank canvas with custom dimensions (WxH prompt); clears all existing layers
- **Tools** — Select (V), Draw (B), Text (T), Shape (S), Mask (🎭), Blur (≈), BG Remove (⬚), Filter (★); tool options bar updates per active tool
- **New button** — create a blank canvas with custom dimensions (WxH prompt); clears all existing layers and automatically adds an empty Layer 1 (v0.3.70)
- **Tools** — Select (V), Draw (B), Text (T), Shape (S), Mask (🎭), Blur (≈), BG Remove (⬚), Filter (★), Inpaint (🩹); tool options bar updates per active tool
- **Select** — click to select; drag to move; drag corner handles to resize; drag circle handle to rotate; Flip H / Flip V / Rotate angle in the options bar; double-click a text layer to re-edit its content
- **Draw** — freehand brush; options: color, brush size, blend mode; paints directly onto the active draw layer while all other layers remain visible; brush cursor shown as a size-accurate circle; strokes can start from outside the canvas margin and continue past the edge
- **Text** — click to place; configure font, size, bold/italic, align, and color; placed as an exact-size text layer sized to the measured bounding box; double-click to re-edit
- **Shape** — drag to draw geometric shapes (Rect / Ellipse / Line / FreeLine); options: shape type, Rounded toggle (Rect/Ellipse), Fill color, Stroke color + width, Opacity; each committed shape becomes an independent draw layer; Stroke None hidden for Line/FreeLine (stroke always active)
- **Mask** — paint a white mask onto a dedicated mask layer; click **M** in the Layers header to add a mask layer (Mask tool activates automatically); clicking a mask layer in the list also switches to the Mask tool; **Tool Options bar**: Paint sub-tool button, Invert checkbox, Overlay color picker (default red), Blur slider (0–50 px); **Properties pane** (left of the Layers panel): Size (1–200 px), Hardness (0–100%), Mode — **Add** (draw white = mask present) / **Erase** (erase to transparent = mask absent); **✂ button** on the layer row enables/disables the mask as a clipping mask — when enabled (blue), the layer directly below is clipped to the painted area and the result is applied when exporting; brush cursor shown as a size-accurate circle; strokes can start from outside the canvas margin and continue past the edge
- **Mask** — 7 sub-tools for painting masks onto a dedicated mask layer; click **M** in the Layers header to add a mask layer (Mask tool activates automatically); clicking a mask layer in the list also switches to the Mask tool; **Tool Options bar**: sub-tool buttons (Paint / Color / Alpha / Text / Vector / Shape / SAM3), Invert checkbox, Overlay color picker (default red), Blur slider (0–50 px); the overlay is only shown for the currently active mask layer, other mask layers stay hidden until selected (v0.3.70); SAM3 requires Mask Editor One (disabled when not installed); Color / Alpha / Text / Vector / Shape work without Mask Editor One; **Properties pane — Paint**: Mode (Add / Erase), Size (1–200 px), Hardness (0–100%); **MASK EDITOR ONE section** (Paint sub-tool, visible when installed): Select opens the ABR stamp-brush library; ✕ clears back to Circle; when an image brush is active, Hardness is disabled and Spacing (5–100%), Angle (0–359°), Sz Jitter (0–100%), Rot. Jitter (on/off) appear; **Properties pane — Color**: click canvas to flood-select pixels by color similarity; Mode (Add / Subtract), Tolerance (0–255), Feather % (0–100); **Properties pane — Alpha**: extract the active layer's transparency as a mask; Threshold, Invert checkbox, Extract Alpha button; **Properties pane — Text**: click canvas to open a stamp overlay — enter text, set Font / Size / Bold / Italic / Align / Mode (Add / Erase), Stamp or Ctrl+Enter to apply; multi-line supported; **Properties pane — Vector**: click to add Catmull-Rom spline points; Enter (or click first point) closes and fills the polygon; Backspace removes the last point; Esc resets; Mode (Add / Erase); **Properties pane — Shape**: drag to draw Rect or Ellipse; hold Shift for square/circle; blue dashed outline preview while dragging; Mode (Add / Erase); **Properties pane — SAM3**: enter a text prompt, set Max candidates (3/6/9/12), click Segment; select candidate thumbnails (multi-select), Apply Selected (N) applies with current Mode; **Mask layer A/S operation**: A/S toggle — Add (green) composites normally, Subtract (red) cuts the mask from below; **✂ clipping mask button** clips the layer below to the painted area; brush cursor shown as size-accurate circle; strokes can start from outside the canvas margin and continue past the edge
- **Blur** — **Whole Blur**: Gaussian blur to the entire active layer with intensity slider (1–50 px); **Whole Mosaic**: pixelation mosaic with block-size slider (5–100 px); **Rect Blur / Rect Mosaic**: enable the toggle then drag a rectangle on the canvas to apply blur or mosaic to that region only (blue preview for blur, orange for mosaic); Rect Blur and Rect Mosaic are mutually exclusive; all operations support Undo
- **BG Remove** — remove the background from the active layer; **Lightweight (@imgly)**: runs entirely in the browser via CDN (no server required; ~40 MB model downloaded on first use); **BiRefNet**: high-quality removal via the Python backend (coming soon); **New Layer** option (default on) adds the result as a new layer above the original; when off, replaces the active layer in-place
- **BG Remove** — remove the background from the active layer; **Lightweight (@imgly)**: runs entirely in the browser via CDN (no server required; ~40 MB model downloaded on first use); **BiRefNet**: high-quality removal via Mask Editor One's Python backend (requires Mask Editor One installed and `birefnet.safetensors` in `ComfyUI/models/background_removal/`); **New Layer** option (default on) adds the result as a new layer above the original; when off, replaces the active layer in-place
- **Filter (G'MIC)** — apply G'MIC-Qt filter effects to the active image layer; click **Edit with G'MIC** to launch G'MIC-Qt GUI; select a filter and click OK — a "G'MIC-Qt filter output" window appears; close it to save the result back as the active layer; requires G'MIC-Qt Standalone installed and path configured in Settings → G'MIC-Qt Executable Path
- **Inpaint** (v0.3.71) — composites the visible layers plus a Mask layer into one RGBA image (mask baked into the alpha channel) and applies it to the first inpaint-capable LoadImage node in the workflow currently loaded in GenerateUI (a node whose MASK output feeds something like `VAEEncodeForInpaint`); also supports workflows built around the **Mask Editor One** custom node (`comfyui-mask-editor-one`) instead of LoadImage — image/mask are pushed via its node_id-keyed server cache and `layer_data` widget; **Properties pane**: Positive/Negative prompts, Grow Mask By (applied to the VAE Encode (for Inpainting) node), Denoise (applied to KSampler), Run button; **Use dedicated workflow** checkbox — when off, generates against the workflow currently loaded in GenerateUI; when on, pick a saved workflow from the dropdown to load, edit, and generate entirely in the background without disturbing what's shown in GenerateUI; the result image is shown back in the Properties pane when generation completes; requires a Mask layer painted first (Mask tool)
- **Layer panel** — layer list with visibility (👁/🚫), lock (🔒/🔓), and clipping-mask (✂) toggles; opacity slider; type icons (🖼 image / T text / ✏ draw / ⬚ mask); Layer 1 is automatically locked on first image load
- **Layer lock** — locked layers show an orange bounding box and 🔒 icon on the canvas; move/resize/rotate are disabled while locked; click the 🔓 button in the layer row to unlock
- **Text quality** — text layers are rendered at their measured bounding-box size; resizing with the Select tool regenerates the canvas at the new display resolution so text stays sharp
@@ -246,17 +287,27 @@ Two independent modes selectable via **[Image Loop] / [Gallery]** toggle buttons
- **Undo / Redo** — Ctrl+Z / Ctrl+Y (or toolbar buttons); keyboard shortcuts: V (Select), B (Draw), T (Text), S (Shape), Delete (remove selected layer when 2+ exist)
### AI TOOL Tab (v0.3.14)
- **4-pane layout** — Translation | Chat | TOOLS | Settings; all panes always visible simultaneously; no sub-tab switching required
- **Translation pane** — translate text between Japanese, English, Chinese, or a custom Free language using Ollama or LM Studio; language selectors with ⇄ swap button (swaps both language selectors and text content); selections saved automatically
- **Chat pane** (v0.3.40) — multi-turn conversation with the LLM; full conversation history sent each turn for context; Enter to send, Shift+Enter for a newline; Clear button resets history; Ollama uses `/api/chat`, LM Studio uses `/v1/chat/completions`
- **Translation pane** — translate text between Japanese, English, Chinese, or a custom Free language using Ollama, LM Studio, or Lemonade; language selectors with ⇄ swap button (swaps both language selectors and text content); selections saved automatically
- **Chat pane** (v0.3.40) — multi-turn conversation with the LLM; full conversation history sent each turn for context; Enter to send, Shift+Enter for a newline; Clear button resets history; Ollama uses `/api/chat`, LM Studio and Lemonade use `/v1/chat/completions`
- **Chat pane — image generation via Tool Calling** (v0.3.73) — if the selected model supports tool calling and the user asks for an image, a `generate_image` tool is invoked and the request runs through the same generation pipeline as the GenerateUI Generate button, with the result shown inline in the chat; an "Allow image generation" checkbox in the input row toggles this on/off (default on); the workflow used is the one currently loaded in GenerateUI, or a dedicated saved workflow configured in the Settings pane; models verified to work well for tool calling and vision: **Gemma 4:e4b**, **Qwen 3.5:9b**, **Ministral 3:3b** (Ollama)
- **TOOLS pane (VLM)** — drop an image into the 110px drop zone, select a task (Describe Image / Create Prompt / Create Tags), and click Run to analyze with a vision model; result shown in the output area with a Copy button
- **TOOLS pane — shared Chat attachment** (v0.3.74) — an image dropped in the TOOLS drop zone is also usable as the Chat pane's attachment: it's sent to the LLM as vision input, and used as the base image when `generate_image` runs image-to-image; a ✕ button clears it (from either the TOOLS preview or the Chat attachment indicator); it stays attached across turns until explicitly cleared
- **TOOLS pane (Wildcards)** (v0.3.40) — select "Create wildcards" from the task dropdown; enter a category name and count; click Run to generate plain-text wildcard entries one per line (no markdown, no numbering); result can be copied directly into wildcard `.txt` files
- **Settings pane** — choose backend (Ollama / LM Studio), set the API URL, test connection, select a model (with refresh button), and configure Free language names for translation source and destination
- **Chat pane — image-to-image (I2I)** (v0.3.74) — when an image is attached and `generate_image` is invoked, the attachment is uploaded and swapped into the target workflow's LoadImage node instead of running text-to-image; the target workflow is the one currently loaded in GenerateUI, or a dedicated I2I workflow configured in the Settings pane
- **Chat pane — SVG generation, no ComfyUI workflow involved** (v0.3.77) — the LLM can also produce SVG graphics directly as text; if a reply contains SVG code (wrapped in a markdown code fence or written directly as a bare `<svg>...</svg>`), it's rendered inline as a preview and a "Save to Gallery" button writes it as a `.svg` file to the Gallery tab's output folder; unlike the Tool Calling image generation flow above, this is plain text pattern matching, so it works with any model regardless of tool-calling support
- **Chat pane — Skills** (v0.3.79) — select a `.md` skill file from a dropdown above the message list to prepend its instructions to the conversation as a system prompt (not shown in the visible chat log); a pencil button opens an in-pane manager (list + inline editor, same pattern as the Prompt tab's wildcard file manager) to create, edit, or delete skill files stored in `user/default/Workflow-Studio/ai_skills/`; a file's `---`-delimited frontmatter (`name`/`description`) is shown in the dropdown; two starter skills are bundled — **SVG Icon Generator** (explicitly decomposes the subject into parts before drawing, which markedly improves recognizability from small local models) and **Skill Creator** (interviews you conversationally and drafts a new skill as a ```skill code block; a "Save as new skill" button appears under such replies and opens the manager pre-filled with the draft)
- **Settings pane** — choose backend (Ollama / LM Studio / Lemonade), set the API URL, test connection, select a model (with refresh button), and configure Free language names for translation source and destination
- **Settings pane — Chat Image Generation** (v0.3.73) — "Use dedicated workflow" checkbox lets Chat-triggered image generation use a saved workflow of your choice instead of the one currently loaded in GenerateUI, without disturbing what's shown there (same pattern as Image Edit's Inpaint dedicated workflow)
- **Settings pane — Chat I2I Generation** (v0.3.74) — same "Use dedicated workflow" pattern as above, but for image-to-image generation when an image is attached; independent of the text-to-image dedicated workflow setting
- **Settings shared** — settings saved to `localStorage` under `wfm_ai_settings`; shared with the Library panel's AI TOOL tab so configuration is consistent across both interfaces
- **Backend support** — Ollama (`/api/generate` for text, `/api/chat` for conversations, `/api/tags` for model list); LM Studio OpenAI-compatible API (`/v1/chat/completions`, `/v1/models`); VLM images sent as base64 (`images:[]` for Ollama, `image_url` content block for LM Studio)
- **Backend support** — Ollama (`/api/generate` for text, `/api/chat` for conversations, `/api/tags` for model list); LM Studio and Lemonade via the OpenAI-compatible API (`/v1/chat/completions`, `/v1/models`); VLM images sent as base64 (`images:[]` for Ollama, `image_url` content block for LM Studio/Lemonade)
- **URL security** — backend URL validated via `new URL()` to enforce `http://` or `https://` scheme
- **Lemonade's other endpoints (not integrated)** — Lemonade Server also exposes OpenAI-compatible image generation (`/v1/images/generations`), text-to-speech (`/v1/audio/speech`), and transcription (`/v1/audio/transcriptions`) endpoints; these are not wired up — image generation would duplicate the existing ComfyUI-workflow-based `generate_image` tool call, and audio/TTS has no corresponding UI yet, so both are future considerations rather than a natural extension of the current backend switch
### Workflow Studio Library (ComfyUI Side Panel) (v0.3.9)
- **Tab layout (W / N / P / M / I / A)** — compact single-letter tabs with full name shown on hover
- **W — Workflows tab** — browse favorite workflows (All / ★ Favorites / Groups / By Badge sub-tabs), ★ star shown for favorites in All view
- **N — Nodes tab** — browse favorite nodes (All / ★ Favorites / Groups / Sets / 📂 Category / 🧩 Package sub-tabs), ★ star shown for favorites in All view
@@ -265,7 +316,7 @@ Two independent modes selectable via **[Image Loop] / [Gallery]** toggle buttons
- **M — Models tab** — browse installed models (All / ★ Favorites / Groups / By Type sub-tabs); LoRA groups show an **All N LoRAs** item — drag to canvas to place a `Lora Loader (LoraManager)` node with all LoRAs pre-loaded
- **P — Prompts tab** — browse prompt presets with All / ★ Favorites / Categories sub-tabs; **Groups sub-tab** (row 2) — view presets by group (shared with the Batch tab's `wfm_prompt_preset_groups`)
- **I — Information tab** — drop a ComfyUI-generated PNG/WebP or workflow JSON in the side panel to view its metadata; detects LoRAs from `LoraLoader`, `LoraLoaderModelOnly`, and `Lora Loader (LoraManager)` nodes (API format supported); supports `UnetLoaderGGUF` and `QuadrupleCLIPLoader` node types; preview area fixed at 110px
- **A — AI TOOL tab** — Translation, Chat, TOOLS, and Settings sub-tabs powered by Ollama or LM Studio; Chat supports multi-turn conversations (full history sent each turn); TOOLS includes VLM image analysis and wildcard generation; settings (backend, URL, model) shared with the SPA AI TOOL tab via `localStorage`
- **A — AI TOOL tab** — Translation, Chat, TOOLS, and Settings sub-tabs powered by Ollama, LM Studio, or Lemonade; Chat supports multi-turn conversations (full history sent each turn); TOOLS includes VLM image analysis and wildcard generation; settings (backend, URL, model) shared with the SPA AI TOOL tab via `localStorage`
- **model sub-tab** — Checkpoint, VAE, Diffusion Model, and Text Encoder; drag items to canvas to place the corresponding loader node (Checkpoint → `CheckpointLoaderSimple`, VAE → `VAELoader`, Diffusion Model → `UNETLoader`, Text Encoder → `CLIPLoader`); double-click also places at canvas center
- **lora sub-tab** — detects LoRAs from `LoraLoader`, `LoraLoaderModelOnly`, and `Lora Loader (LoraManager)` nodes (API format `inputs.loras.__value__` supported); shows `strength_model / strength_clip` values; drag individual LoRA to place `LoraLoader`; **Multiple LORA** section (appears for 1+ LoRAs) drags all LoRAs into a single `Lora Loader (LoraManager)` node with LoRA syntax pre-filled
- **Prompts sub-tab** — POS / NEG badge list; drag a prompt to place `CLIPTextEncode` with text pre-filled; click any entry to view full text + Copy button
@@ -279,8 +330,9 @@ Two independent modes selectable via **[Image Loop] / [Gallery]** toggle buttons
- **⚙ Theme settings** — customize panel background, sub-header background, text, border, and secondary text colors; saved to localStorage and applied on every open
### Help & Support Tab (v0.1.3)
- **Sidebar navigation** — 2-column layout: left sidebar (15 topics) + right content pane; click any topic to switch the displayed content
- **Support** — fixed at the bottom of the sidebar; shows GitHub and Ko-fi links in the right pane
- **Support** — fixed at the bottom of the sidebar; shows GitHub, Ko-fi, **ComfyUI Image Feeder**, and **Mask Editor One** repository links in the right pane
- **Feature list** — overview of all features organized by tab
- **Keyboard Shortcuts** and **Troubleshooting** sections included
@@ -355,14 +407,16 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
- **[Ollama](https://ollama.com/)** — for AI chat assistant, translation, and VLM features
- **[LM Studio](https://lmstudio.ai/)** — alternative backend for translation and VLM (OpenAI-compatible API)
- **[Lemonade Server](https://lemonade-server.ai/)** — alternative backend for translation, chat, and VLM (OpenAI-compatible API)
- **[Eagle](https://eagle.cool/)** — for auto-saving generated images with metadata
- **[comfyui-mask-editor-one](https://github.com/ketle-man/comfyui-mask-editor-one) (v0.1.9+)** — enables BiRefNet background removal, SAM3 text-prompt segmentation, and ABR stamp-brush library in the Image Edit Mask tool; `birefnet.safetensors` must be placed in `ComfyUI/models/background_removal/` for BiRefNet
---
## Supported Languages
| Language | Status |
|----------|--------|
| -------- | ------ |
| English | Full |
| Japanese | Full |
| Chinese | Full |
@@ -371,18 +425,173 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
## Changelog
### v0.3.89
- **Lab tab — Get from Image now reads Lab's own loaded image** — instead of opening a separate file picker, it fetches the image already loaded in Lab's Image drop zone (`/view` on the uploaded input file) and extracts its embedded prompt metadata
- **Lab tab — Style now always appends, never clears** — instead of substituting a `{prompt}` placeholder into the style template (as GenerateUI's own Style feature does), Lab's Style button appends the style's text after any existing Positive/Negative content with a comma, or uses it as-is if the field was empty
- **GenerateUI Model tab — overlay ✕ clear buttons** — Checkpoint, VAE, Diffusion Model, ControlNet, Hypernetwork, and LoRA (Single) filter boxes now have the same overlay ✕ clear button as the Models/Nodes/Workflow/Gallery tab search boxes
### v0.3.88
- **Lab tab — Prompt cell extras** — Get from GenerateUI (fills Positive/Negative from the currently loaded workflow), Get from Image (extracts a prompt from a dropped/selected image or workflow JSON, reusing the Metadata tab's `extractAllMetadata()`), and Style (applies whichever style is currently selected in GenerateUI's own top-bar Style checkbox/dropdown — no separate style picker inside Lab)
- **Lab tab — Checkpoint/VAE cell filtering** — a Filter... box narrows the dropdown live, same as GenerateUI's Model tab, with the same overlay ✕ clear button used by the Models/Nodes/Workflow/Gallery search boxes (`setupSearchClearBtn()`)
- **Lab tab — new Plan JSON subtab** — view/edit the current plan as raw JSON (syntax highlighted, same shape as the saved file); Refresh re-syncs it from the Setting tab, Apply to Setting parses your edits and writes them back into the Setting tab's columns/note/batch/chain-image/source-image/results, the same as loading that JSON as a plan file without saving it first
### v0.3.87
- **New: GenerateUI — Lab subtab** — experimental I2I batch generation. Runs the workflow currently loaded in GenerateUI N times, with Checkpoint/VAE/Prompt/KSampler each independently overridable via a per-column list of keyframes (`{iteration, value}`) instead of the Batch tab's single shared axis; the effective value at iteration N carries forward from the latest keyframe ≤ N, and a "revert to #1" option reuses the baseline value. Every iteration runs on a cloned workflow, so the loaded workflow (and the Input/Model/Settings/Batch tabs) is never modified. Includes an optional "use generated image for next" chain mode (iteration 2+ feeds the previous output back in as the I2I source via ComfyUI's `"name [type]"` reference, no re-upload needed), Eagle auto-save integration, and Plan Save/Save As/Load (drag-and-drop `.json` or its `.png` index-image thumbnail) with plans stored under `user/default/Workflow-Studio/lab_plan/` alongside an auto-generated contact-sheet thumbnail (up to 9 result images, 3 per row).
### v0.3.84
- **Bug fix: `ernie_t2i.json` failed to Generate with "Prompt outputs failed validation"** — the actual failure was `Required input is missing: source` on a `PreviewAny` ("Preview as Text") node. Ernie Image's subgraph fans a single boundary widget value (e.g. `width`) out to *two* internal targets — `EmptyFlux2LatentImage.width` (a real widget) and a `PreviewAny.source` (a required wildcard `*` input with no widget representation, used to render the value into a prompt-template string). The subgraph-flattening logic only ever tracked the last of several fan-out targets per boundary port, so one of the two was always left completely unconnected. Now every fan-out target is tracked and resolved: widget-type targets get the value written into `widgets_values` as before, and non-widget targets get it injected as a plain literal input value. Also handles unfilled templates (outer `widgets_values` empty) by falling back to the sibling widget target's own template-authored default.
- Verified against a live ComfyUI server: `/prompt` validation passes with `node_errors: {}`, and an actual Generate run from the GenerateUI tab completes successfully.
### v0.3.83
- **Bug fix: prompts not shown for Flux.2 Klein / Ernie Image workflows** — fixed in the GenerateUI tab, Metadata tab, and sidebar Info tab. Two related patterns weren't detected: (1) `CLIPTextEncode.text` linked to a `PrimitiveStringMultiline` node instead of holding the text directly — the Metadata/Info tab's link resolver only recognized `text`/`text_g`/`prompt` input keys, not `PrimitiveStringMultiline`'s `value` key (GenerateUI's own analysis already handled this). (2) Ernie Image's prompt-enhancement toggle routes the prompt through a `ComfySwitchNode` ("If/Else Switch") that picks between the raw `PrimitiveStringMultiline` text and an LLM-rewritten version from a `TextGenerate` node — since the LLM output can't be known statically, all three tabs now follow both switch branches and use whichever resolves to a literal string (i.e. the user's original prompt).
- **Help & format notes updated** — GenerateUI/Metadata tab help text and the Metadata tab's "supported formats" note now include Ernie Image alongside the existing subgraph-workflow entries (EN/JA/ZH).
### v0.3.82
- **GenerateUI tab — Flux.2 Klein / LongCat / Boogu / HiDream E1 / FireRed Image Edit workflow support** — these use ComfyUI's Guider-based "Advanced Sampling" pattern (`SamplerCustomAdvanced`/`SamplerCustom` + `CFGGuider`/`DualCFGGuider`/`BasicGuider` + `RandomNoise` + `KSamplerSelect` + `*Scheduler`, spreading seed/steps/cfg/sampler/scheduler across several nodes instead of one `KSampler`) plus model-specific text-encoder nodes (`TextEncodeQwenImageEdit`, `TextEncodeBooguEdit`), none of which the previous KSampler-centric analysis could detect — the Settings/Latent panels showed "no node found" and were unusable. `SamplerCustomAdvanced`/`SamplerCustom` are now resolved back to their driving Guider/Scheduler/KSamplerSelect nodes for editing; `EmptyFlux2LatentImage` is supported in the Latent panel (linked width/height shown blank instead of a stale default).
- **Bug fix: subgraph `widgets_values` normalization** — rewrote the subgraph-flattening logic that strips linked-widget entries from a template node's `widgets_values`; the previous length-based detection didn't account for the `control_after_generate` extra value that follows `seed`, so on nodes where a linked widget (e.g. `steps`) sits right after `seed` (e.g. `KSampler`), every subsequent widget value ended up shifted by one slot — `cfg`/`denoise` silently got the wrong value. Also fixed a related bug where `EmptyFlux2LatentImage.batch_size` came out as `1024` instead of `1` on Flux.2 Klein workflows.
- **Bug fix: `Reroute` node caused a 400 error** — `Reroute` is a UI-only passthrough node with no backend node class; including it in the API payload (as happened with HiDream E1's UNETLoader→BasicScheduler/DualCFGGuider fan-out) made ComfyUI reject the prompt with `missing_node_type`. Now resolved through transparently, the same way Bypass-mode nodes already were.
- **Bug fix: Metadata tab / sidebar Info tab prompt extraction** — these have their own prompt-extraction logic separate from GenerateUI's analysis, and it hadn't kept up: PNG metadata is read from the `prompt` chunk (already API-format) before `workflow`, so the text-encoder scan needed to recognize the `prompt` input key (used by `TextEncodeQwenImageEdit`/`TextEncodeBooguEdit`, not just `text`/`text_g`), resolve `SamplerCustomAdvanced` through its Guider node to find positive/negative, handle `TextEncodeBooguEdit`'s single-node prompt+negative_prompt layout, and follow one extra hop through `InstructPixToPixConditioning`. Without these, prompts from LongCat/Boogu/FireRed/Qwen-Image-Edit-2509/2511 images showed up empty even though the same image loaded correctly into GenerateUI.
- **Help & format notes updated** — GenerateUI/Metadata tab help text and the Metadata tab's "supported formats" note now list LongCat/Boogu/HiDream E1/FireRed alongside the existing Flux.2/Qwen-Image/Z-Image/Mage-Flow entries (EN/JA/ZH).
### v0.3.80
- **Comic Creator — Semi-Automatic Manga bridges** — added `window._wfmReceiveLLMPromptRequest(context)` and `window._wfmReceiveGenerateRequest(prompt, width, height)` (`gallery-tab.js`), following the same "assign to `window`, called across the iframe boundary" pattern as the existing I2I/Inpaint bridges. The LLM bridge drafts an image-generation prompt from scene/character/dialogue context using the AI tab's existing Ollama/LM Studio connection logic (`callLLM`/`loadAiSettings`/`isValidBackendUrl`, now exported from `ai-tab.js`); the generate bridge runs a txt2img generation with the workflow currently loaded in the GenerateUI tab, writing the requested width/height into the detected `EmptyLatentImage`/`EmptySD3LatentImage` node the same way the Settings tab's Latent Image panel does, and returns the result image URL.
### v0.3.79
- **AI TOOL Chat — Skills** — a selectable library of `.md` system-prompt files (frontmatter `name`/`description`) that get prepended to the conversation; managed in-pane (list + inline editor) with a new `/api/wfm/skills` backend (`skill_service.py`/`skill_routes.py`, same pattern as the existing wildcard file manager); two bundled skills: **SVG Icon Generator**, engineered around the "decompose the subject into parts before drawing" technique to fix unrecognizable SVG output from smaller local models, and **Skill Creator**, a meta-skill that interviews you and drafts a new skill as a ```skill code block with a one-click "Save as new skill" button
- **Sidebar Info tab — Mage-Flow / subgraph workflow support** — the ComfyUI side panel's I tab now matches the Metadata tab's ability to inspect subgraph-based workflows (Flux.2 / Qwen-Image / Z-Image / Mage-Flow templates), including correct outer-widget-value injection and `TextEncodeMageFlowEdit` prompt handling
- **Help tab — card-based redesign** — every help page now opens with a page title + "Open tab" jump button, and its content is split into topic-focused cards (heading + list) instead of one long flat bullet list per tab, matching the AI TOOL page's format introduced this release; no content was rewritten, only regrouped, and a few pre-existing gaps were fixed along the way (a duplicated Settings-pane bullet, and Tagger/Troubleshooting text that only lived in the i18n dictionary and never made it into the page markup)
### v0.3.78
- **Eagle integration — SVG support** — auto-save now handles SVG output alongside raster images: the standard `SaveSVGNode` (via `images`-key detection with correct `image/svg+xml` MIME re-tagging) and `comfyui-tosvg`'s `Save SVG String` node (via its `saved_svg`/`path` UI keys, including a fix for ComfyUI's execution engine splitting single-string UI values into per-character arrays); SVGs are sent to Eagle through `addFromPath` (resolved to a real on-disk path, restricted to ComfyUI's managed directories) instead of `addFromURL`, since `/view` forces `application/octet-stream` for SVG as an XSS guard; temp-only preview images (e.g. `SVG String Preview`) are excluded from both auto-save and the GenerateUI result display, which now shows the actual saved SVG file instead of a stale pre-vectorized preview
- **GenerateUI / Metadata tabs — subgraph workflow support (Mage-Flow, and any similar template)** — workflows that merely contain ComfyUI subgraphs (`definitions.subgraphs`) are no longer blocked as unsupported "App format"; only true simplified-UI App-mode workflows (Linear Mode / `.app.json`) still are. `convertUiToApi()` now correctly injects the outer subgraph node's actual widget values (prompt text, seed, model names, etc. — what the user actually sees in the collapsed subgraph form) into the internal template nodes, which previously kept stale placeholder values from when the subgraph was authored; added support for `TextEncodeMageFlowEdit` (prompt analysis) and ComfyUI's new DynamicCombo widget type (e.g. `SaveImageAdvanced`'s format selector)
- **Workflow tab — structured AI summary** — the "Summarize" button now extracts model names, LoRAs, prompts, and sampler settings via `analyzeWorkflow()` instead of dumping the raw workflow JSON's first 4000 characters, which used to get crowded out by long `MarkdownNote` text or UI position data on complex/subgraph workflows
- **Workflow tab — accurate node counts and format badge** — the side panel's "P:/I:/→" counts and the API/App format badge now recognize `TextEncodeMageFlowEdit`/`SaveImageAdvanced` and other newer node types, and use the same "App means Linear Mode, not just subgraphs" rule as GenerateUI
- **Workflow/Gallery tabs — clearer "Send to Canvas" toast** — the toast previously always said "drag the title to canvas" even when the workflow was sent directly via `window.opener` (no drag needed); it now only shows the drag instruction for the actual drag-required fallback path
### v0.3.77
- **Gallery Tab — SVG file support** — `.svg` added to `IMAGE_EXTENSIONS` (`gallery_service.py`), covering folder scanning, listing, move/delete, and serving; `serve_thumbnail()` returns the original file for SVG (same as the existing GIF case) since Pillow can't open vector images and the browser scales them natively; no frontend changes needed since `gallery-tab.js` renders every image through plain `<img>` tags
- **AI TOOL Chat — SVG generation without a ComfyUI workflow** — assistant replies are now scanned for SVG code (wrapped in a markdown code fence or written directly as a bare `<svg>...</svg>`); when found, it's rendered inline via `<img src="data:image/svg+xml;base64,...">` (script execution is disabled by the browser for SVG loaded through `<img>`) with a "Save to Gallery" button; `/wfm/gallery/image/save` (`gallery_routes.py`) was generalized to detect the target format from the data URL's MIME type instead of assuming PNG, so both Image Edit Tab's PNG saves and Chat's SVG saves go through the same endpoint
### v0.3.76
- **Comic Creator — I2I execution bridge** — added `window._wfmReceiveI2IRunRequest` (`gallery-tab.js`) and `runI2IExternal()`/`_runI2IWithImage()` (`image-edit-tab.js`), a mask-free counterpart to the existing Inpaint bridge (`_wfmReceiveInpaintRequest`/`runInpaintExternal`); lets Comic Creator's Image tab send an image with Positive/Negative prompts and Denoise, run generation in place, and get the result image URL back without opening the Workflow Studio UI
### v0.3.75
- **Lemonade Server support — third AI backend** — added [Lemonade Server](https://lemonade-server.ai/) alongside Ollama and LM Studio as a selectable backend for Translation, Chat, TOOLS (VLM/Wildcards), and the Prompt tab's AI Assistant, in both the SPA and the Library side panel; Lemonade's OpenAI-compatible API (`/v1/models`, `/v1/chat/completions`) reuses the same request/response handling already used for LM Studio, so no new wire-format code was needed
- **Shared default-URL lookup** — `static/js/util.js` gains `getAiBackendDefaultUrl(backend)` (`AI_BACKEND_DEFAULT_URLS`: Ollama `http://localhost:11434`, LM Studio `http://localhost:1234`, Lemonade `http://localhost:13305`), replacing the previous two-way ternary in `ai-tab.js`, `prompt-tab.js`, and `settings-tab.js`; the ComfyUI side panel (`node_sets_menu.js`) keeps its own local copy since it can't import from the SPA's `static/js` modules
- **Backend switch now always resets the URL field** — switching the backend radio (Ollama / LM Studio / Lemonade) in any of the three UIs now unconditionally fills the URL field with that backend's default, instead of only when the field was empty; the side panel previously had no such handler at all
- **Bug fix — Bypass-mode nodes broke generation with a dangling-reference validation error** — `convertUiToApi()` used to drop Bypass-mode (`mode: 4`) nodes without reconnecting the links that ran through them, so any node downstream of a bypassed node's output referenced a node ID that no longer existed in the API graph, and ComfyUI rejected the prompt (`Exception when validating inner node: 'N'`). Bypassed nodes' wires are now traced through to their upstream source (matching same-type input/output slots, recursively for chained bypasses) before being dropped, exactly like ComfyUI's own Bypass behavior. Mute-mode nodes (`mode: 2`) are now also excluded from the API graph (previously they were sent as if fully active); unlike Bypass they are not rerouted, matching ComfyUI's own behavior where muting a node with required downstream dependents is expected to error.
- **GenerateUI — Bypass/Mute indicator above Raw JSON** — when a loaded workflow has Bypass or Mute nodes, a note listing them (title + node ID) now appears above the Raw JSON search bar in the Input/Model/Settings tabs, since the API-format JSON shown there has no `mode` field and can no longer reveal this on its own
### v0.3.74
- **AI TOOL Chat — image attachment shared with TOOLS drop zone** — an image dropped in the TOOLS pane's existing drop zone is now also usable as the Chat pane's attachment (no separate drop zone); it is sent to the LLM as vision input (Ollama `images:[]`, LM Studio `image_url` content block) and shown as an indicator (thumbnail + label + ✕) above the Chat input; it persists across turns until explicitly cleared from either pane
- **AI TOOL Chat — image-to-image (I2I) generation** — when an image is attached and the `generate_image` tool is invoked, the attachment is uploaded and swapped into the target workflow's `LoadImage` node instead of running text-to-image; the `generate_image` tool description was updated so the LLM knows attaching an image switches it to I2I
- **AI TOOL Settings — Chat I2I Generation dedicated workflow** — same "Use dedicated workflow" pattern as the existing T2I setting, but independent and specific to I2I generation
- **`comfyui-editor.js` — `applyImageToSlot()` now supports `opts.workflow`/`opts.analysis`** — mirrors the existing pattern in `applyImageAndMaskToSlot()`; lets callers upload+swap an image into a cloned workflow without touching GenerateUI's displayed state (used by the new Chat I2I bridge)
- **Chat bubble image sizing** — the attached-image echo shown in the user's own message is now a small thumbnail (max 120px) instead of filling the bubble; generated result images are now capped at 20% width instead of 100%
- **Recommended models** — Gemma 4:e4b, Qwen 3.5:9b, and Ministral 3:3b (Ollama) verified to work well for both tool calling and vision in the Chat pane
### v0.3.73
- **AI TOOL Chat — image generation via Tool Calling** — if the selected Ollama/LM Studio model supports tool calling, asking Chat for an image (e.g. "generate a picture of a cat") invokes a `generate_image` tool and runs the request through the same generation pipeline as the GenerateUI Generate button (`window._wfmGenerateTab.generate()`); the result is shown inline in the chat as an image bubble; the conversation is not sent back to the LLM after generation
- **AI TOOL Chat — "Allow image generation" toggle** — checkbox next to the Send/Clear buttons (default on, persisted to `wfm_ai_settings`); when off, the `generate_image` tool is not offered to the LLM at all
- **AI TOOL Settings — Chat Image Generation dedicated workflow** — "Use dedicated workflow" checkbox + saved-workflow picker; when off (default), Chat-triggered generation uses the workflow currently loaded in GenerateUI; when on, it loads the selected saved workflow fresh each time via `/api/wfm/workflows/raw`, without touching what's shown in GenerateUI (same pattern as Image Edit's Inpaint dedicated workflow)
- **Settings — Default Checkpoint** — optional checkbox to force every checkpoint loader node (`CheckpointLoaderSimple` / `CheckpointLoader` / `ImageMetadataPromptLoader`) to a chosen model whenever a workflow is loaded into GenerateUI; a safeguard for environments with many saved workflows referencing models that were later moved/renamed
- **Bug fix — silent checkpoint substitution now surfaced** — `convertUiToApi()`'s COMBO-value fallback (originally added to tolerate drifting Impact Pack wildcard options) was silently replacing *any* unrecognized `ckpt_name` with the first entry in the installed-checkpoints list, making the Model tab show an unrelated model with no indication anything was wrong; workflow loading now detects this specific case and shows a warning toast naming the missing checkpoint instead of the usual "workflow loaded" toast
- **GenerateUI — return value for programmatic generation** — `_coreGenerate`/`handleGenerate` now return `{images, seed}` on success (previously void); existing callers are unaffected, and this enables features like the new Chat image bridge to retrieve the generated image without scraping the DOM
### v0.3.72
- **Comic Creator integration — Inpaint via external entry point** — the Image tab in Comic Creator (`comfyui-comic-creator`) can now trigger Inpaint the same way it already triggers I2I, via `window._wfmReceiveInpaintRequest(imageBlob, maskBlob, params, workflowData?, workflowFilename?)` called across the same-origin iframe boundary; common Inpaint logic was factored out into `_runInpaintWithImages()` and shared by the UI-driven flow and this new external entry point
- **Bug fix — cross-realm Blob detection** — images/masks generated in a different window (Comic Creator) failed to load (`[object Blob]` was interpreted as a URL string, causing a 404) because `instanceof Blob` checks fail across window realms; switched to a `typeof src !== "string"` check
- Hidden mask layers are now excluded from Inpaint in both the UI-driven and external-call paths
### v0.3.71
- **Image Edit — Inpaint tool (🩹)** — new tool composites the canvas (all non-mask layers) plus the active mask layer, uploads to an inpaint-capable LoadImage node (or a Mask Editor One node) in the GenerateUI workflow, applies Positive/Negative prompts, Grow Mask By, and Denoise, then triggers generation — all without leaving the Image Edit tab; the result is shown in the Properties pane
- **Image Edit — Inpaint: dedicated workflow** — "Use dedicated workflow" checkbox lets you pick a saved workflow to run the inpaint against instead of the one currently loaded in GenerateUI, without disturbing what's shown there
- **Image Edit — Inpaint: Mask Editor One support** — workflows built around the `comfyui-mask-editor-one` custom node (no LoadImage) are also supported; image/mask are pushed via its node_id-keyed server cache and `layer_data` widget
- **GenerateUI — Input/Image tab mask slots** — LoadImage nodes whose MASK output feeds an inpaint node (e.g. `VAEEncodeForInpaint`) now show an additional Mask drop zone; image + mask are composited into a single RGBA upload matching ComfyUI's native alpha→MASK extraction
- New example workflows: `ws_inpaint_basic.json`, `ws_inpaint_mask_editor_one.json`
### v0.3.70
- **Workflow AI summary — Ollama 404 fix** — the summarize button in the workflow detail modal now uses the Ollama URL/model saved in Settings → AI Assistant Settings (previously it silently fell back to a hardcoded default model tag that didn't match locally installed models, causing a 404)
- **Image Edit — New button auto-adds Layer 1** — creating a blank canvas via the New button now automatically adds an empty "Layer 1", matching the existing image-load behavior
- **Image Edit — mask overlay shown only for the active mask layer** — previously every visible mask layer's overlay was rendered regardless of selection; now only the currently active mask layer shows its overlay, other mask layers stay hidden until selected
- **GenerateUI — Revert button for Positive/Negative Prompt** — a ↺ button next to each Apply button reverts the textarea to the node's currently applied value
- **GenerateUI — Ctrl+↑/↓ prompt emphasis weight editing** — A1111 / native ComfyUI CLIP Text Encode style: select text (or just place the cursor on a word/parenthesis block) and press Ctrl+↑/↓ to adjust `(text:weight)` by ±0.05; parentheses are removed automatically when the weight returns to 1.0
### v0.3.69
- **Gallery — Send CC button** — new toolbar button, shown only when the Gallery tab is embedded as an iframe inside ComfyUI Comic Creator (a separate custom node); sends the selected image directly into Comic Creator's currently selected panel/overlay via its existing `insertImageFromUrl(url)` helper (no changes required on the Comic Creator side)
- **Lora batch — validation fix** — fixed a `Prompt outputs failed validation` error where LoRA files that actually existed were rejected by the standard `LoraLoader` node; the root cause was a path-separator mismatch (ComfyUI on Windows returns `\`-separated enum values while WFS tracked LoRAs internally with `/`); a shared `resolveLoraName()` helper now converts to ComfyUI's actual notation before applying, used consistently by Lora Single apply, Stack apply, the Models tab GenUI Model button, and Lora batch generation
- **Lora batch — pre-flight check** — before running a batch on a standard `LoraLoader` workflow, selected LoRAs are checked against ComfyUI's current model list; if any are not yet recognized, a warning toast suggests a Refresh or ComfyUI restart (skipped for Lora Manager–based workflows, which have no enum constraint)
- **Lora batch — automatic prompt sync** — for each LoRA applied during a batch, its syntax (`<lora:name:strength_model:strength_clip>`) and CivitAI trained words are automatically appended to the Positive prompt, rebuilt from the original prompt each time (not accumulated); the prompt is automatically restored to its pre-batch state when the batch completes, is stopped, or errors
- **Models tab — Close button in detail modal** — added a Close button at the right end of the Save / GenUI PP·NP / Delete button row in the model detail modal (all sub-tabs), reducing mouse travel to the top-right ✕ during repeated batch edits
- **Help** — new help entry (`helpGen19`) added in EN / JA / ZH describing the Lora batch prompt sync, restore, and pre-flight check behavior
### v0.3.68
- **Image Edit — MASK EDITOR ONE section always visible** — the ABR brush section in the Draw tool's (`MASK EDITOR ONE (COLOR)`) and Mask Paint mode's (`MASK EDITOR ONE`) Properties pane is now always shown instead of being hidden when no brushes are imported; the header text turns green when at least one ABR brush is available and gray when none are imported yet; the Select button is disabled until a brush exists
- **Help — MASK EDITOR ONE status** — updated `helpImageEdit5` (Draw tool) and `helpImageEditMask4` (Mask Paint mode) in EN / JA / ZH to describe the always-visible section and its color-coded availability state
### v0.3.67
- **GenerateUI — Alt+Click Apply & Generate** — Alt+Click any Apply button to apply the parameter and immediately queue a generation in one step; applies to Positive Prompt Apply (Input tab), all model Apply buttons (Model tab: Checkpoint / VAE / Diffusion Model / ControlNet / Hypernetwork), and KSampler Apply (Settings tab); only triggers generation when the target node exists in the loaded workflow (no action on missing nodes); each Apply button shows a tooltip `Apply (Alt+Click: Apply & Generate)` on hover
- **Help — Alt+Click Apply & Generate** — new help entry (`helpGen18`) added in EN / JA / ZH
### v0.3.66
- **Image Edit — Mask Tool: 5 new sub-tools** — Paint / Color / Alpha / Text / Vector / Shape / SAM3 (7 sub-tools total); Color, Alpha, Text, Vector, and Shape work without Mask Editor One
- **Color** — click the canvas to flood-select pixels similar in color to the clicked point; Properties pane: Mode (Add / Subtract), Tolerance (0–255), Feather % (0–100)
- **Alpha** — extract the active layer's alpha channel as a mask; Properties pane: Threshold, Invert checkbox, Extract Alpha button
- **Text** — click to open a stamp overlay; enter text, set Font / Size / Bold / Italic / Align / Mode (Add / Erase), confirm with Stamp or Ctrl+Enter; multi-line text supported
- **Vector** — click to add Catmull-Rom spline control points; Enter (or click the first point) closes and fills the polygon; Backspace removes the last point; Esc resets; Mode (Add / Erase)
- **Shape** — drag to draw a rectangle or ellipse; hold Shift for a perfect square/circle; blue dashed outline preview while dragging; Properties pane: Mode (Add / Erase), Shape (Rect / Ellipse)
- **Help — Support page** — added **ComfyUI Image Feeder** and **Mask Editor One** GitHub repository links to the Support card
### v0.3.65
- **Image Edit — Mask Editor One integration fixes** — `store_image` API field mismatch (`image_b64` → `bg_image_b64`) corrected so BiRefNet and SAM3 no longer report "no image available"; `server.py` updated to accept both field names for backward compatibility
- **Image Edit — top bar icon persistence** — WFS / Snapshot / Node Sets SVG icons in the ComfyUI action bar disappeared when the Properties Panel was opened (Vue re-render reset custom `innerHTML` to `<i>`); fixed with a `MutationObserver` that re-applies SVG icons whenever a reset is detected
- **Image Edit — Mask Tool: ABR brush library** (requires Mask Editor One) — Select button in the Properties pane opens a folder-tree + thumbnail-grid brush picker; stamp brushes are loaded from Mask Editor One's `/mask_editor/brushes/` folder; ✕ clears back to the default circle brush
- **Image Edit — Mask Tool: ABR brush controls** — when an image brush is active, Hardness is disabled and new controls appear in the Properties pane: Spacing (stamp interval 5–100%), Angle (fixed rotation 0–359°), Sz Jitter (random size reduction per stamp 0–100%), Rot. Jitter (random angle per stamp on/off); size jitter clamped to minimum 1 px to prevent zero-dimension canvas errors
- **Image Edit — Mask brush cursor** — brush size circle is now hidden outside the canvas; only shown when the pointer is within the canvas bounds (window-level mousemove no longer shows the cursor overlay outside)
### v0.3.64
- **Image Edit — Mask layer Add/Subtract** — A/S toggle button on each mask layer row; Add (green, default) composites the mask normally; Subtract (red) cuts the mask area from the layer below; multiple mask layers are composited back-to-front matching Mask Editor One's CanvasCompositor logic
- **Image Edit — BiRefNet BG Remove** (requires Mask Editor One + `birefnet.safetensors` in `ComfyUI/models/background_removal/`) — BiRefNet model now fully functional via Mask Editor One's Python backend; grayscale mask returned as RGBA PNG and applied as a new layer or in-place per the New Layer toggle
- **Image Edit — SAM3 segmentation** (requires Mask Editor One) — new SAM3 sub-tool in the Mask tool options bar; enter a text prompt, set Max candidates (3/6/9/12), click Segment; candidate mask thumbnails shown in the Properties pane; click to select (multi-select), Apply Selected (N) applies all chosen masks with Add or Erase mode; new mask layer auto-created if active layer is not a mask
### v0.3.63
- **Nodes tab — multi-select** — Ctrl+click to toggle individual nodes, Shift+click for range selection; bulk action bar appears with add to group / remove from group / create & add group / bulk favorite / unfavorite; works in both Card and Table view modes
- **All tabs — search clear (✕)** — inline ✕ overlay button inside each search box (Workflow / Nodes / Models / Gallery); shown only when text is entered, click to clear and re-filter immediately
- **All tabs — clear all filters button** — new ✕ Clear button at the rightmost end of each tab's toolbar; resets all active filters (search, group, tag, folder, favorites, badge) in one click; Gallery sort order is preserved
### v0.3.62
- **Gallery tab — Send GenUI Image button** — new toolbar button (next to Image Edit); uploads the selected image to ComfyUI and sets it as the input for the first LoadImage node in the GenerateUI tab; automatically switches to GenerateUI → Input → Image; `comfyEditor.applyImageToSlot(file, slotIndex)` added to `comfyui-editor.js` for reusable image-slot injection
- **Bug fix: tagger_settings.json missing from data export** — `tagger_settings.json` was absent from `_DATA_FILES` in `settings_routes.py`; Tagger model directory and threshold settings were silently excluded from Settings → Data Management export/import; fixed by adding the file to the export list
- **Help — Send GenUI Image** — new help card (`helpGallery17`) added in EN/JA/ZH; registered in `helpIdMap`
- **Screenshots — Tagger and Image Edit tabs** — `docs/12_Tagger.png` and `docs/13_ImageEdit.png` added to the README screenshots section
### v0.3.61
- **Image Edit — Draw / Mask brush cursor** — cursor replaced with a size-accurate circle overlay matching the current brush size; the circle scales correctly with canvas zoom so the visible area matches exactly what will be painted
- **Image Edit — Draw / Mask out-of-canvas strokes** — strokes can now start from the canvas margin area (outside the image boundary) and continue past the edge without interruption; `window`-level `mousemove` / `mouseup` tracking keeps the stroke alive when the pointer leaves the canvas element
- **G'MIC — argument order fix** — corrected `gmic_qt.exe` launch arguments to `-o <output> <input>` (the only order G'MIC-Qt Standalone accepts); the previous order caused the GUI to exit immediately without opening
@@ -391,10 +600,12 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
- **Help — G'MIC Filter section** — added two new help cards (G'MIC Filter usage and G'MIC-Qt Installation) with full i18n support (English / Japanese / Chinese)
### v0.3.60
- **Image Edit — Filter tool (G'MIC-Qt integration)** — the previously inactive ★ Filter tool now launches G'MIC-Qt GUI with the active layer image; select a filter and click OK, then close the "G'MIC-Qt filter output" window to apply the result back as the active layer; polling-based job system with progress display, Cancel button, and Undo support; requires G'MIC-Qt Standalone (`gmic_qt.exe`) configured in Settings
- **Settings — G'MIC-Qt Executable Path** — new collapsible section in Settings for entering and saving the path to `gmic_qt.exe`
### v0.3.59
- **Image Edit — Mask Tool** — new Mask tool (🎭) in the Image Edit sidebar; click **M** in the Layers header to add a mask layer (Mask tool activates automatically); clicking a mask layer in the layer list also switches to the Mask tool; **Tool Options bar**: Paint button, Invert checkbox (inverts overlay preview), Overlay color picker (default red), Blur slider (0–50 px) for overlay edge softening; **Properties pane** (left of the Layers panel, shown when Mask tool is active): Size (1–200 px), Hardness (0–100%), Mode — **Add** / **Erase** toggle buttons (active mode highlighted in blue)
- **Image Edit — Clipping mask (✂ button)** — each mask layer row shows a ✂ toggle; when enabled (blue), the mask clips the layer directly below it so only the painted area is visible; clipping is applied to PNG save / Save to Gallery / Send to ComfyUI exports
- **Image Edit — Draw & Mask paint bugfix** — Draw and Mask tools now paint directly onto `layer.canvas`; all other layers remain fully visible during brush strokes (previously the composite view was replaced by the active layer only while painting)
@@ -402,20 +613,24 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
- **Help — Mask Tool section** — added Mask Tool card with full i18n support (English / Japanese / Chinese); updated Tools list, layer type icon list, and Layer panel "M button" description
### v0.3.58
- **GenerateUI Model tab — Diffusion Model GGUF support** — `LoaderGGUF` and `LoaderGGUFAdvanced` nodes are now recognized alongside `UNETLoader` / `UnetLoaderGGUF`; the correct input key (`gguf_name` vs `unet_name`) is selected automatically on Apply; the Models tab "GenUI Model" button also applies correctly to `LoaderGGUF` workflows
- **GenerateUI Model tab — Text Encoder expanded (CLIPLoader / DualCLIPLoader / GGUF variants)** — the Text Encoder section now renders a node-type-aware UI: **single CLIP** (`CLIPLoader` / `ClipLoaderGGUF`) shows one clip selector + **type** dropdown + **device** (GGUF only); **Dual CLIP** (`DualCLIPLoader` / `DualClipLoaderGGUF`) shows two clip selectors (clip_name1 / clip_name2) + **type** dropdown + **device** (GGUF only); type options are fetched dynamically from `/object_info`; filter applies to the first selector only
### v0.3.57
- **Image Edit — Blur tool** — new Blur tool (≈) in the Image Edit sidebar; **Whole Blur**: Gaussian blur to the entire active layer with intensity slider (1–50 px); **Whole Mosaic**: pixelation mosaic with block-size slider (5–100 px); **Rect Blur / Rect Mosaic**: toggle to enter rect-draw mode then drag to select a region — blur or mosaic is applied on mouse release; Rect Blur and Rect Mosaic are mutually exclusive; all operations support Undo (Ctrl+Z)
- **Image Edit — BG Remove tool** — new BG Remove tool (⬚); **Lightweight (@imgly)**: background removal running entirely in the browser via CDN (~40 MB model cached after first load); **BiRefNet**: stub wired to a future Python backend endpoint (coming soon); **New Layer** checkbox (default on) adds the result as a new layer above the original — uncheck to replace the active layer in-place; supports Undo
- **Image Edit — sidebar icons** — removed `ie-tool-placeholder` dimming from Blur and BG Remove buttons; both now display at full brightness matching other active tools
- **Help — Blur / BG Remove sections** — added two new help cards (Blur Tool and BG Remove Tool) with full i18n support (English / Japanese / Chinese); Tools list updated with Blur and BG Remove overview items
### v0.3.56
- **GenerateUI — Style selector** — new checkbox and dropdown next to the Reset Workflow button; when enabled, a Fooocus-style JSON style is applied to positive and negative prompts at generation time; style files (`*.json`) are read from `user/default/Workflow-Studio/style/`; multiple files are merged into a single list sorted by filename; the style's `{prompt}` placeholder is replaced with the original prompt text, otherwise the style text is appended; `negative_prompt` is appended to the existing negative prompt; styles are applied to a per-generation workflow copy and never modify the loaded workflow
- **Batch tab — Style batch** — new **Style** tab in the Batch left pane lists all styles loaded from the style directory (flat list with All / None buttons); select any combination, enable the **Style** column in Batch Queue, then Generate to run each selected style sequentially; Batch Queue expanded from 6 to 7 columns (Style added as the rightmost column)
### v0.3.55
- **Group feature — fix data loss on Windows (backslash/slash mismatch)** — on Windows, ComfyUI returns model paths with backslashes (`sub\model.safetensors`) while the backend normalized to forward slashes; this caused all subdir group members to be flagged as missing and deleted on save; fixed by normalizing both stored and scanned paths to forward slashes in `get_model_groups` and `save_model_groups`
- **Group feature — network drive protection** — if no model directories are accessible (e.g. external drive disconnected), the group cleanup step is now skipped entirely to prevent wiping all group memberships
- **Group feature — scan cache** — `_scan_model_names` now caches results for 30 seconds to eliminate redundant full directory scans on startup (caused high CPU load / crash on large model sets)
@@ -429,19 +644,23 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
- **Help tab — Image Edit section i18n** — the Image Edit help page was hardcoded in English with no language switching support; all 6 sections (30 items + 7 headings) now have i18n IDs wired to English / Japanese / Chinese translations
### v0.3.54
- **Image Edit — Shape tool (S)** — new Shape tool added to the Image Edit toolbar; draw Rect, Ellipse, Line, and FreeLine shapes by dragging; each committed shape becomes an independent draw layer that can be undone in a single step; Tool Options: shape type selector, Rounded toggle (Rect/Ellipse only), Fill color + None toggle (hidden for Line/FreeLine), Stroke color + width (Stroke None hidden for Line/FreeLine where stroke is always active), Opacity slider, Undo button; blue dashed outline previews the shape during drag; keyboard shortcut **S** activates the tool
- **Models tab — fix B/S overlay buttons not highlighting** — the Batch (B) and Stack (S) card overlay buttons failed to turn yellow after clicking because `e.currentTarget` is nulled by the browser after an `async` event handler yields at `await`; fixed by capturing `const btn = e.currentTarget` before the await in both handlers
### v0.3.53
- **Image Edit Tab** — new layer-based image editing tab with Select / Draw / Text tools, multi-layer compositing, canvas zoom & pan, and Undo/Redo; text layers are sized to exact bounding-box dimensions and regenerated at display resolution on resize to prevent blurring; double-click a text layer to re-edit its content; Gallery tab gains an "Image Edit" toolbar button to send the selected image directly to the editor
- **Image Edit — Layer lock** — lock icon (🔒/🔓) on each layer row; locked layers display an orange bounding box and ignore all Select-tool transforms; Layer 1 is auto-locked when the first image is loaded to prevent accidental moves
- **Image Edit — Save to Gallery** — "Save to Gallery" button (next to Save PNG) saves the composite image to the Gallery root folder; filename defaults to `wfs-image-YYYYMMDDHHmmss`; backed by new `POST /wfm/gallery/image/save` API endpoint
- **Help tab — Image Edit page** — new dedicated help page covering tools, layer panel, text quality, export options, and keyboard shortcuts
### v0.3.52
- **GenerateUI Model tab — fix LoRA selection reset when switching subtabs** — applying a LoRA via "GenUI Model" button and then switching to another subTab (Prompt/Image/Settings) and back to Model caused the LoRA selector, syntax display, and trigger words to revert to the original workflow values; fixed by reading `currentVal` directly from `currentWorkflow` instead of the stale `currentAnalysis`, and by saving/restoring the Single tab's syntax and trigger words across re-renders
### v0.3.51
- **Models tab — Embedding type: GenUI PP / GenUI NP buttons** — Embedding models now show two buttons ("GenUI PP" and "GenUI NP") in the side panel nav, detail side panel, and detail modal (replacing the single "GenUI Model" button); clicking either appends `(embedding:Name:1.0)` to the Positive or Negative prompt of the loaded workflow
- **GenerateUI Prompt tab — Embeddings selector** — new section at the bottom of the Prompt tab: Filter input, model select dropdown, Weight input (default 1.0), and Paste button; Paste inserts `(embedding:Stem:weight)` at the cursor position of the last focused textarea (Positive or Negative); focus state is tracked on click/keyup/blur so the button works even after clicking away
- **GenerateUI Model tab — Hypernetwork support** — Hypernetwork section added with model selector (filter) and Strength field; applies to `HypernetworkLoader` nodes in the workflow; GenUI Model button in Models tab also triggers Hypernetwork apply
@@ -449,33 +668,40 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
- **Models tab — GenUI Model button in side panel nav** — "GenUI Model" button added to the tab navigation bar (Info / Group / CivitAI) of the side panel; appears for supported model types (Checkpoint, LoRA, VAE, etc.) and hides for unsupported types; Embedding type shows PP/NP nav buttons instead
### v0.3.50
- **Gallery tab — fix prompt search causing ComfyUI hang under large folders** — the v0.3.49 on-demand metadata read ran synchronously on the aiohttp event loop, blocking ComfyUI when folders contained many uncached images; fixed by: (1) removing on-demand reads from `list_images()`; (2) wrapping `list_images()` in `asyncio.to_thread()` to keep the event loop free; (3) adding a background indexer (`start_background_index`) that automatically indexes uncached images after a folder is loaded — processes 10 images per batch with a 50 ms sleep between batches; cancellable on folder switch
### v0.3.49
- **GenerateUI tab — A1111-style SPA-side wildcard expansion** — when prompt text in non-ImpactWildcard nodes (e.g. CLIPTextEncode) contains `__name__` syntax, the SPA expands it at generation time by randomly picking a line from the matching file in the WFS wildcard folder; nested wildcards are re-expanded up to 5 passes; unresolved wildcards are passed through unchanged; ImpactWildcardEncode/Processor nodes are skipped (handled server-side by Impact Pack); works in both single and batch generation
- **Gallery tab — fix Export button missing label** — the bulk action bar's Export button had no text label because the `textContent` assignment was missing from `updateUITexts()`; fixed by adding the `galleryBulkExport` i18n key assignment alongside the existing Move/Delete entries
- **Gallery tab — fix prompt search not matching images with no cached index** — `prompt_cache` was only built when an image was opened in the detail panel; A1111 images (or any images never opened) were invisible to prompt search; now when search is active and `prompt_cache` is empty, the image file is read on-demand and the cache is populated and persisted for future searches
### v0.3.48
- **Gallery tab — single image download** — hover over a detail-panel preview image to reveal a download overlay (⬇ icon); click to download the original file with its original filename preserved
- **Gallery tab — bulk export to ZIP** — multiple selected images can be exported as a ZIP archive via the "Export" button in the bulk action bar; filename: `gallery_export_<timestamp>.zip`; backend: `POST /wfm/gallery/images/export-zip` with path-traversal protection
### v0.3.47
- **Models tab — fix stale group state after file move** — when models were moved to a subdirectory via "Move To...", `state.modelGroups` in the JS client was not updated to reflect the new model paths; the group filter view would lose the moved models immediately after the operation. Now the client-side group membership is updated in sync with the server-side rename (mirrors the existing Python `move_models` logic). Generate tab Batch groups are unaffected as they always fetch fresh from the server.
### v0.3.46
- **Prompt tab AI Assistant — LM Studio support** — switched from Python proxy (`/api/wfm/ollama/*`) to direct browser-to-backend API calls (same pattern as the AI TOOL tab); supports Ollama (`/api/chat`) and LM Studio (`/v1/chat/completions`); image attachments are automatically converted to the correct format per backend
- **Settings tab — AI Assistant Settings (Prompt Tab)** — renamed from "Ollama Settings"; added backend selector (Ollama / LM Studio), URL input with per-backend placeholder, model select with Refresh, and Test button; settings saved to localStorage `wfm_prompt_ai_settings` (independent of AI TOOL tab settings)
- **Auto-refresh on backend change** — if the backend is switched in Settings tab while Prompt tab is already open, `sendMessage()` now detects the mismatch and automatically re-fetches the model list before sending; model status shows the active backend name (`[ollama]` / `[lmstudio]`)
- **Help text updated** (EN/JA/ZH) — Prompt tab, Settings tab, and Troubleshooting sections updated to reflect Ollama / LM Studio dual-backend support
### v0.3.45
- **Group auto-cleanup — Models tab** — stale group entries (models that no longer exist on disk) are automatically removed when the Models tab is loaded or the model type is switched; models moved within the app via "Move To..." also update their group membership immediately
- **Group auto-cleanup — Gallery tab (folder view)** — metadata entries for missing files are cleaned up each time a folder is scanned (`list_images`), synchronized with the 60s TTL + folder-mtime cache
- **Group auto-cleanup — Gallery tab (group image list)** — `list_images_in_group` (used by the Feeder tab Gallery mode) now filters out non-existent paths and removes them from the group in a single write operation
- **Gallery tab — Shift+click range selection** — Shift+click selects all images between the last clicked item (anchor) and the current item; works in both thumbnail and table views; anchor is updated on Ctrl+click and regular click; resets on folder change, image reload, and Deselect All; help text updated (EN/JA/ZH)
### v0.3.44
- **Gallery tab — server-side thumbnail generation** — `GET /wfm/gallery/image/thumb?path=...&w=256` endpoint generates 256px JPEG thumbnails via Pillow and caches them to `data/thumb_cache/` keyed by `md5(path:mtime:width)`; GIF served as-is to preserve animation; falls back to the original file if Pillow is unavailable; thumbnail view and table view both switched from `/image/serve` to `/image/thumb`
- **Gallery tab — infinite-scroll paging** — thumbnail view renders 50 images initially; an IntersectionObserver sentinel (rootMargin 300px) appends the next page on scroll; sentinel is disconnected and removed when all images are rendered; paging resets on every `renderImages()` call (folder change, filter, sort)
- **Gallery tab — bulk API endpoints** — `POST /wfm/gallery/bulk/favorite` and `POST /wfm/gallery/bulk/group` handle favorite set and group add/remove for any number of images in a single request; replaced N-parallel individual fetches in `bulkSetFavorite()` and `bulkAddToGroup()`
@@ -488,10 +714,12 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
- **Help tab — search box** — live search input above the nav sidebar filters matching pages and auto-clicks the first result; placeholder text localized (EN/JA/ZH)
### v0.3.43
- **Send to Canvas — direct canvas load via `window.opener`** — clicking "Send to Canvas" (Workflow tab) or "Copy & Send Canvas" (Gallery tab) now sends the workflow directly to the ComfyUI canvas without requiring a title drag; uses `window.opener.wfmReceiveWorkflow()` registered by `node_sets_menu.js` via `app.handleFile()`; both UI and API formats are supported; fallback to localStorage + title drag when `window.opener` is unavailable (e.g. opened from a bookmark), UI-format only
- **Workflow Studio Library — API-format DnD enabled** — API-format workflows in the W (Workflows) sub-tab are no longer grayed out; drag & drop and double-click now work for all formats via `app.handleFile()`
### v0.3.42
- **Feeder tab — Gallery mode** — new [Image Loop] / [Gallery] toggle in the Feeder tab; Gallery mode drives a WFS_GalleryFeeder node without any external plugin: node selector, group select, sort mode / index / seed, After Gen (Loop / Increment / Fixed), Run / Stop; center pane shows the selected group's images — click any image to jump to that index; `__Feeder__` group is auto-created on first open
- **WFS_GalleryFeeder custom node** — new ComfyUI node (Workflow Studio category) that reads images from a Gallery group and outputs one `IMAGE` at a time; inputs: `group_name`, `index`, `sort_mode` (filename_asc / filename_desc / random), `seed`; skips missing files; `IS_CHANGED` ensures re-execution on every queue
- **WFS_GalleryFeeder — ComfyUI canvas controls** — `gallery_feeder_extension.js` adds After Gen combo (loop / increment / fixed), ▶ Run button, and ■ Stop button as non-serialized widgets directly on the node in the ComfyUI canvas; manages per-node loop state with `waitForExecution()` Promise pattern; `onRemoved` hook auto-stops the loop on node deletion
@@ -503,6 +731,7 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
- **Bug fix: WFS_GalleryFeeder seed validation error** — seed `max` changed from `0x7FFFFFFF` to `0xffffffffffffffff` (matching KSampler); `applySeedToWorkflow()` was writing values exceeding the old max, causing `value_bigger_than_max` validation failures
### v0.3.41
- **Generate UI — ImpactWildcardEncode / ImpactWildcardProcessor prompt detection** — fixed: wildcard text inputs from comfy-impact-pack nodes were not shown in the Prompt tab of Generate UI
- `CLIPTextEncodeEditPlus` node (used as the text encoder in these workflows) now correctly propagates positive/negative roles upstream to ImpactWildcard nodes via BFS
- `CLIPTextEncodeEditPlus` with an empty `text_edit` field is no longer added to `prompt_nodes` ahead of the upstream ImpactWildcard node, preventing a blank text area
@@ -510,17 +739,20 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
- Static fallback mapping added for `ImpactWildcardProcessor` and `ImpactWildcardEncode` so detection works even when the ComfyUI server is offline
### v0.3.40
- **AI TOOL tab — Chat pane** — new pane (between Translation and TOOLS) for multi-turn conversation with the LLM; full conversation history sent each turn for context; Enter to send, Shift+Enter for newline; Clear button resets history; Ollama uses `/api/chat`, LM Studio uses `/v1/chat/completions`
- **AI TOOL tab — Wildcard generation** — new "Create wildcards" task in the TOOLS pane dropdown; enter a category name and count, click Run to generate plain-text entries one per line (no markdown, no numbering); output can be pasted directly into wildcard `.txt` files
- **Library A tab — Chat and Wildcards** — both features added to the side panel's A tab: Chat as a new sub-tab (Translation → Chat → TOOLS → Settings), wildcard generation as a new option in the TOOLS sub-tab dropdown
- **Help updated** — AI TOOL tab help card updated to 6 items (Chat and Wildcards added); Library panel sidepanel-16 updated; EN/JA/ZH
### v0.3.39
- **Workflow tab — Send to Canvas button** — replaced "Open in ComfyUI" (toolbar and detail modal) with "Send to Canvas"; stores the selected workflow in `localStorage` for title-drag to the canvas without opening a new browser tab
- **Gallery tab — Copy & Send Canvas button** — renamed "Copy Workflow" to "Copy & Send Canvas"; copies the embedded workflow JSON to the clipboard and simultaneously stores it for title-drag
- **Workflow Studio Library — title drag** — after "Send to Canvas" or "Copy & Send Canvas" is clicked, the "Workflow Studio Library" panel title turns blue with a green ● indicator; drag the title onto the ComfyUI canvas to load the workflow; title resets automatically after loading
### v0.3.38
- **Tagger tab** — new tab for automatic image tagging; supports WD Tagger (ONNX), SwinV2, DeepDanbooru (.h5), and Ollama VLM; 3 sub-tabs: Single (drag & drop / upload, 5 output targets), Batch (folder processing with real-time progress), DB (searchable SQLite database with CSV export)
- **Tagger single — GenUI:P button** — new button (left of "Send to Prompt") that appends generated tags to the GenerateUI positive prompt and immediately applies them to the loaded workflow; shows a warning if no workflow is loaded in GenerateUI
- **Tagger batch — Write .txt output** — new output option that creates `<filename>.txt` alongside each processed image containing all generated tags (comma-separated)
@@ -531,11 +763,13 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
- **Workflow analyzer — lumina2 model type** — CLIPLoader `type: "lumina2"` is now correctly classified as Z-IMAGE in the workflow type detector
### v0.3.37
- **Models tab — Select All button** — new button added to the right of "Deselect All" in the multi-select action bar; selects all models currently visible after applying the active search / filter / group filters
- **Gallery tab — Select All button** — new button added to the right of "Deselect All" in the bulk action bar; selects all images in the current folder view
- **Gallery bulk bar — i18n** — all bulk action bar buttons and the selection count were hard-coded English strings; they now use the `t()` translation system (EN / JA / ZH) so the bar respects the selected UI language
### v0.3.36
- **GenerateUI Save — overwrite protection** — saving now checks for an existing file and asks for confirmation before overwriting; if the target file is in UI format, a dedicated warning explains that saving in API format will lose the node layout
- **GenerateUI Save — Raw JSON sync** — unapplied Raw JSON edits are now included in the save (parsed and synced back to the editor); invalid JSON aborts the save with an error instead of silently saving stale content
- **GenerateUI Save — hardening** — filename is set via DOM (no HTML-attribute injection), image extensions (`.png` etc.) are stripped from the default name, and a double-submit guard prevents duplicate POSTs
@@ -545,11 +779,13 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
- **README refreshed** — intro rewritten around the three pillars (Management / GenerateUI / Library side panel); new screenshots: GenUI LoRA Stack, GenUI Batch, Models Multi-select Menu; WS Library image updated
### v0.3.35
- **Models tab — Table column sort** — click any column header to sort ascending (▲), click again for descending (▼), click a third time to clear; active column name highlighted in accent color; Enable/Disable column header now labeled **E/D**
- **Gallery tab — Load GenUI button** — new button to the right of the Metadata button in the detail panel; loads the embedded ComfyUI workflow from the selected image directly into the GenerateUI tab; warning toast shown if no workflow is embedded or the format is unsupported; Metadata button restyled green, Load GenUI uses primary accent color
- **GenerateUI tab — Save button** — new button at the right end of the subtab row; opens a filename dialog (default: current workflow name) and saves the current workflow as a `.json` file to the Workflow tab via the import API; workflow name label updates to the saved filename on success
### v0.3.33
- **LoRA pane — workflow load no longer overwrites LoraManager** — removed the auto-apply block that replaced `inputs.loras` / `inputs.text` with Stack group contents on every workflow load; Stack is now applied only when the Apply button is pressed
- **LoRA pane — 🔄 button no longer resets to Single tab** — active tab state is saved before `innerHTML` rebuild and restored afterwards; staying on Stack tab after refresh
- **Models tab — Stack group hidden for non-LoRA types** — when switching to Checkpoint or other non-LoRA types, the Stack group is now excluded from the group filter dropdown and side-panel group management (LoRA-only concept)
@@ -557,20 +793,24 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
- **Stack Apply — trigger words now applied correctly on first press** — trigger words (`currentAllTriggers` / `currentActiveTriggers`) are now recomputed at click time from the latest `_stackActive` + `metadata` + `civitaiCache`; previously used a stale snapshot captured at render time, causing trigger words to be missing on the first Apply and to linger after disabling a model
### v0.3.32
- **Lora Loader (LoraManager) LoRA detection** — I tab and Metadata tab now correctly detect LoRAs from `Lora Loader (LoraManager)` nodes in API format (`inputs.loras.__value__`); `strength`/`clipStrength` stored as strings (e.g. `"0.20"`) are now parsed correctly
- **LoraManager node placement — LoRA syntax** — placing a `Lora Loader (LoraManager)` node via drag now also updates the `text` widget with `<lora:name:strength>` syntax (previously only the `loras` array widget was set)
- **M tab Groups — LoRA → LoraManager drop** — LoRA groups in the Library M tab show an **All N LoRAs** item; drag to canvas places a `Lora Loader (LoraManager)` node with all group LoRAs; double-click also places at canvas center
- **P tab — Groups sub-tab** — new Groups sub-tab (row 2) in the Library P tab; groups are read from `localStorage["wfm_prompt_preset_groups"]` (shared with Batch); expanding a group shows draggable preset items
### v0.3.31
- **LoRA pane — Single/Stack tabs** — LoRA pane split into two tabs: Single (filter, model dropdown, M/C strength, target node, Apply, P, LORA SYNTAX, TRIGGER WORDS) and Stack (target node, Apply, P, Toggle-all, global strength adjuster, LORA SYNTAX, TRIGGER WORDS, model list); each tab has independent strength settings
- **GenUI Model — LoRA improvements** — now correctly handles `Lora Loader (LoraManager)` nodes (previously failed to find the node); on apply: switches to Single tab, disables all Stack models, and updates LORA SYNTAX / TRIGGER WORDS in the Single tab panel
### v0.3.30
- **LoRA Stack trigger words fix** — inactive stack models no longer show their trigger words in the Trigger words display; both initial render and per-model toggle/toggle-all now filter to active models only
- **Help troubleshooting** — added entry for "No such file or directory" error when running LoRA Stack (comfyui-lora-manager compatibility issue)
### v0.3.29
- **LoRA section unified** — single LoRA and Stack sections merged into one pane; Apply button handles both cases (stack models present → apply all active + prompt sync; no stack → apply selected single LoRA + prompt sync); Ctrl+Apply removed, now plain Apply by default
- **LoRA prompt sync** — Apply inserts `<lora:stem:M:C>` syntax and CivitAI trigger words into the Positive prompt; re-applying updates the prompt by diff (removes stale tokens, re-adds active ones); works for both single LoRA and Stack
- **P button** — placed to the right of Apply; immediately writes the current Positive prompt textarea to the target workflow node without switching tabs
@@ -589,22 +829,26 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
- **Models thumbnail bug fixes** — preview endpoint now sends `Cache-Control: no-cache`; files under 100 bytes skipped; `.disabled` model files included in preview change lookup
### v0.3.23
- **Bug fix: workflow batch 404** — `_runBatchGenerate()` workflow case was fetching `/api/wfm/workflows/{filename}` (non-existent route); corrected to `/api/wfm/workflows/raw?filename={filename}`
- **Bug fix: rename double-submit** — `addEventListener("blur", commitRename)` was accumulating on the persistent `#wfm-modal-title-input` element each time the modal opened; subsequent renames fired the handler twice, sending two rename requests back-to-back (first succeeds, second returns 409 or 404); fixed by storing the listener reference on `titleInput._commitRename` and calling `removeEventListener` before re-registering
### v0.3.22
- **Card view removed** — Workflow tab and Models tab no longer offer Card view; Thumbnail and Table remain; if `"card"` was previously stored in localStorage it falls back to Thumbnail automatically
- **Batch type selector** — replaced the Checkpoint Batch toggle with per-type checkboxes on the Batch Queue column headers (Checkpoint / Lora / Prompt / Workflow); radio behavior ensures only one type is active at a time; the Batch panel below Generate repurposed as a status display showing the active type, amber progress bar, and Pause/Resume / Stop controls
- **4-type batch generation** — `_runBatchGenerate()` dispatches to Checkpoint (file-tree + group selection), Lora (group selection), Prompt (preset group items applied to positive/negative nodes), and Workflow (group selection, restores original workflow after batch); all types use the same generic `_runBatchLoop()` with pause/abort support
- **Help updated** — EN / JA / ZH strings updated for `helpWf1`, `helpModels2`, `helpGen11`, `helpGen13`, `helpGen14`
### v0.3.21
- **CivitAI Host setting** — new dropdown in Settings tab (CivitAI section): choose `civitai.com` (SFW only) or `civitai.red` (unrestricted); selection is saved to `settings.json` and synced to `localStorage` so the Models tab uses it immediately without extra server calls
- **CivitAI panel — Info / Sample sub-tabs** — the CivitAI side panel is split into two sub-tabs; Info tab contains model details and actions; Sample tab shows all sample images (count displayed in label); images open full-size in a new browser tab on click
- **Bug fix: model page URL for existing cache** — `modelId: null` entries (the majority of the cache) previously generated broken links (`/models?modelVersionId=…`); both the Python service and the JS renderer now fall back to `/{host}/model-versions/{versionId}` which redirects correctly to the model page; all 324 existing cache entries are fixed immediately without re-fetching
- **Help updated** — Batch tab entries (gen-12 / gen-13 / gen-14) and Settings entries (settings-11 Text Size / settings-12 RAW JSON Colors / settings-13 CivitAI Host) are now fully localized in EN / JA / ZH; `helpGen3` updated to reflect 5-tab layout; `helpGen11` rewritten to describe the Batch toggle; JA/ZH translations no longer contain untranslated English terms (Filter, Pause/Resume, Stop)
### v0.3.20
- **CivitAI panel — Type / Base Model / Hash display** — side panel CivitAI tab now shows a Type badge (e.g. CHECKPOINT, LORA), Base Model row, and Hash row (BLAKE3 preferred, SHA256 fallback from CivitAI API or local metadata); click the hash to copy the full value to clipboard
- **CivitAI panel — images open in new tab** — sample images in the CivitAI tab are now wrapped in links; clicking an image opens the full-size version in a new browser tab
- **CivitAI panel — 3-state UI** — the panel now distinguishes between "not yet checked" (blue fetch button), "checked but not found on CivitAI" (re-check button with a notice), and "found" (full info); no more ambiguity after running batch fetch
@@ -613,6 +857,7 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
- **CivitAI cache — `fileHashes` field added** — `_extract_info` now stores the primary file's full hash map (BLAKE3, SHA256, AutoV2, etc.) so the Hash row is populated for newly fetched or refreshed models
### v0.3.19
- **CivitAI batch fetch — major speedup** — switched from one-by-one `GET` requests (0.5 s delay each) to `POST /model-versions/by-hash` batch endpoint; up to 100 hashes per request, reducing 100-model fetch from ~50 s to a few seconds
- **Retry with exponential backoff** — `fetch_by_hash` and the new batch POST both retry on HTTP 429 / 500 / 502 / 503 / 504 with 1 s → 2 s → 4 s delays (max 3 attempts), as recommended in the CivitAI API docs
- **CivitAI API key support** — optional Bearer token can be set in Settings tab (CivitAI API Key section); environment variable `CIVITAI_API_KEY` takes priority over the stored key; API keys are excluded from data exports
@@ -621,29 +866,35 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
- **Bug fix: CivitAI tab blank after batch fetch** — the `done` SSE event now applies `data.hashes` directly to `state.modelMetadata` so the side-panel CivitAI tab renders correctly even when the subsequent `fetchModelMetadata()` call races ahead of the server flush
### v0.3.18
- **Batch tab** — new 5th subtab in GenerateUI with a dedicated 3-pane layout for assembling checkpoint batch queues; left pane: file-tree checkpoint selection (filter, All/None, initially unchecked); center pane: group-based selection with inner tabs (Checkpoint / Lora / Prompt / Workflow — Lora/Prompt/Workflow coming soon); right pane: live Batch Queue preview combining both pane selections with duplicates removed
- **Checkpoint selector moved** — the checkpoint dropdown is removed from the right panel; selection is now done exclusively in the Batch tab left and center panes; the right panel retains only the enable/disable toggle and progress display
- **Group selection fix** — batch group selection now stores selected group names (not raw model names), so changes to group membership in the Models tab are always reflected in the queue without stale entries
- **Models tab bulk operations expanded** — bulk action bar now includes: Deselect All (clear all selections without exiting select mode), ★ Favorite / ☆ Unfavorite, +Badge / −Badge (apply or remove a badge from all selected models); existing group and delete operations unchanged
### v0.3.17
- **CivitAI SSL fix** — resolved `CERTIFICATE_VERIFY_FAILED` errors when fetching model info on Windows Portable Python environments; uses `certifi` CA bundle when available, falls back to system store, and disables verification only as a last resort with a warning log
- **Lora Manager support** — `Lora Loader (LoraManager)` nodes (ComfyUI-Lora-Manager) are now correctly converted from UI format to API format in the GenerateUI tab; the `loras` widget array is wrapped to `{"__value__": [...]}` as required by the node, enabling generation with LoRA Manager workflows
### v0.3.16
- **CivitAI preview fallback** — model cards and the detail panel's Info tab now display the first CivitAI image directly when no local preview file exists; if the backend download fails (e.g. network restriction server-side), the browser fetches the image URL from the CivitAI cache as a fallback so the preview is always shown after fetching
### v0.3.15
- **Sample workflows** — added `workflows/` directory containing 13 sample workflows (SD1.5 / SDXL / DWPose / Face Detailer / Image Editing) with PNG thumbnails, bundled in the package
- **CivitAI auto-preview** — when fetching CivitAI info (individual or batch), the first CivitAI image is automatically downloaded and saved as `{model_stem}.preview.png` if no preview exists; batch summary reports the count of auto-saved previews
- **TOOLS pane — Create Tags** — new task option in the VLM dropdown (both SPA AI TOOL tab and Library A tab): generates a comma-separated list of descriptive English tags from the image
### v0.3.14
- **AI TOOL tab redesign** — tab renamed from "A" to "AI TOOL"; sub-tab navigation removed in favor of a permanent 3-pane layout (Translation 40% | TOOLS 40% | Settings 20%) — all panes always visible simultaneously; "VLM" pane renamed to "TOOLS"
- **Settings — RAW JSON Colors** — new accordion section with 6 color pickers to customize the syntax highlight colors for the Raw JSON editor in Generate UI: Default Text, Name/Scheduler, Title, Width/Height, Prompt/Text, Image/File; changes apply immediately on color pick; Reset Defaults restores the original scheme; saved to `localStorage` under `wfm_settings.jsonColors` and applied on startup
- **Help tab updated** — AI TOOL tab card rewritten; Settings card updated with RAW JSON Colors entry; Library panel sidepanel-16 entry updated
### v0.3.13
- **AI Tab (A)** — new tab added to both the SPA and the Workflow Studio Library side panel (rightmost tab)
- **Translation sub-tab** — translate text via Ollama or LM Studio between Japanese, English, Chinese, or a custom Free language; ⇄ swap button exchanges both language selectors and text content simultaneously; language selections persisted automatically
- **VLM sub-tab** — drop zone (110px, matching the I tab) accepts images via drag & drop or click; task selector (Describe Image / Create Prompt); Run button streams result into output area with Copy button; Ollama uses `images:[base64]` payload, LM Studio uses `image_url` content block
@@ -653,15 +904,18 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
- **Help Tab updated** — added AI Tab (A) feature card and Library panel A tab entry; i18n support in EN/JA/ZH
### v0.3.12
- **GenerateUI — Raw JSON search** — always-visible search bar above the Raw JSON editor; finds all matches as you type with match count (`3/12`); navigate forward/back with ↑/↓ buttons, Enter / Shift+Enter, or Escape / ✕ to clear; current match highlighted in orange, other matches in yellow; search overlay syncs with editor scroll and stays updated while editing
- **Workflow analyzer — extended model type detection** — added CLIPLoader `type` field mapping to model family (`flux`, `hidream_i`, `wan`, `cosmos`, `lumina`, `ovis`, etc.) via `_CLIP_TYPE_TO_MODEL`; subgraph nodes (`definitions.subgraphs`) now scanned for model detection; `UnetLoaderGGUF` and similar loaders matched via `"UnetLoader" in ntype`; new families added: NewBie, Ovis, HiDream, Wan, Cosmos, Lumina; model-name detection refactored into reusable `_detect_model_type_from_name()`
- **Screenshots refreshed** — replaced tab-by-tab screenshots with 8 feature-focused images
### v0.3.11
- **Metadata Tab — extended loader support** — `metadata-tab.js` now recognizes `UnetLoaderGGUF` and `UNETLoaderGGUF` as Diffusion Model (e.g. HiDream GGUF workflows), and `QuadrupleCLIPLoader` as Text Encoder (e.g. HiDream 4-CLIP); previously these were detected only in the side panel I tab, not in the Metadata tab itself
- **Settings Tab — Text Size** — new slider (10–28 px) in the Settings tab adjusts font size for all prompt and chat text areas at once: Generate UI positive/negative prompts, AI Assistant chat input, Preset prompts, Wildcard text area and file editor, and Metadata prompt full preview; applied immediately on drag and persisted with Save Settings
### v0.3.10
- **Information tab — drag to canvas** — model, lora, and Prompts sub-tabs in the side panel I tab now support drag & drop onto the ComfyUI canvas; double-click also places nodes at canvas center
- model sub-tab: each item places the corresponding loader node (Checkpoint → `CheckpointLoaderSimple`, VAE → `VAELoader`, Diffusion Model → `UNETLoader`, Text Encoder → `CLIPLoader`)
- lora sub-tab: drag individual LoRA to place `LoraLoader`; **Multiple LORA** section (shown for 1+ LoRAs) places all LoRAs in a single `Lora Loader (LoraManager)` node
@@ -671,44 +925,52 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
- **Preview area fixed height** — Information tab drop zone fixed at 110px so model/prompt lists are no longer compressed when a large image is loaded
### v0.3.9
- **Side panel I tab** — new Information tab in the Workflow Studio Library side panel; drop a ComfyUI PNG/WebP/JSON directly in the panel to inspect models, LoRAs, and prompts without opening the Metadata tab; sub-tabs: model / lora / Prompts with full-text preview and Copy button
- **Side panel tab redesign** — tabs shortened to single letters (W / N / P / M / I) with full name shown on hover
- **Bug fix: top bar icons** — icons (Workflow Studio / camera / Node Sets) were invisible in newer ComfyUI versions because Iconify converted the MDI CSS class to an inline SVG before the custom SVG could be injected; fixed by removing the early-return guard and adopting the same simple `requestAnimationFrame` retry pattern used by lora-manager
### v0.3.8
- **Metadata Tab: extended subgraph support** — added extraction for Flux.2 Dev fp8 (`SamplerCustomAdvanced`), Flux.2 Klein 4B Distilled (image edit), Ernie Image, Qwen-Image-Edit 2511 (`TextEncodeQwenImageEditPlus`), and WAN2.2 14B Animate (top-level CLIPTextEncode + subgraph KSampler)
- **Prompt type: Text (no badge)** — when positive/negative polarity cannot be determined (indirect sampler connections, cross-level links, `PrimitiveStringMultiline` etc.), prompts are listed without a POS/NEG badge; action buttons still work normally
- **Prompt extraction improvements** — `extractPromptsFromNodeSet` now resolves link sources from any STRING-output node (e.g. `ComfySwitchNode`, `PrimitiveStringMultiline`) without type restriction; `PrimitiveStringMultiline` search and final text-encoder fallback both extended to include subgraph nodes via `collectAllNodes`
- **i18n** — added `metaPromptText` key (EN: "Text" / JA: "テキスト" / ZH: "文本")
### v0.3.7
- **Metadata Tab: subgraph workflow support** — Flux.2 (Dev fp8 / Klein), Qwen-Image-Edit (/ 2511 / Layered), and Z-Image (Base / Turbo) official templates now correctly extract models and prompts; these use ComfyUI's `definitions.subgraphs` format with `UNETLoader`, `CLIPLoader`, and `VAELoader` inside the subgraph
- **Prompt extraction improvements** — 7-stage fallback chain: ImageMetadataPromptLoader → WFS_PromptText → top-level CLIPTextEncode+KSampler → `PrimitiveStringMultiline` (flux2-klein) → subgraph CLIPTextEncode+KSampler → PromptStyler → all CLIPTextEncode text
- **MarkdownNote model fallback** — `extractMarkdownNoteModels()` parses `**section** → - [model](url)` patterns from MarkdownNote nodes as a supplemental model source
- **Format note updated** — "Flux.2 / Qwen-Image / Z-Image subgraph workflows supported" (EN/JA/ZH)
### v0.3.6
- **Metadata Tab** — new tab (between Prompt and Gallery) that extracts model and prompt information from ComfyUI-generated PNG/WebP images and workflow JSON files; 3-column layout: drop zone with image preview (left), Checkpoint/VAE/Diffusion Model/Text Encoder lists (center), LoRA list with strength values + Prompt list with full-text viewer (right)
- **Prompt action buttons** — Copy, GenUI:P/N (set GenerateUI prompts), Prompt:P/N (set Prompt tab preset prompts) directly from the extracted prompt text
- **SDXL Prompt Styler support** — improved prompt extraction resolves `PromptStyler → CLIPTextEncode` link chains in both LiteGraph and API workflow formats
- **Format support** — ComfyUI (PNG/WebP/JSON), SD WebUI, SD Forge, Fooocus
### v0.3.5
- **Feeder subtab** — new subtab in GenerateUI for controlling [comfyui-image-feeder](https://github.com/ketle-man/comfyui-image-feeder) nodes; left pane: node selector + all ImageFeeder parameters + presets + Run/Stop controls; center pane: folder tree, image grid with checkbox selection, and preview panel
- **Run loop with After gen modes** — Loop (wrap and continue), Increment (advance and auto-stop), Fixed (constant index); index updates automatically via WebSocket `image_loop_node_sync` after each generation; seed comes from the right-pane seed setting
- **Workflow analysis improvements** — `analyzeWorkflow` now handles multi-hop CONDITIONING chains via BFS (up to 5 iterations), CLIPTextEncodeSDXL / CLIPTextEncodeSDXLRefiner, SDXLPromptStyler / SDXLPromptStylerAdvanced, KSamplerAdvanced (`noise_seed`), TextEncodeQwenImageEditPlus, PrimitiveStringMultiline, Power Lora Loader (rgthree), and `Checkpoint Loader` (WAS) with space in the class name
### v0.3.4
- **Wildcard support panel** — new right column in the Prompt tab with a one-click toolbar for inserting wildcard syntax (`{|}`, `{n$|}`, `__|__`, `:`, `;`, `$`, `<lora::1:LBW=;>`, `[]`, single/multi pick) and wrapping selected text; dedicated prompt textarea and wildcard file picker (click to insert `__filename__`)
- **Wildcard file manager** — create, view, edit, and delete `.txt` / `.yaml` wildcard files stored in `user/default/Workflow-Studio/wildcard/`; editor opens inline with filename input and save/cancel controls
- **Preset/Preset Manager tab switch** — the center pane of the Prompt tab is now a two-tab panel (Presets / Preset Manager) to reclaim horizontal space for the new wildcard panel
- **Wildcard Integration setting** — new accordion section in Settings tab; auto-detects ComfyUI-Impact-Pack; when installed, provides a button to create a directory junction (Windows) or symlink (other OS) from the WFS wildcard directory to Impact Pack's `wildcards/` directory; existing WFS files are migrated automatically; a Remove Link button reverses the operation
### v0.3.2
- **Checkpoint Batch** — new panel in the GenerateUI right column (below Seed, above results); enable via checkbox to auto-generate once per checkpoint model; filter included/excluded subfolders by comma-separated names (empty = all checkpoints); real-time preview of matched model count; amber progress bar shows current model name and index; Stop button aborts the loop after the current generation completes; failed models are counted and reported in the summary toast
- **Seed layout fix** — seed value input and mode selector (Random / Fixed / Increment / Decrement) now stacked vertically so neither is clipped in narrow panels
### v0.3.1
- **Folder operations** — create subfolders and delete folders (with all contents) directly from the folder tree header buttons
- **File operations** — move or delete individual images from the detail panel; bulk move and bulk delete from the multi-select bar
- **Tree state preserved** — folder expansion state is maintained after create/delete/move/refresh operations
@@ -716,10 +978,12 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
- **Workflow auto-save** — after each generation in the Generate UI tab, the current workflow is automatically saved to gallery metadata for the generated images; shown in the Metadata tab even if PNG embedding is absent
### v0.3.0
- **Cross-type group filter** — the group filter dropdown in the Models tab now shows groups from all model types simultaneously, each prefixed with a type label (`[Checkpoint]`, `[LoRA]`, etc.); selecting a group automatically switches to the corresponding model type
- **Sidebar group display fixed** — the ComfyUI sidebar "Model Groups" view now correctly renders per-type groups (introduced in v0.2.9) with a type label on each group header; fixes a crash where `.filter is not a function` was thrown on the new nested group structure
### v0.2.9
- **Model Enable/Disable** — hide models from ComfyUI by renaming the file extension to `.disabled`; toggle per model (⏸ button on each card/row), per group (Enable All / Disable All buttons in the Group panel), or filter the grid by status (All / Enabled only / Disabled only). Changes take effect after ComfyUI refresh.
- **Per-type model groups** — groups are now scoped to each model type; checkpoint groups only appear in the Checkpoint tab, LoRA groups only in the LoRA tab, etc. Existing flat groups are automatically migrated.
- **Multi-select mode** — click the Select button in the toolbar to enter selection mode; check individual models across Thumbnail / Card / Table views
@@ -729,10 +993,12 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
- **Bug fix** — Hypernetwork tab showed `C`, `O`, `M`, `B` as fake model items; caused by the new ComfyUI API format returning `"COMBO"` as the first element; fixed in `comfyui-client.js`
### v0.2.8
- **Data storage moved** — plugin data (settings, metadata, prompts, etc.) is now stored in `ComfyUI/user/default/Workflow-Studio/` instead of `custom_nodes/ComfyUI-Workflow-Studio/data/`; falls back to the old `data/` directory if `user/default/` does not exist
- **Data Management section** — new Settings tab section to export all plugin data to a single JSON file and import it back; useful for migration, backup, and reinstallation
### v0.2.7
- **Gallery tab** — new image browser for ComfyUI output folder; Thumbnail/Table views, multi-select with Bulk Bar, server-side group/tag/favorite filtering, group management (rename support), performance-optimized with + mtime folder cache
- **Group UI unified** — Workflow, Nodes, and Gallery group panels rebuilt to match the Models tab 4-section pattern (Current Groups / Add to Group / Create New Group / Manage Groups); Rename support added to Workflow and Nodes tabs
- **Settings 2-column layout** — Theme panel fixed on the right (50% width, sticky); all other settings flow continuously on the left with no visual gap
@@ -740,18 +1006,21 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
- **Help tab** — Gallery tab description card added
### v0.2.5
- **Sidebar Category/Package sub-tabs** — added 📂 Category and 🧩 Package sub-tabs to the Nodes tab in Workflow Studio Library; each shows a dropdown to filter nodes by category or custom node package (reads `/object_info` for accurate package detection)
- **Sidebar theme settings** — added ⚙ button in the panel header to customize background, sub-header background, text, border, and secondary text colors with live preview; settings saved to localStorage
- **Sidebar TextEncoder (By Type)** — fixed TextEncoder not appearing in Models → By Type; now uses `DualCLIPLoader` → `CLIPLoader` fallback to retrieve `clip_name1` list
- **Hide `.index.json`** — excluded `.index.json` from both the Workflow tab and the Workflow Studio Library side panel
### v0.2.4
- **GenerateUI tab redesign** — reorganized from 5 tabs (Prompt/Image/Model/Settings/Raw JSON) to 3 tabs (Input/Model/Settings); each tab shows a Raw JSON column (540px) for instant JSON preview and direct editing from any tab
- **Input tab** — Prompt and Image stacked vertically in the left column
- **Settings tab** — KSampler and LatentImage stacked vertically in the left column
- **Raw JSON tab removed** — Raw JSON is now always visible as a right-column panel within each tab
### v0.2.3
- **Badge system unified** — Workflow and Models tabs now share a single badge palette (`⚙ Badge` button); workflow auto-analysis model type system removed in favor of user-defined free-label badges
- **GenUI Model button** — apply any model from the Models tab directly to the corresponding node in GenerateUI's current workflow (available in detail modal and side panel; Checkpoint / LoRA / VAE / ControlNet / UNET / TextEncoder)
- **Sidebar Models tab** — added All / ★ Favorites / Groups / By Type sub-tabs to the Models section of Workflow Studio Library
@@ -759,6 +1028,7 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
- **Sidebar panel width** — widened from 280px to 310px
### v0.2.2
- **Models tab** — browse, search, and manage all installed ComfyUI models (Checkpoint, LoRA, VAE, ControlNet, UNET, TextEncoder) with Thumbnail/Card/Table views
- **CivitAI integration** — fetch model metadata by SHA256 hash (individual or batch per model type) with SSE progress streaming
- **Model groups** — create, rename, delete groups and assign/remove models for organization
@@ -771,6 +1041,7 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
- **Help tab updated** — Models Tab section added to feature list
### v0.2.0
- **Prompt presets in sidebar** — added Prompts tab to Workflow Studio Library (ComfyUI side panel) with All / Favorites / Categories sub-tabs
- **WFS_PromptText custom node** — drag prompt presets onto the canvas to create nodes with positive/negative prompt outputs
- **Preset Manager** — 3-column layout in Prompt tab: AI Assistant | Presets editor | Preset Manager (All / Favorites / Groups)
@@ -782,47 +1053,56 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture
- **Help tab updated** — Prompt Tab and Workflow Studio Library sections reflect new features
### v0.1.9
- **Side panel 2-row sub-tabs** — Workflows: row 1 (Workflows / Favorites / Groups), row 2 (Model Type); Nodes: row 1 (Nodes / Favorites / Groups), row 2 (Sets)
- **Save dialog** — canvas snapshot now shows a filename edit dialog instead of auto-naming
- **API/App format badge** — workflow items in side panel show red (API) or orange (APP) badge
- **Group auto-cleanup** — deleted workflows are automatically removed from groups on refresh
### v0.1.8
- **WF & Node Library side panel** — renamed from "Node Library", added two top-level tabs (Workflows / Nodes) accessible from ComfyUI top bar
- **Workflows tab** — browse favorite workflows, filter by model type, filter by group with collapsible sections
- **Workflow drag & drop** — drag workflows from the side panel onto the canvas to load them instantly
- **Help tab update** — added Nodes Tab and WF & Node Library sections to the feature list
### v0.1.7
- **Nodes tab** — browse, search, and filter all installed ComfyUI nodes with Card/Table views, pagination (50 nodes/page), package color badges, and node detail side panel with I/O specs
- **Node Sets** — save selected nodes + connections from ComfyUI canvas as reusable sets via right-click context menu
- **Node Library side panel** — accessible from ComfyUI top bar with Favorites, Sets, and Groups tabs, drag & drop placement
- **3 top bar buttons** — Workflow Studio, Canvas Snapshot, and Node Library buttons in ComfyUI's action bar
### v0.1.6
- **Security fix** — path traversal vulnerability in `workflow_service.py` (reported via ComfyUI-Manager PR review)
### v0.1.5
- **Theme system** — 13 built-in themes selectable from Settings tab with instant preview (Deep Ocean Dark, Pop & Vibrant, Light Minimalist, Cyberpunk, Glassmorphism, Neumorphism, Retro 8-bit, Pastel Dream, Brutalism, Earthy, Material UI, Monotone + Accent, Corporate Trust)
- Theme preference persisted in localStorage and restored on page load (no flash)
- Special CSS effects per theme: neon glow (Cyberpunk), backdrop blur (Glassmorphism), dual shadow (Neumorphism), pixel borders (Retro/Brutalism)
### v0.1.4
- **App format support** — detect `.app.json` workflows (ComfyUI App mode), show "App Format" badge, block loading in GenerateUI with guidance message
- **Preset clipboard copy** — added PP Copy / NP Copy buttons to copy positive/negative prompts to clipboard
- **Analysis bugfix** — fixed workflow analysis crash when `widgets_values` contains non-string values (e.g. integers)
### v0.1.3
- Added **Help & Support tab** — feature list, tips, and support links (GitHub, Ko-fi)
- Multi-language support (EN/JA/ZH) for all help content
### v0.1.2
- Added **Canvas Snapshot** button to ComfyUI top bar — capture workflow canvas as PNG thumbnail with embedded workflow metadata
- Added **Thumbnail tab** to the workflow side panel for quick visual preview
- Added **Thumbnail section** to the workflow detail modal
- Snapshot images are auto-imported as workflows with thumbnails
### v0.1.1
- Initial feature set: Workflow management, GenerateUI, Prompt assistant, Settings
---
@@ -905,3 +1185,4 @@ MIT License
- [ComfyUI-Gallery](https://github.com/PanicTitan/ComfyUI-Gallery) by PanicTitan — thumbnail grid UX reference
- [infinite-image-browsing](https://github.com/zanllp/sd-webui-infinite-image-browsing) by zanllp — thumbnail caching and index strategy reference
- [Fooocus](https://github.com/lllyasviel/Fooocus) by lllyasviel — style preset JSON format reference
+2
View File
@@ -69,6 +69,8 @@ NODE_SETS_FILE = DATA_DIR / "node_sets.json"
PROMPTS_FILE = DATA_DIR / "prompts.json"
MODEL_METADATA_FILE = DATA_DIR / "model_metadata.json"
WILDCARD_DIR = DATA_DIR / "wildcard"
AI_SKILLS_DIR = DATA_DIR / "ai_skills"
LAB_PLAN_DIR = DATA_DIR / "lab_plan"
# Tagger
TAGGER_DB_FILE = DATA_DIR / "tagger.db"
+103 -2
View File
@@ -3,6 +3,7 @@
import asyncio
import json
import logging
import os
import urllib.request
import urllib.error
@@ -17,6 +18,84 @@ def setup_routes(app: web.Application):
app.router.add_post("/api/wfm/eagle/test", handle_test)
def _resolve_local_path(filename, subfolder, type_name):
"""filename/subfolder/type を ComfyUI 出力ディレクトリ上の実パスに解決する。
ComfyUI と Eagle が同一マシン上で動作している場合のみ有効なパスが返る
(別マシンの場合は None を返し、呼び出し側は addFromURL にフォールバックする)。"""
try:
import folder_paths # type: ignore
except Exception:
return None
base_dir = folder_paths.get_directory_by_type(type_name or "output")
if not base_dir:
return None
base_dir = os.path.abspath(base_dir)
filename = os.path.basename(filename or "")
if not filename:
return None
full_dir = os.path.abspath(os.path.join(base_dir, subfolder or ""))
# Windowsはパス比較で大文字小文字を区別しないため normcase で正規化してから比較する
if os.path.commonpath((os.path.normcase(full_dir), os.path.normcase(base_dir))) != os.path.normcase(base_dir):
# ディレクトリトラバーサル対策: base_dir 配下以外は拒否
return None
full_path = os.path.join(full_dir, filename)
if not os.path.isfile(full_path):
return None
return full_path
def _resolve_absolute_svg_path(abs_path):
"""comfyui-tosvg の Save SVG String ノードなどが返す絶対パスを検証する。
ComfyUI管理下(output/input/temp)ディレクトリ配下の実在する .svg ファイルのみ許可する
(任意の絶対パスをそのまま信頼すると、外部からこのAPIを叩かれた際に
ローカルの任意ファイルを送信させられてしまうため)。"""
if not abs_path or not abs_path.lower().endswith(".svg"):
return None
try:
import folder_paths # type: ignore
except Exception:
return None
abs_path = os.path.abspath(abs_path)
if not os.path.isfile(abs_path):
return None
for type_name in ("output", "temp", "input"):
base_dir = folder_paths.get_directory_by_type(type_name)
if not base_dir:
continue
base_dir = os.path.abspath(base_dir)
try:
# Windowsはパス比較で大文字小文字を区別しないため normcase で正規化してから比較する
if os.path.commonpath((os.path.normcase(abs_path), os.path.normcase(base_dir))) == os.path.normcase(base_dir):
return abs_path
except ValueError:
# Windowsで異なるドライブレターの場合 commonpath が例外を投げる
continue
return None
def _eagle_add_from_path(eagle_url, file_path, name, tags):
"""Proxy request to Eagle's addFromPath API (runs in thread).
SVG は ComfyUI の /view がセキュリティ上 application/octet-stream +
attachment で返すため、addFromURL 経由だと正しい種別で保存されないことがある。
ComfyUI と Eagle が同一マシン上にある場合はローカルパスを直接渡す方が確実。"""
eagle_url = eagle_url.rstrip("/")
payload = json.dumps({"path": file_path, "name": name, "tags": tags}).encode("utf-8")
req = urllib.request.Request(
f"{eagle_url}/api/item/addFromPath",
data=payload,
headers={"Content-Type": "application/json"},
method="POST",
)
with urllib.request.urlopen(req, timeout=10) as resp:
return json.loads(resp.read().decode("utf-8"))
def _eagle_add(eagle_url, image_url, name, tags):
"""Proxy request to Eagle API (runs in thread)."""
eagle_url = eagle_url.rstrip("/")
@@ -71,11 +150,33 @@ async def handle_add(request: web.Request) -> web.Response:
image_url = body.get("url", "")
name = body.get("name", "image.png")
tags = body.get("tags", [])
filename = body.get("filename", "")
subfolder = body.get("subfolder", "")
file_type = body.get("type", "output")
local_path_hint = body.get("localPath", "")
if not image_url:
if not image_url and not local_path_hint:
return web.json_response({"status": "error", "message": "No URL provided"}, status=400)
result = await asyncio.to_thread(_eagle_add, eagle_url, image_url, name, tags)
# SVG は /view が application/octet-stream + attachment で返すため、
# ローカルファイルが解決できる場合は addFromPath で直接渡す
local_path = None
if local_path_hint:
# comfyui-tosvg の Save SVG String ノードなど、絶対パスが既知の場合
local_path = _resolve_absolute_svg_path(local_path_hint)
elif (filename or name or "").lower().endswith(".svg"):
local_path = _resolve_local_path(filename or name, subfolder, file_type)
if not local_path and not image_url:
return web.json_response(
{"status": "error", "message": f"Could not resolve local SVG path: {local_path_hint}"},
status=400,
)
if local_path:
result = await asyncio.to_thread(_eagle_add_from_path, eagle_url, local_path, name, tags)
else:
result = await asyncio.to_thread(_eagle_add, eagle_url, image_url, name, tags)
return web.json_response(result)
except urllib.error.URLError as e:
logger.error("Eagle URL error: %s", e)
+23 -7
View File
@@ -260,8 +260,18 @@ async def toggle_favorite(request: web.Request) -> web.Response:
return web.json_response({"error": str(e)}, status=500)
_SAVE_EXT_BY_MIME = {
"image/png": ".png",
"image/jpeg": ".jpg",
"image/webp": ".webp",
"image/gif": ".gif",
"image/svg+xml": ".svg",
}
async def save_image_to_gallery(request: web.Request) -> web.Response:
"""Image Edit Tab からの PNG をギャラリーのルートフォルダに保存する。"""
"""Image Edit Tab / AI Chat からの画像(PNG等)やSVGをギャラリーのルートフォルダに保存する。
imageData は data URL (data:<mime>;base64,<data>) を想定。ヘッダがなければPNG扱い(旧互換)。"""
try:
body = await request.json()
filename = body.get("filename", "").strip()
@@ -273,15 +283,21 @@ async def save_image_to_gallery(request: web.Request) -> web.Response:
if _service._allowed_root is None:
return web.json_response({"error": "Gallery root not configured. Open Gallery tab and set output folder first."}, status=500)
# data URL から MIME タイプを判定し、拡張子を決定する
raw = image_data
mime = "image/png"
if raw.startswith("data:"):
header, _, raw = raw.partition(",")
m = re.match(r"data:([^;]+)", header)
if m:
mime = m.group(1)
ext = _SAVE_EXT_BY_MIME.get(mime, ".png")
# ファイル名サニタイズ(OSで使えない文字を除去)
safe = re.sub(r'[<>:"/\\|?*\x00-\x1f]', "_", filename)
if not safe.lower().endswith(".png"):
safe += ".png"
if not safe.lower().endswith(ext):
safe += ext
# base64 data URL をデコード
raw = image_data
if "," in raw:
raw = raw.split(",", 1)[1]
image_bytes = base64.b64decode(raw)
save_path = _service._allowed_root / safe
+71
View File
@@ -0,0 +1,71 @@
"""Lab tab plan file management API routes."""
import asyncio
import logging
from aiohttp import web
from ..config import LAB_PLAN_DIR
from ..services.lab_plan_service import LabPlanService
logger = logging.getLogger(__name__)
_service = LabPlanService(LAB_PLAN_DIR)
def setup_routes(app: web.Application):
app.router.add_get("/api/wfm/lab/plans", handle_list)
app.router.add_get("/api/wfm/lab/plans/content", handle_get_content)
app.router.add_post("/api/wfm/lab/plans/save", handle_save)
app.router.add_post("/api/wfm/lab/plans/delete", handle_delete)
async def handle_list(request: web.Request) -> web.Response:
try:
result = await asyncio.to_thread(_service.list_plans)
return web.json_response(result)
except Exception as e:
logger.error("Error listing lab plans: %s", e)
return web.json_response({"error": str(e)}, status=500)
async def handle_get_content(request: web.Request) -> web.Response:
filename = request.rel_url.query.get("filename", "")
try:
data = await asyncio.to_thread(_service.get_plan, filename)
return web.json_response({"data": data})
except FileNotFoundError:
return web.json_response({"error": "not found"}, status=404)
except ValueError as e:
return web.json_response({"error": str(e)}, status=400)
except Exception as e:
logger.error("Error getting lab plan content: %s", e)
return web.json_response({"error": str(e)}, status=500)
async def handle_save(request: web.Request) -> web.Response:
try:
body = await request.json()
filename = body.get("filename", "")
data = body.get("data", {})
index_image_base64 = body.get("index_image_base64")
result = await asyncio.to_thread(_service.save_plan, filename, data, index_image_base64)
return web.json_response({"status": "ok", **result})
except ValueError as e:
return web.json_response({"error": str(e)}, status=400)
except Exception as e:
logger.error("Error saving lab plan: %s", e)
return web.json_response({"error": str(e)}, status=500)
async def handle_delete(request: web.Request) -> web.Response:
try:
body = await request.json()
filename = body.get("filename", "")
await asyncio.to_thread(_service.delete_plan, filename)
return web.json_response({"status": "ok"})
except ValueError as e:
return web.json_response({"error": str(e)}, status=400)
except Exception as e:
logger.error("Error deleting lab plan: %s", e)
return web.json_response({"error": str(e)}, status=500)
+3 -2
View File
@@ -82,7 +82,8 @@ async def handle_chat(request: web.Request) -> web.Response:
try:
body = await request.json()
cfg = _get_ollama_config()
model = body.get("model", cfg["model"])
model = body.get("model") or cfg["model"]
base_url = (body.get("url") or cfg["url"]).rstrip("/")
messages = body.get("messages", [])
def _chat():
@@ -92,7 +93,7 @@ async def handle_chat(request: web.Request) -> web.Response:
"stream": False,
}).encode("utf-8")
url = f"{cfg['url']}/api/chat"
url = f"{base_url}/api/chat"
req = urllib.request.Request(
url,
data=payload,
+64
View File
@@ -0,0 +1,64 @@
"""AI skill (.md system prompt) file management API routes."""
import asyncio
import logging
from aiohttp import web
from ..config import AI_SKILLS_DIR
from ..services.skill_service import SkillService
logger = logging.getLogger(__name__)
_service = SkillService(AI_SKILLS_DIR)
def setup_routes(app: web.Application):
app.router.add_get("/api/wfm/skills", handle_list)
app.router.add_get("/api/wfm/skills/content", handle_get_content)
app.router.add_post("/api/wfm/skills/save", handle_save)
app.router.add_post("/api/wfm/skills/delete", handle_delete)
async def handle_list(request: web.Request) -> web.Response:
try:
result = await asyncio.to_thread(_service.list_skills)
return web.json_response(result)
except Exception as e:
logger.error("Error listing skills: %s", e)
return web.json_response({"error": str(e)}, status=500)
async def handle_get_content(request: web.Request) -> web.Response:
filename = request.rel_url.query.get("filename", "")
try:
content = await asyncio.to_thread(_service.get_content, filename)
return web.json_response({"content": content})
except FileNotFoundError:
return web.json_response({"error": "not found"}, status=404)
except Exception as e:
logger.error("Error getting skill content: %s", e)
return web.json_response({"error": str(e)}, status=500)
async def handle_save(request: web.Request) -> web.Response:
try:
body = await request.json()
filename = body.get("filename", "")
content = body.get("content", "")
result = await asyncio.to_thread(_service.save_file, filename, content)
return web.json_response({"status": "ok", "file": result})
except Exception as e:
logger.error("Error saving skill: %s", e)
return web.json_response({"error": str(e)}, status=500)
async def handle_delete(request: web.Request) -> web.Response:
try:
body = await request.json()
filename = body.get("filename", "")
await asyncio.to_thread(_service.delete_file, filename)
return web.json_response({"status": "ok"})
except Exception as e:
logger.error("Error deleting skill: %s", e)
return web.json_response({"error": str(e)}, status=500)
+107 -81
View File
@@ -3,6 +3,7 @@ Gallery Metadata Store - ギャラリー画像のメタデータ永続化
"""
import json
import logging
import threading
from pathlib import Path
logger = logging.getLogger(__name__)
@@ -24,14 +25,24 @@ class GalleryMetadataStore:
{"name": str}
]
}
self._data(特に "images" 辞書)は、バックグラウンドのフォルダインデックススレッド
(gallery_service.pyの_bg_index_folder)と、リクエストハンドラを処理するメインスレッドの
双方から並行に読み書きされる。ロックなしで辞書を反復(.items()/.values()/for key in ...や
json.dumpによるシリアライズ)している最中に別スレッドがキーを追加/削除すると
"dictionary changed size during iteration" が発生するため、_data へアクセスする
全メソッドを self._lock で保護する(re-entrant: ensure_group()がcreate_group()を
内部呼び出しするため、通常のLockではなくRLockを使う)。
"""
def __init__(self, file_path: Path):
self.file_path = file_path
self._lock = threading.RLock()
self._data: dict = {"images": {}, "groups": []}
self._load()
def _load(self):
# コンストラクタからのみ呼ばれ、この時点ではまだ他スレッドと共有されていないためロック不要
if self.file_path.exists():
try:
with open(self.file_path, "r", encoding="utf-8") as f:
@@ -44,6 +55,7 @@ class GalleryMetadataStore:
logger.warning("GalleryMetadataStore: load error: %s", e)
def _save_to_disk(self):
# 呼び出し元(save/create_group等)が既にself._lockを保持している前提の内部メソッド
try:
self.file_path.parent.mkdir(parents=True, exist_ok=True)
with open(self.file_path, "w", encoding="utf-8") as f:
@@ -58,113 +70,126 @@ class GalleryMetadataStore:
def get(self, image_path: str) -> dict:
key = self._normalize_path(image_path)
return dict(self._data["images"].get(key, {}))
with self._lock:
return dict(self._data["images"].get(key, {}))
def save(self, image_path: str, data: dict) -> bool:
key = self._normalize_path(image_path)
existing = self._data["images"].get(key, {})
existing.update(data)
allowed = {"favorite", "tags", "memo", "groups", "workflow"}
existing = {k: v for k, v in existing.items() if k in allowed}
self._data["images"][key] = existing
return self._save_to_disk()
with self._lock:
existing = self._data["images"].get(key, {})
existing.update(data)
allowed = {"favorite", "tags", "memo", "groups", "workflow"}
existing = {k: v for k, v in existing.items() if k in allowed}
self._data["images"][key] = existing
return self._save_to_disk()
# ── グループ管理 ──────────────────────────────────────────────
def list_groups(self) -> list[dict]:
return list(self._data.get("groups", []))
with self._lock:
return list(self._data.get("groups", []))
def create_group(self, name: str) -> bool:
groups = self._data.get("groups", [])
if any(g["name"] == name for g in groups):
return False
groups.append({"name": name})
self._data["groups"] = groups
return self._save_to_disk()
with self._lock:
groups = self._data.get("groups", [])
if any(g["name"] == name for g in groups):
return False
groups.append({"name": name})
self._data["groups"] = groups
return self._save_to_disk()
def rename_group(self, old_name: str, new_name: str) -> bool:
"""グループ名を変更し、全画像のgroupsフィールドも更新する"""
groups = self._data.get("groups", [])
if not any(g["name"] == old_name for g in groups):
return False
if any(g["name"] == new_name for g in groups):
return False # 新名前が既に存在
# グループリスト更新
for g in groups:
if g["name"] == old_name:
g["name"] = new_name
break
# 全画像のgroupsフィールドを更新
for meta in self._data["images"].values():
img_groups = meta.get("groups", [])
if old_name in img_groups:
meta["groups"] = [new_name if g == old_name else g for g in img_groups]
return self._save_to_disk()
with self._lock:
groups = self._data.get("groups", [])
if not any(g["name"] == old_name for g in groups):
return False
if any(g["name"] == new_name for g in groups):
return False # 新名前が既に存在
# グループリスト更新
for g in groups:
if g["name"] == old_name:
g["name"] = new_name
break
# 全画像のgroupsフィールドを更新
for meta in self._data["images"].values():
img_groups = meta.get("groups", [])
if old_name in img_groups:
meta["groups"] = [new_name if g == old_name else g for g in img_groups]
return self._save_to_disk()
def delete_group(self, name: str) -> bool:
groups = [g for g in self._data.get("groups", []) if g["name"] != name]
self._data["groups"] = groups
# 画像のgroupsからも削除
for meta in self._data["images"].values():
if name in meta.get("groups", []):
meta["groups"] = [g for g in meta["groups"] if g != name]
return self._save_to_disk()
with self._lock:
groups = [g for g in self._data.get("groups", []) if g["name"] != name]
self._data["groups"] = groups
# 画像のgroupsからも削除
for meta in self._data["images"].values():
if name in meta.get("groups", []):
meta["groups"] = [g for g in meta["groups"] if g != name]
return self._save_to_disk()
def list_images_in_group(self, group_name: str) -> list[str]:
result = []
for key, meta in self._data["images"].items():
if group_name in meta.get("groups", []):
result.append(key)
return result
with self._lock:
result = []
for key, meta in self._data["images"].items():
if group_name in meta.get("groups", []):
result.append(key)
return result
def remove_stale_paths_from_group(self, group_name: str, stale_paths: list) -> int:
"""存在しないパスをグループから一括削除する(1回の保存で完結)"""
stale_set = {self._normalize_path(p) for p in stale_paths}
count = 0
for key, meta in self._data["images"].items():
if key in stale_set and group_name in meta.get("groups", []):
meta["groups"] = [g for g in meta["groups"] if g != group_name]
count += 1
if count:
self._save_to_disk()
return count
with self._lock:
stale_set = {self._normalize_path(p) for p in stale_paths}
count = 0
for key, meta in self._data["images"].items():
if key in stale_set and group_name in meta.get("groups", []):
meta["groups"] = [g for g in meta["groups"] if g != group_name]
count += 1
if count:
self._save_to_disk()
return count
def get_group_member_set(self, group_name: str) -> set:
"""グループメンバーのパスをsetで返す(高速フィルタ用)"""
return {
key for key, meta in self._data["images"].items()
if group_name in meta.get("groups", [])
}
with self._lock:
return {
key for key, meta in self._data["images"].items()
if group_name in meta.get("groups", [])
}
def clear_group(self, group_name: str) -> bool:
"""グループ内の全画像を除外する(グループ自体は残す)"""
for meta in self._data["images"].values():
if group_name in meta.get("groups", []):
meta["groups"] = [g for g in meta["groups"] if g != group_name]
return self._save_to_disk()
with self._lock:
for meta in self._data["images"].values():
if group_name in meta.get("groups", []):
meta["groups"] = [g for g in meta["groups"] if g != group_name]
return self._save_to_disk()
def ensure_group(self, name: str) -> bool:
"""グループが存在しない場合のみ作成する"""
if any(g["name"] == name for g in self._data.get("groups", [])):
return True
return self.create_group(name)
with self._lock:
if any(g["name"] == name for g in self._data.get("groups", [])):
return True
return self.create_group(name)
def delete(self, image_path: str) -> bool:
"""画像のメタデータエントリを削除する"""
key = self._normalize_path(image_path)
if key in self._data["images"]:
del self._data["images"][key]
return self._save_to_disk()
return True
with self._lock:
if key in self._data["images"]:
del self._data["images"][key]
return self._save_to_disk()
return True
def rename_path(self, old_path: str, new_path: str) -> bool:
"""画像のパスキーを変更する(ファイル移動後のメタデータ引継ぎ)"""
old_key = self._normalize_path(old_path)
new_key = self._normalize_path(new_path)
if old_key in self._data["images"]:
self._data["images"][new_key] = self._data["images"].pop(old_key)
return self._save_to_disk()
return True
with self._lock:
if old_key in self._data["images"]:
self._data["images"][new_key] = self._data["images"].pop(old_key)
return self._save_to_disk()
return True
def cleanup_stale_images(self, folder_path: str, existing_paths: set) -> int:
"""folder_path 配下の存在しないファイルのメタデータを削除する。
@@ -173,14 +198,15 @@ class GalleryMetadataStore:
folder_key = self._normalize_path(folder_path)
if not folder_key.endswith("/"):
folder_key += "/"
stale = [
key for key in self._data["images"]
if key.startswith(folder_key) and key not in existing_paths
]
if not stale:
return 0
for key in stale:
del self._data["images"][key]
self._save_to_disk()
logger.info("Cleaned up %d stale metadata entries from %s", len(stale), folder_path)
return len(stale)
with self._lock:
stale = [
key for key in self._data["images"]
if key.startswith(folder_key) and key not in existing_paths
]
if not stale:
return 0
for key in stale:
del self._data["images"][key]
self._save_to_disk()
logger.info("Cleaned up %d stale metadata entries from %s", len(stale), folder_path)
return len(stale)
+6 -1
View File
@@ -16,7 +16,7 @@ from typing import Any
logger = logging.getLogger(__name__)
# サポートする画像拡張子
IMAGE_EXTENSIONS = {".png", ".jpg", ".jpeg", ".webp", ".gif"}
IMAGE_EXTENSIONS = {".png", ".jpg", ".jpeg", ".webp", ".gif", ".svg"}
# メタデータ保存ファイル (gallery専用)
from .gallery_metadata import GalleryMetadataStore
@@ -684,6 +684,11 @@ class GalleryService:
if p.suffix.lower() == ".gif":
return p
# SVG はベクター画像でPillowが開けないため、元ファイルをそのまま返す
# (<img>タグはブラウザ側で任意サイズにスケーリングして表示する)
if p.suffix.lower() == ".svg":
return p
try:
mtime = int(p.stat().st_mtime * 1000)
except OSError:
+121
View File
@@ -0,0 +1,121 @@
"""Lab tab plan file management service (JSON plan + optional PNG index thumbnail)."""
import base64
import json
import logging
from datetime import datetime, timezone
from pathlib import Path
logger = logging.getLogger(__name__)
class LabPlanService:
def __init__(self, plan_dir: Path):
self.plan_dir = plan_dir
self.plan_dir.mkdir(parents=True, exist_ok=True)
# ------------------------------------------------------------------
# Path safety
# ------------------------------------------------------------------
def _safe_path(self, filename: str, ext: str = ".json") -> Path | None:
if not filename or not filename.strip():
return None
name = filename.strip()
if not name.endswith(ext):
name = name + ext
if "/" in name or "\\" in name or name in (".", "..") or "\x00" in name:
return None
resolved = (self.plan_dir / name).resolve()
plan_dir_resolved = self.plan_dir.resolve()
if resolved != plan_dir_resolved and not str(resolved).startswith(str(plan_dir_resolved) + "\\") and not str(resolved).startswith(str(plan_dir_resolved) + "/"):
return None
return resolved
def _now_iso(self) -> str:
return datetime.now(timezone.utc).isoformat().replace("+00:00", "Z")
# ------------------------------------------------------------------
# CRUD
# ------------------------------------------------------------------
def list_plans(self) -> list[dict]:
if not self.plan_dir.is_dir():
return []
result = []
for path in sorted(self.plan_dir.glob("*.json")):
try:
with open(path, "r", encoding="utf-8") as f:
data = json.load(f)
except Exception as e:
logger.warning("Skipping unreadable lab plan %s: %s", path.name, e)
continue
stem = path.stem
thumbnail = None
thumb_path = self.plan_dir / f"{stem}.png"
if thumb_path.is_file():
thumbnail = f"/wfm_data/lab_plan/{stem}.png"
result.append({
"filename": path.name,
"name": data.get("name", stem),
"note": data.get("note", ""),
"batch_count": data.get("batch_count", 1),
"updated_at": data.get("updated_at", ""),
"thumbnail": thumbnail,
})
result.sort(key=lambda p: p.get("updated_at", ""), reverse=True)
return result
def get_plan(self, filename: str) -> dict:
path = self._safe_path(filename)
if path is None:
raise ValueError(f"Invalid filename: {filename}")
if not path.is_file():
raise FileNotFoundError(f"Plan not found: {filename}")
with open(path, "r", encoding="utf-8") as f:
return json.load(f)
def save_plan(self, filename: str, data: dict, index_image_base64: str | None = None) -> dict:
path = self._safe_path(filename)
if path is None:
raise ValueError(f"Invalid filename: {filename}")
data = dict(data)
data["updated_at"] = self._now_iso()
path.parent.mkdir(parents=True, exist_ok=True)
with open(path, "w", encoding="utf-8") as f:
json.dump(data, f, ensure_ascii=False, indent=2)
if index_image_base64:
self.save_index_image(filename, index_image_base64)
return {"filename": path.name, "updated_at": data["updated_at"]}
def save_index_image(self, filename: str, image_base64: str) -> None:
path = self._safe_path(filename)
if path is None:
raise ValueError(f"Invalid filename: {filename}")
stem = path.stem
thumb_path = self.plan_dir / f"{stem}.png"
# Accept both raw base64 and data: URL forms
b64 = image_base64
if "," in b64 and b64.strip().lower().startswith("data:"):
b64 = b64.split(",", 1)[1]
image_bytes = base64.b64decode(b64)
with open(thumb_path, "wb") as f:
f.write(image_bytes)
def delete_plan(self, filename: str) -> None:
path = self._safe_path(filename)
if path is None:
raise ValueError(f"Invalid filename: {filename}")
if path.is_file():
path.unlink()
thumb_path = self.plan_dir / f"{path.stem}.png"
if thumb_path.is_file():
thumb_path.unlink()
+228
View File
@@ -0,0 +1,228 @@
"""AI skill (.md system prompt) file management service."""
import logging
import re
from pathlib import Path
logger = logging.getLogger(__name__)
ALLOWED_EXTS = {"md"}
DEFAULT_SKILL_FILENAME = "svg-icon.md"
DEFAULT_SKILL_CONTENT = """---
name: SVG Icon Generator
description: Produces clean, minimal, valid SVG icons and simple illustrations.
---
You are an expert SVG icon and illustration designer. When the user asks for an icon, logo, pictogram, diagram, character, animal, or any vector graphic, respond with valid, clean SVG markup.
## Composition process (do this before writing markup - skipping this step is the main cause of unrecognizable output)
- Break the subject down into 3-8 distinct parts that make it recognizable (e.g. a bird: body, head, beak, eye, wing, tail; a house: wall, roof, door, window). Drop parts that are not essential.
- Decide each part's approximate position, size, and draw order within the viewBox (elements listed later in the markup are drawn on top).
- Pick the simplest shape that captures each part's silhouette: `<circle>`/`<ellipse>` for round parts, `<rect>` for rectangular parts, `<polygon>` for angular parts (beaks, ears, leaves, roofs). For a rounded organic outline that no primitive can approximate well (a body silhouette, a wing, a leaf edge), use a short `<path>` with 2-4 smooth curve commands (`Q` or `C`) instead of a plain circle - a few deliberate curve points beat a distorted primitive.
- Never fall back to drawing an unrelated blob plus a few disconnected decorative lines when a subject is hard to render - always decompose it into the named parts above instead, even if each part is crude.
## Output rules
- Always wrap the SVG markup in a fenced code block labeled `svg`, e.g. ```svg ... ```.
- Keep any explanation brief and place it OUTSIDE the code block, never mixed inside the SVG.
- Output exactly one `<svg>...</svg>` element per code block.
## Structure rules
- Always include a `viewBox` attribute (e.g. `viewBox="0 0 24 24"`). Do not hardcode large pixel `width`/`height`; if you set them, make them match the viewBox aspect ratio.
- Use a small, round coordinate system (0-24 or 0-100).
- Round coordinate values to at most 2 decimal places.
- Keep every `<path>` short (at most about 6 commands) - long, intricate paths are where quality breaks down most often.
- Group related elements with `<g>` when it clarifies structure, but do not over-nest.
## Color rules
- For single-color icons, use `fill="currentColor"` (or `stroke="currentColor"` for line icons) so the icon inherits the surrounding text color.
- For multi-color illustrations, use explicit hex colors (e.g. `#4A90D9`) - never named CSS colors like `"blue"`.
- Avoid gradients, filters, and blend modes unless the user explicitly asks for a glossy/gradient style - they rarely render correctly from generated coordinates.
## Accessibility
- Include a `<title>` element as the first child of `<svg>` describing what the icon depicts.
## Security (mandatory - do not violate)
- Never include `<script>`, `<foreignObject>`, event handler attributes (`onload`, `onclick`, etc.), or `<a>`/`href` links to external URLs.
- Never reference external resources (no `xlink:href` to remote URLs, no `<image>` with external `src`).
## Example 1 - simple geometric icon (single color, primitives only)
Request: "Sun icon"
Parts: disc (circle), 8 rays (lines).
```svg
<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<title>Sun</title>
<circle cx="12" cy="12" r="5" fill="currentColor"/>
<g stroke="currentColor" stroke-width="2" stroke-linecap="round">
<line x1="12" y1="1" x2="12" y2="4"/>
<line x1="12" y1="20" x2="12" y2="23"/>
<line x1="4.22" y1="4.22" x2="6.34" y2="6.34"/>
<line x1="17.66" y1="17.66" x2="19.78" y2="19.78"/>
<line x1="1" y1="12" x2="4" y2="12"/>
<line x1="20" y1="12" x2="23" y2="12"/>
<line x1="4.22" y1="19.78" x2="6.34" y2="17.66"/>
<line x1="17.66" y1="6.34" x2="19.78" y2="4.22"/>
</g>
</svg>
```
## Example 2 - organic subject (multi-color, decomposed into parts)
Request: "Bird icon"
Parts: body (rounded outline via a short curved path), head (circle), beak (small triangle), eye (dot), wing (small curved path) - each drawn as its own element, layered head/beak/eye on top of the body.
```svg
<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<title>Bird</title>
<path d="M4 16 Q4 10 11 9 Q18 8 20 13 Q20 17 14 18 Q7 19 4 16 Z" fill="#4A90D9"/>
<path d="M8 14 Q5 12 3 14 Q6 16 9 16 Z" fill="#3576B8"/>
<circle cx="17" cy="10" r="3.2" fill="#4A90D9"/>
<polygon points="20,10 23,9.3 20,11.4" fill="#F2B807"/>
<circle cx="18" cy="9" r="0.6" fill="#1A1A1A"/>
</svg>
```
Follow this pattern for every request: list the parts first, represent each with the simplest adequate shape, then assemble - never skip straight to unstructured shapes.
"""
SKILL_CREATOR_FILENAME = "skill-creator.md"
SKILL_CREATOR_CONTENT = """---
name: Skill Creator
description: Interactively interviews you and drafts a new WFS chat skill (.md system prompt) ready to save.
---
You are a skill-design assistant embedded in ComfyUI Workflow Studio's AI TOOL Chat pane. Your job is to interactively help the user design a NEW "skill" - a markdown file with frontmatter (`name`, `description`) followed by system-prompt instructions. Once saved, a skill can be selected from a dropdown and is silently prepended to future chat messages as a system prompt.
## How to conduct the interview
- Ask ONE focused question at a time, never a bulleted list of questions. Wait for the user's answer before asking the next one.
- Cover, in this order, only what is not already clear from context:
1. What task or domain should the skill specialize in (what should the model do differently once this skill is active)?
2. What output format is expected - plain prose, a specific fenced code block language, a fixed structure, a length limit?
3. Any hard constraints or things to avoid (tone, forbidden content, security concerns, things past attempts got wrong)?
4. Would a short worked example help smaller/local models follow the pattern more reliably? If yes, ask what a good example input/output looks like, or offer to draft one.
- Keep it short - 3 to 5 questions is usually enough. If the user says "just generate it", "that's enough", or similar at any point, stop asking and produce the best skill you can from what you already have.
## Output format for the finished skill
- Once you have enough information, output the complete skill file in a single fenced code block labeled `skill` (```skill ... ```). Never mix prose inside that block - explanation goes outside it.
- The block must start with frontmatter exactly in this shape:
---
name: <short display name, shown in the skill dropdown>
description: <one sentence, shown as a tooltip in the dropdown>
---
- After the frontmatter, write clear, imperative system-prompt instructions for the target skill: what role the model should take, concrete output-format rules, hard constraints, and - if useful - one short worked example following a "request -> ideal output" shape.
- After the code block, tell the user in one line that they can click the "Save as new skill" button below the message to add it, or copy the block manually into a new skill.
"""
_FRONTMATTER_RE = re.compile(r"^---\r?\n(.*?)\r?\n---\r?\n?", re.DOTALL)
def _parse_frontmatter(content: str) -> dict:
"""Extract a shallow `key: value` frontmatter block, if present."""
m = _FRONTMATTER_RE.match(content)
if not m:
return {}
fields: dict = {}
for line in m.group(1).splitlines():
if ":" not in line:
continue
key, _, value = line.partition(":")
key = key.strip()
value = value.strip()
if key:
fields[key] = value
return fields
class SkillService:
def __init__(self, skills_dir: Path):
self.skills_dir = skills_dir
self.skills_dir.mkdir(parents=True, exist_ok=True)
self._seed_default_skill()
def _seed_default_skill(self) -> None:
"""Seed a starter skill file the first time the directory is empty."""
try:
has_any = any(
p.is_file() and p.suffix.lstrip(".").lower() in ALLOWED_EXTS
for p in self.skills_dir.iterdir()
)
except FileNotFoundError:
has_any = False
if not has_any:
(self.skills_dir / DEFAULT_SKILL_FILENAME).write_text(
DEFAULT_SKILL_CONTENT, encoding="utf-8"
)
(self.skills_dir / SKILL_CREATOR_FILENAME).write_text(
SKILL_CREATOR_CONTENT, encoding="utf-8"
)
# ------------------------------------------------------------------
# File CRUD
# ------------------------------------------------------------------
def list_skills(self) -> list[dict]:
"""Return sorted list of skill files with parsed frontmatter metadata."""
if not self.skills_dir.exists():
return []
files = []
for path in sorted(self.skills_dir.glob("*")):
if not (path.is_file() and path.suffix.lstrip(".").lower() in ALLOWED_EXTS):
continue
try:
content = path.read_text(encoding="utf-8")
except Exception:
content = ""
meta = _parse_frontmatter(content)
files.append({
"filename": path.name,
"name": meta.get("name") or path.stem,
"description": meta.get("description", ""),
"size": path.stat().st_size,
})
return files
def get_content(self, filename: str) -> str:
path = self._safe_path(filename)
if path is None:
raise ValueError(f"Invalid filename: {filename}")
if not path.is_file():
raise FileNotFoundError(f"File not found: {filename}")
return path.read_text(encoding="utf-8")
def save_file(self, filename: str, content: str) -> dict:
path = self._safe_path(filename)
if path is None:
raise ValueError(f"Invalid filename: {filename}")
path.write_text(content, encoding="utf-8")
meta = _parse_frontmatter(content)
return {
"filename": path.name,
"name": meta.get("name") or path.stem,
"description": meta.get("description", ""),
"size": path.stat().st_size,
}
def delete_file(self, filename: str) -> None:
path = self._safe_path(filename)
if path is None:
raise ValueError(f"Invalid filename: {filename}")
if path.is_file():
path.unlink()
def _safe_path(self, filename: str) -> Path | None:
if not filename or not filename.strip():
return None
# Skills are a flat directory - reject any path separator (no subfolders).
name = filename.strip()
if "/" in name or "\\" in name or name in (".", ".."):
return None
ext = Path(name).suffix.lstrip(".").lower()
if ext not in ALLOWED_EXTS:
return None
return self.skills_dir / name
+20 -7
View File
@@ -3,6 +3,17 @@
import os
import re
# プロンプトを直接持つノードタイプ(CLIPTextEncode以外の複合ノード含む)
_PROMPT_NODE_TYPES = {
"CLIPTextEncode", "CLIPTextEncodeSDXL", "CLIPTextEncodeSDXLRefiner",
"CLIPTextEncodeEditPlus", "TextEncodeQwenImageEditPlus", "TextEncodeMageFlowEdit",
"SDXLPromptStyler", "SDXLPromptStylerAdvanced", "ImageMetadataPromptLoader",
"WFS_PromptText", "ImpactWildcardEncode", "ImpactWildcardProcessor",
}
# 画像を最終出力として保存するノードタイプ
_OUTPUT_IMAGE_NODE_TYPES = {"SaveImage", "SaveImageAdvanced"}
# CLIPLoader / DualCLIPLoader の type フィールド → モデル種別マッピング
_CLIP_TYPE_TO_MODEL = {
"flux": "Flux",
@@ -181,25 +192,27 @@ def analyze_workflow(workflow_data, filename=""):
if "hidream" in title:
model_types.add("HiDream")
if ntype == "CLIPTextEncode" or "prompt" in title:
if ntype in _PROMPT_NODE_TYPES or "prompt" in title:
inputs["prompts"] += 1
if ntype in ("LoadImage", "LoadImageMask"):
inputs["images"] += 1
if ntype == "LoadVideo" or "load video" in title:
inputs["videos"] += 1
if ntype == "SaveImage":
if ntype in _OUTPUT_IMAGE_NODE_TYPES:
outputs["images"] += 1
if ntype in ("SaveVideo", "VH_VideoCombine"):
outputs["videos"] += 1
# Detect workflow format
if raw_nodes is not None:
# App format: UI-based structure with definitions (subgraphs) or linearMode
# App format: simplified web-app-style UI (linearMode) or .app.json filename.
# A workflow that merely *contains* subgraphs (definitions.subgraphs) is still a
# normal node graph (comfyui-workflow.js's convertUiToApi flattens subgraphs before
# conversion), so it's treated as "ui" here too — must match detectFormat() in
# static/js/comfyui-workflow.js or the App/UI badge shown to the user disagrees
# with what GenerateUI actually does with the file.
extra = workflow_data.get("extra", {})
if (
"definitions" in workflow_data
or extra.get("linearMode") is True
):
if extra.get("linearMode") is True:
wf_format = "app"
elif filename and filename.lower().endswith(".app.json"):
wf_format = "app"
+23 -2
View File
@@ -4,7 +4,7 @@ import jinja2
from aiohttp import web
from pathlib import Path
from .config import TEMPLATES_DIR, STATIC_DIR, DATA_DIR, WORKFLOWS_DIR
from .config import TEMPLATES_DIR, STATIC_DIR, DATA_DIR, WORKFLOWS_DIR, LAB_PLAN_DIR
logger = logging.getLogger(__name__)
@@ -41,6 +41,22 @@ async def serve_workflow_file(request: web.Request) -> web.Response:
})
async def serve_lab_plan_file(request: web.Request) -> web.Response:
"""Serve files (index thumbnails) from the Lab plan directory."""
filename = request.match_info.get("filename", "")
if not filename or ".." in filename or "/" in filename or "\\" in filename:
return web.Response(status=404)
file_path = LAB_PLAN_DIR / filename
if not file_path.is_file():
return web.Response(status=404)
content_type, _ = mimetypes.guess_type(str(file_path))
return web.FileResponse(file_path, headers={
"Content-Type": content_type or "application/octet-stream",
})
class WorkflowStudio:
"""Main entry point for Workflow Studio plugin."""
@@ -57,11 +73,14 @@ class WorkflowStudio:
# Dynamic workflow file serving (thumbnails etc.)
app.router.add_get("/wfm_data/workflows/{filename}", serve_workflow_file)
# Dynamic Lab plan file serving (index thumbnails)
app.router.add_get("/wfm_data/lab_plan/{filename}", serve_lab_plan_file)
# Main page
app.router.add_get("/wfm", serve_index_page)
# API routes
from .routes import workflow_routes, settings_routes, ollama_routes, eagle_routes, nodes_routes, prompts_routes, models_routes, gallery_routes, wildcard_routes, tagger_routes, gmic_routes
from .routes import workflow_routes, settings_routes, ollama_routes, eagle_routes, nodes_routes, prompts_routes, models_routes, gallery_routes, wildcard_routes, tagger_routes, gmic_routes, skill_routes, lab_routes
workflow_routes.setup_routes(app)
settings_routes.setup_routes(app)
@@ -74,5 +93,7 @@ class WorkflowStudio:
wildcard_routes.setup_routes(app)
tagger_routes.setup_routes(app)
gmic_routes.setup_routes(app)
skill_routes.setup_routes(app)
lab_routes.setup_routes(app)
logger.info("Workflow Studio: Routes registered successfully")
+1 -1
View File
@@ -1,7 +1,7 @@
[project]
name = "comfyui-workflow-studio"
description = "A comprehensive workflow, asset management, and generation UI plugin for ComfyUI. Manage workflows, models, images, and prompts; batch generation and Image Feeder in the GenerateUI tab; library side panel with canvas drag & drop and AI tools."
version = "0.3.63"
version = "0.3.89"
license = "MIT"
requires-python = ">= 3.10"
dependencies = ["jinja2"]
+1 -1
View File
@@ -381,7 +381,7 @@
padding: 0;
line-height: 1;
color: var(--wfm-text);
opacity: 0.5;
opacity: 0.85;
flex-shrink: 0;
transition: opacity 0.1s;
}
+300
View File
@@ -0,0 +1,300 @@
/* Lab tab — experimental I2I batch generation with per-column keyframes */
/* .wfm-gen-subtab-content.active defaults to flex-direction:row (main.css);
Lab needs its Setting/Results nav stacked above the panel body. */
#wfm-gen-subtab-lab.active {
flex-direction: column;
}
.wfm-lab-subtab-nav {
display: flex;
border-bottom: 1px solid var(--wfm-border);
flex-shrink: 0;
}
.wfm-lab-subtab-btn {
padding: 6px 16px;
font-size: 12px;
background: transparent;
border: none;
color: var(--wfm-text-secondary);
cursor: pointer;
border-bottom: 2px solid transparent;
margin-bottom: -1px;
transition: color 0.15s;
}
.wfm-lab-subtab-btn:hover { color: var(--wfm-text-primary); }
.wfm-lab-subtab-btn.active { color: var(--wfm-primary); border-bottom-color: var(--wfm-primary); }
.wfm-lab-panel {
display: none;
flex-direction: column;
flex: 1;
overflow: hidden;
height: calc(100% - 33px);
}
.wfm-lab-panel.active { display: flex; }
.wfm-lab-planjson-toolbar {
display: flex;
gap: 8px;
padding: 8px 10px;
border-bottom: 1px solid var(--wfm-border);
flex-shrink: 0;
}
.wfm-lab-pane-header {
font-size: 11px;
font-weight: 600;
color: var(--wfm-text-secondary);
text-transform: uppercase;
letter-spacing: 0.05em;
padding: 4px 0 6px;
flex-shrink: 0;
}
/* ---------------- Setting layout: left | center (4 columns) | right ---------------- */
.wfm-lab-setting-layout {
display: flex;
height: 100%;
overflow: hidden;
gap: 0;
}
.wfm-lab-pane {
display: flex;
flex-direction: column;
overflow: hidden;
min-width: 0;
border-right: 1px solid var(--wfm-border);
padding: 10px;
}
.wfm-lab-pane:last-child { border-right: none; }
.wfm-lab-left { width: 220px; flex-shrink: 0; }
.wfm-lab-center { flex: 1; padding: 0; }
.wfm-lab-right { width: 260px; flex-shrink: 0; overflow-y: auto; }
.wfm-lab-side-btns {
display: flex;
flex-direction: column;
gap: 6px;
margin-top: 12px;
}
.wfm-lab-field-row {
display: flex;
align-items: center;
gap: 8px;
margin-top: 10px;
}
.wfm-lab-field-row label {
font-size: 12px;
color: var(--wfm-text-secondary);
white-space: nowrap;
}
.wfm-lab-field-row input {
flex: 1;
min-width: 0;
}
.wfm-lab-note {
width: 100%;
resize: vertical;
font-size: 12px;
}
.wfm-lab-checkbox-label {
display: flex;
align-items: center;
gap: 6px;
margin-top: 8px;
font-size: 12px;
color: var(--wfm-text-secondary);
cursor: pointer;
}
/* ---------------- Keyframe columns ---------------- */
.wfm-lab-columns {
display: flex;
height: 100%;
overflow: hidden;
}
.wfm-lab-column {
flex: 1;
min-width: 0;
display: flex;
flex-direction: column;
border-right: 1px solid var(--wfm-border);
overflow: hidden;
}
.wfm-lab-column:last-child { border-right: none; }
.wfm-lab-col-header {
display: flex;
align-items: center;
justify-content: space-between;
gap: 4px;
padding: 6px 8px;
font-size: 11px;
font-weight: 600;
color: var(--wfm-text-secondary);
border-bottom: 1px solid var(--wfm-border);
flex-shrink: 0;
}
.wfm-lab-col-btns { display: flex; gap: 2px; }
.wfm-lab-col-cells {
flex: 1;
overflow-y: auto;
padding: 6px;
display: flex;
flex-direction: column;
gap: 6px;
}
.wfm-lab-cell {
border: 1px solid var(--wfm-border);
border-radius: var(--wfm-radius-sm);
padding: 6px 8px;
font-size: 11px;
cursor: pointer;
background: var(--wfm-bg-tertiary);
transition: border-color 0.15s;
}
.wfm-lab-cell:hover { border-color: var(--wfm-primary); }
.wfm-lab-cell-index {
font-weight: 600;
color: var(--wfm-primary);
margin-right: 4px;
}
.wfm-lab-cell-value {
color: var(--wfm-text-primary);
word-break: break-all;
}
.wfm-lab-cell.wfm-lab-cell-revert .wfm-lab-cell-value {
color: var(--wfm-text-secondary);
font-style: italic;
}
.wfm-lab-cell-applied {
margin-top: 3px;
padding-top: 3px;
border-top: 1px dashed var(--wfm-border);
font-size: 10px;
color: var(--wfm-text-secondary);
}
.wfm-lab-cell-prompt-line {
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
max-width: 100%;
}
/* ---------------- Modal form (checkpoint/vae/prompt/ksampler edit) ---------------- */
.wfm-lab-modal-row {
display: flex;
flex-direction: column;
gap: 4px;
margin-bottom: 10px;
}
.wfm-lab-modal-row label {
font-size: 12px;
color: var(--wfm-text-secondary);
}
.wfm-lab-modal-inline {
display: flex;
gap: 8px;
}
.wfm-lab-modal-btnrow {
display: flex;
flex-wrap: wrap;
gap: 6px;
margin-bottom: 10px;
}
.wfm-lab-modal-inline > div {
flex: 1;
min-width: 0;
}
.wfm-lab-modal-checkbox {
display: flex;
align-items: center;
gap: 6px;
font-size: 12px;
margin-top: 4px;
}
/* ---------------- Results layout ---------------- */
.wfm-lab-results-layout {
display: flex;
height: 100%;
overflow: hidden;
}
.wfm-lab-results-left {
width: 260px;
flex-shrink: 0;
border-right: 1px solid var(--wfm-border);
padding: 10px;
}
.wfm-lab-results-center {
flex: 1;
min-width: 0;
padding: 10px;
overflow-y: auto;
}
.wfm-lab-results-grid {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(140px, 1fr));
gap: 8px;
}
.wfm-lab-result-thumb {
width: 100%;
aspect-ratio: 1 / 1;
object-fit: cover;
border-radius: var(--wfm-radius-sm);
border: 1px solid var(--wfm-border);
cursor: pointer;
transition: border-color 0.15s;
}
.wfm-lab-result-thumb:hover { border-color: var(--wfm-primary); }
.wfm-lab-result-item { position: relative; }
.wfm-lab-result-index {
position: absolute;
top: 2px;
left: 2px;
background: rgba(0, 0, 0, 0.6);
color: #fff;
font-size: 10px;
padding: 1px 5px;
border-radius: var(--wfm-radius-sm);
}
+224
View File
@@ -511,6 +511,18 @@ body {
transition: border-color 0.2s ease;
}
.wfm-select-missing {
border-color: var(--wfm-warning);
color: var(--wfm-warning);
}
.wfm-model-missing-hint {
font-size: 11px;
color: var(--wfm-warning);
margin-top: 2px;
margin-bottom: 4px;
}
.wfm-input:focus,
.wfm-textarea:focus,
.wfm-select:focus {
@@ -1044,6 +1056,17 @@ body {
height: auto !important;
}
/* Bypass/Mute node indicator (shown above the Raw JSON search bar when present) */
.wfm-gen-rawjson-bypass-note {
padding: 6px 10px;
background: rgba(255, 165, 2, 0.12);
border-bottom: 1px solid var(--wfm-border);
color: var(--wfm-warning);
font-size: 11px;
line-height: 1.5;
flex-shrink: 0;
}
/* RAW JSON search bar */
.wfm-rawjson-search {
display: flex;
@@ -2938,6 +2961,41 @@ body {
line-height: 24px;
}
.wfm-i2i-mask-section {
margin-top: 8px;
padding-top: 8px;
border-top: 1px dashed var(--wfm-border);
}
.wfm-i2i-mask-header {
display: flex;
align-items: center;
justify-content: space-between;
gap: 6px;
font-size: 11px;
font-weight: 600;
color: var(--wfm-text-secondary);
margin-bottom: 6px;
}
.wfm-i2i-mask-filename {
font-size: 10px;
font-weight: 400;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
max-width: 120px;
}
.wfm-i2i-mask-preview-wrap .wfm-i2i-preview-img {
max-height: 70px;
background: #000;
}
.wfm-i2i-mask-drop-zone {
padding: 8px;
}
/* ============================================
Side Panel - Thumbnail Tab
============================================ */
@@ -3124,6 +3182,21 @@ body {
display: block;
}
.wfm-help-article-header {
display: flex;
align-items: center;
justify-content: space-between;
gap: 12px;
margin-bottom: 14px;
}
.wfm-help-article-header h2 {
font-size: 24px;
font-weight: 700;
color: var(--wfm-text);
margin: 0;
}
.wfm-help-card {
background: var(--wfm-surface);
border: 1px solid var(--wfm-border);
@@ -5207,6 +5280,9 @@ body {
.wfm-ai-pane-settings { flex: 2; }
.wfm-ai-pane-header {
display: flex;
align-items: center;
justify-content: space-between;
font-size: 12px;
font-weight: 600;
color: var(--wfm-text-secondary);
@@ -5218,6 +5294,19 @@ body {
background: var(--wfm-surface);
}
.wfm-ai-chat-toggle-label {
display: flex;
align-items: center;
gap: 4px;
margin-left: auto;
font-size: 11px;
font-weight: 400;
color: var(--wfm-text-secondary);
text-transform: none;
letter-spacing: normal;
cursor: pointer;
}
.wfm-ai-pane-divider {
width: 1px;
background: var(--wfm-border);
@@ -5435,6 +5524,29 @@ body {
pointer-events: none;
}
.wfm-ai-vlm-clear {
position: absolute;
top: 4px;
right: 4px;
width: 20px;
height: 20px;
display: flex;
align-items: center;
justify-content: center;
border: none;
border-radius: 50%;
background: rgba(0, 0, 0, 0.6);
color: #fff;
font-size: 11px;
line-height: 1;
cursor: pointer;
padding: 0;
}
.wfm-ai-vlm-clear:hover {
background: var(--wfm-danger);
}
.wfm-ai-vlm-task-row {
display: flex;
align-items: center;
@@ -5511,6 +5623,79 @@ body {
color: var(--wfm-text);
}
.wfm-ai-chat-img {
max-width: 20%;
border-radius: 6px;
margin-top: 6px;
display: block;
}
.wfm-ai-chat-attach-thumb {
max-width: 120px;
max-height: 120px;
border-radius: 6px;
margin-top: 6px;
display: block;
object-fit: cover;
}
.wfm-ai-chat-svg-wrapper {
margin-top: 6px;
display: flex;
flex-direction: column;
align-items: flex-start;
gap: 6px;
}
.wfm-ai-chat-svg-img {
max-width: 240px;
max-height: 240px;
border-radius: 6px;
border: 1px solid var(--wfm-border);
background: #fff;
padding: 6px;
}
.wfm-ai-chat-attachment {
display: flex;
align-items: center;
gap: 6px;
padding: 4px 6px;
border: 1px solid var(--wfm-border);
border-radius: var(--wfm-radius-sm);
background: var(--wfm-surface);
font-size: 11px;
color: var(--wfm-text-secondary);
}
.wfm-ai-chat-attachment-thumb {
width: 28px;
height: 28px;
object-fit: cover;
border-radius: 4px;
}
.wfm-ai-chat-attachment-clear {
margin-left: auto;
width: 18px;
height: 18px;
display: flex;
align-items: center;
justify-content: center;
border: none;
border-radius: 50%;
background: transparent;
color: var(--wfm-text-secondary);
font-size: 11px;
cursor: pointer;
padding: 0;
}
.wfm-ai-chat-attachment-clear:hover {
background: var(--wfm-danger);
color: #fff;
}
.wfm-ai-chat-input-area {
display: flex;
flex-direction: column;
@@ -5544,3 +5729,42 @@ body {
align-items: center;
gap: 6px;
}
.wfm-ai-chat-skill-row {
display: flex;
align-items: center;
gap: 6px;
padding: 6px 8px 0;
flex-shrink: 0;
}
.wfm-ai-chat-skill-select {
flex: 1;
min-width: 0;
}
.wfm-ai-skill-panel {
margin: 6px 8px 0;
padding: 8px;
border: 1px solid var(--wfm-border);
border-radius: var(--wfm-radius);
background: var(--wfm-surface);
display: flex;
flex-direction: column;
gap: 6px;
flex-shrink: 0;
}
.wfm-ai-skill-panel-header {
display: flex;
align-items: center;
justify-content: space-between;
}
.wfm-ai-skill-panel-title {
font-size: 12px;
font-weight: 600;
color: var(--wfm-text-secondary);
text-transform: uppercase;
letter-spacing: 0.04em;
}
+565 -31
View File
@@ -1,11 +1,14 @@
/**
* AI Tab - Translation, VLM, Settings
* Supports Ollama and LM Studio as backends
* Supports Ollama, LM Studio, and Lemonade as backends
*/
import { showToast } from "./app.js";
import { t } from "./i18n.js";
import { readJsonStorage } from "./util.js";
import { readJsonStorage, getAiBackendDefaultUrl, escapeHtml } from "./util.js";
import { comfyUI } from "./comfyui-client.js";
import { comfyEditor } from "./comfyui-editor.js";
import { comfyWorkflow } from "./comfyui-workflow.js";
const SETTINGS_KEY = "wfm_ai_settings";
@@ -196,7 +199,7 @@ function initTranslateTab() {
const settings = loadAiSettings();
const { backend = "ollama", backendUrl, model } = settings;
const url = backendUrl || (backend === "ollama" ? "http://localhost:11434" : "http://localhost:1234");
const url = backendUrl || getAiBackendDefaultUrl(backend);
if (!isValidBackendUrl(url)) {
showToast(t("aiToastInvalidUrl"), "error");
@@ -285,12 +288,11 @@ function initSettingsTab() {
const urlInput = document.getElementById("wfm-ai-backend-url");
if (urlInput && saved.backendUrl) urlInput.value = saved.backendUrl;
// Update URL placeholder when backend changes
// Switch URL to the new backend's default when the user changes backend
backendRadios.forEach((r) => {
r.addEventListener("change", () => {
if (!urlInput) return;
const defaultUrl = r.value === "ollama" ? "http://localhost:11434" : "http://localhost:1234";
if (!saved.backendUrl) urlInput.value = defaultUrl;
urlInput.value = getAiBackendDefaultUrl(r.value);
});
});
@@ -341,6 +343,47 @@ function initSettingsTab() {
if (freeSrcInput && saved.freeSrcLang) freeSrcInput.value = saved.freeSrcLang;
if (freeDstInput && saved.freeDstLang) freeDstInput.value = saved.freeDstLang;
// Chat image generation — dedicated workflow selection (T2I)
const chatGenCheckbox = document.getElementById("wfm-ai-chatgen-dedicated-checkbox");
const chatGenRow = document.getElementById("wfm-ai-chatgen-dedicated-row");
const chatGenSelect = document.getElementById("wfm-ai-chatgen-dedicated-select");
if (chatGenCheckbox) chatGenCheckbox.checked = !!saved.chatGenDedicatedEnabled;
if (chatGenRow) chatGenRow.style.display = saved.chatGenDedicatedEnabled ? "" : "none";
chatGenCheckbox?.addEventListener("change", () => {
if (chatGenRow) chatGenRow.style.display = chatGenCheckbox.checked ? "" : "none";
});
// Chat I2I generation — dedicated workflow selection
const chatGenI2ICheckbox = document.getElementById("wfm-ai-chatgen-i2i-dedicated-checkbox");
const chatGenI2IRow = document.getElementById("wfm-ai-chatgen-i2i-dedicated-row");
const chatGenI2ISelect = document.getElementById("wfm-ai-chatgen-i2i-dedicated-select");
if (chatGenI2ICheckbox) chatGenI2ICheckbox.checked = !!saved.chatGenI2IDedicatedEnabled;
if (chatGenI2IRow) chatGenI2IRow.style.display = saved.chatGenI2IDedicatedEnabled ? "" : "none";
chatGenI2ICheckbox?.addEventListener("change", () => {
if (chatGenI2IRow) chatGenI2IRow.style.display = chatGenI2ICheckbox.checked ? "" : "none";
});
if (chatGenSelect) {
fetch(`${comfyUI.baseUrl}/api/wfm/workflows`)
.then((r) => (r.ok ? r.json() : []))
.then((list) => {
const filenames = (list || []).map((w) => w.filename).filter(Boolean);
const optionsHtml = `<option value="">-- select workflow --</option>` +
filenames.map((f) => `<option value="${f}">${f}</option>`).join("");
chatGenSelect.innerHTML = optionsHtml;
if (saved.chatGenDedicatedFilename) chatGenSelect.value = saved.chatGenDedicatedFilename;
if (chatGenI2ISelect) {
chatGenI2ISelect.innerHTML = optionsHtml;
if (saved.chatGenI2IDedicatedFilename) chatGenI2ISelect.value = saved.chatGenI2IDedicatedFilename;
}
})
.catch(() => {});
}
// Save settings
document.getElementById("wfm-ai-settings-save-btn")?.addEventListener("click", () => {
const backend = document.querySelector("input[name='wfm-ai-backend']:checked")?.value || "ollama";
@@ -348,13 +391,21 @@ function initSettingsTab() {
const model = document.getElementById("wfm-ai-model-select")?.value || "";
const freeSrcLang = freeSrcInput?.value?.trim() || "";
const freeDstLang = freeDstInput?.value?.trim() || "";
const chatGenDedicatedEnabled = !!chatGenCheckbox?.checked;
const chatGenDedicatedFilename = chatGenSelect?.value || "";
const chatGenI2IDedicatedEnabled = !!chatGenI2ICheckbox?.checked;
const chatGenI2IDedicatedFilename = chatGenI2ISelect?.value || "";
if (url && !isValidBackendUrl(url)) {
showToast(t("aiToastInvalidUrl"), "error");
return;
}
saveAiSettings({ backend, backendUrl: url, model, freeSrcLang, freeDstLang });
saveAiSettings({
backend, backendUrl: url, model, freeSrcLang, freeDstLang,
chatGenDedicatedEnabled, chatGenDedicatedFilename,
chatGenI2IDedicatedEnabled, chatGenI2IDedicatedFilename,
});
showToast(t("aiToastSettingsSaved"), "success");
});
@@ -368,30 +419,431 @@ function initSettingsTab() {
// Chat tab
// ============================================
async function callChat(url, backend, model, messages) {
const IMAGE_GEN_TOOLS = [{
type: "function",
function: {
name: "generate_image",
description: "Generate an image using the currently loaded ComfyUI workflow. If an image is currently attached to the conversation, this performs image-to-image generation using that image as the base; otherwise it performs text-to-image. Call this when the user asks to create, draw, paint, edit, or transform an image.",
parameters: {
type: "object",
properties: {
prompt: { type: "string", description: "Positive prompt describing the desired image." },
negative_prompt: { type: "string", description: "What to avoid in the image. Optional." },
},
required: ["prompt"],
},
},
}];
// chatHistory の内部共通形式 {role, content, images?:[{base64,mimeType}]} を
// バックエンドごとのワイヤーフォーマットへ変換する(callVLM() と同じ規約)
function _formatMessagesForBackend(messages, backend) {
return messages.map((m) => {
if (!m.images?.length) return { role: m.role, content: m.content };
if (backend === "ollama") {
return { role: m.role, content: m.content, images: m.images.map((i) => i.base64) };
}
return {
role: m.role,
content: [
{ type: "text", text: m.content },
...m.images.map((i) => ({ type: "image_url", image_url: { url: `data:${i.mimeType};base64,${i.base64}` } })),
],
};
});
}
async function callChat(url, backend, model, messages, tools) {
const formattedMessages = _formatMessagesForBackend(messages, backend);
if (backend === "ollama") {
const body = { model, messages: formattedMessages, stream: false };
if (tools) body.tools = tools;
const res = await fetch(`${url}/api/chat`, {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ model, messages, stream: false }),
body: JSON.stringify(body),
});
if (!res.ok) throw new Error(`HTTP ${res.status}`);
return (await res.json()).message?.content || "";
const message = (await res.json()).message || {};
return { content: message.content || "", toolCalls: message.tool_calls || null };
} else {
const body = { model, messages: formattedMessages, stream: false };
if (tools) { body.tools = tools; body.tool_choice = "auto"; }
const res = await fetch(`${url}/v1/chat/completions`, {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ model, messages, stream: false }),
body: JSON.stringify(body),
});
if (!res.ok) throw new Error(`HTTP ${res.status}`);
return (await res.json()).choices?.[0]?.message?.content || "";
const message = (await res.json()).choices?.[0]?.message || {};
return { content: message.content || "", toolCalls: message.tool_calls || null };
}
}
function appendChatBubble(messagesEl, role, content) {
function _parseToolArgs(toolCall) {
const raw = toolCall.function?.arguments ?? toolCall.arguments;
if (typeof raw === "string") {
try { return JSON.parse(raw); } catch { return {}; }
}
return raw || {};
}
async function _loadDedicatedChatGenWorkflow(filename) {
const resp = await fetch(`${comfyUI.baseUrl}/api/wfm/workflows/raw?filename=${encodeURIComponent(filename)}`);
if (!resp.ok) throw new Error(`Failed to load workflow (HTTP ${resp.status})`);
let workflow = await resp.json();
const format = comfyWorkflow.detectFormat(workflow, filename);
if (format === "ui") {
workflow = await comfyWorkflow.convertUiToApi(workflow);
} else if (format !== "api") {
throw new Error("Unsupported or unrecognized workflow format");
}
return { workflow, analysis: comfyWorkflow.analyzeWorkflow(workflow) };
}
async function generateImageFromChat(prompt, negativePrompt) {
if (!window._wfmGenerateTab?.generate) throw new Error(t("aiChatGenerateNotReady"));
const settings = loadAiSettings();
const isI2I = !!_toolsImage;
let workflow, analysis;
if (isI2I && settings.chatGenI2IDedicatedEnabled && settings.chatGenI2IDedicatedFilename) {
({ workflow, analysis } = await _loadDedicatedChatGenWorkflow(settings.chatGenI2IDedicatedFilename));
} else if (!isI2I && settings.chatGenDedicatedEnabled && settings.chatGenDedicatedFilename) {
({ workflow, analysis } = await _loadDedicatedChatGenWorkflow(settings.chatGenDedicatedFilename));
} else {
if (!comfyUI.currentWorkflow || !comfyUI.currentAnalysis) throw new Error(t("aiChatNoWorkflowLoaded"));
workflow = JSON.parse(JSON.stringify(comfyUI.currentWorkflow));
analysis = comfyUI.currentAnalysis;
}
if (isI2I) {
if (!(analysis.load_image_nodes?.length > 0)) throw new Error(t("aiChatNoLoadImageNode"));
await comfyEditor.applyImageToSlot(_toolsImage.file, 0, { workflow, analysis });
}
comfyEditor.setPromptText("positive", prompt || "", { workflow, analysis });
if (negativePrompt) comfyEditor.setPromptText("negative", negativePrompt, { workflow, analysis });
const result = await window._wfmGenerateTab.generate(workflow);
const images = result?.images || [];
if (images.length === 0) throw new Error(t("aiChatNoImageProduced"));
const img = images[0];
return `/view?filename=${encodeURIComponent(img.filename)}&subfolder=${encodeURIComponent(img.subfolder || "")}&type=${encodeURIComponent(img.type || "output")}`;
}
// アシスタント応答からSVGコードを抽出する(```svg フェンス or 生の <svg>...</svg>)
function _extractSvgCode(text) {
if (!text) return null;
const fenced = text.match(/```(?:svg|xml)?\s*([\s\S]*?<svg[\s\S]*?<\/svg>)[\s\S]*?```/i);
if (fenced) return fenced[1].trim();
const bare = text.match(/<svg[\s\S]*?<\/svg>/i);
if (bare) return bare[0].trim();
return null;
}
// SVGコードをプレビュー表示し、Galleryへ保存するボタンを追加する。
// <img src="data:..."> でのレンダリングはブラウザがスクリプト実行を無効化するため安全。
function _appendSvgPreview(container, svgCode) {
const wrapper = document.createElement("div");
wrapper.className = "wfm-ai-chat-svg-wrapper";
const dataUrl = `data:image/svg+xml;base64,${btoa(unescape(encodeURIComponent(svgCode)))}`;
const img = document.createElement("img");
img.src = dataUrl;
img.className = "wfm-ai-chat-svg-img";
img.alt = "Generated SVG";
wrapper.appendChild(img);
const saveBtn = document.createElement("button");
saveBtn.className = "wfm-btn wfm-btn-sm";
saveBtn.textContent = t("aiChatSaveSvgToGallery");
saveBtn.addEventListener("click", async () => {
saveBtn.disabled = true;
try {
const res = await fetch("/wfm/gallery/image/save", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ filename: `chat_svg_${Date.now()}.svg`, imageData: dataUrl }),
});
const data = await res.json();
if (!res.ok || data.error) throw new Error(data.error || `HTTP ${res.status}`);
showToast(t("aiChatSvgSaved"), "success");
} catch (e) {
showToast(t("aiChatSvgSaveFailed") + e.message, "error");
} finally {
saveBtn.disabled = false;
}
});
wrapper.appendChild(saveBtn);
container.appendChild(wrapper);
}
// アシスタント応答から ```skill フェンスを抽出する(Skill Creator用スキルが出力する完成品ブロック)
function _extractSkillBlock(text) {
if (!text) return null;
const m = text.match(/```skill\s*([\s\S]*?)```/i);
return m ? m[1].trim() : null;
}
// frontmatterの name から保存用ファイル名を推測する(未設定時は my-skill.md)
function _slugifySkillName(content) {
const m = content.match(/^---\r?\n[\s\S]*?name:\s*(.+?)\r?\n/);
const name = (m ? m[1] : "").trim();
const slug = name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
return `${slug || "my-skill"}.md`;
}
// 応答内にスキル定義ブロックがあれば「スキルとして保存」ボタンを追加する。
// クリックすると管理パネルを開き、新規スキルとしてエディタに内容を流し込む(保存前にレビュー可能)。
function _appendSkillSaveButton(container, skillContent) {
const btn = document.createElement("button");
btn.className = "wfm-btn wfm-btn-sm";
btn.textContent = t("aiChatSaveAsSkill");
btn.addEventListener("click", () => {
const panel = document.getElementById("wfm-ai-skill-panel");
if (panel) panel.style.display = "";
skillOpenEditor(null, skillContent);
const nameInput = document.getElementById("wfm-ai-skill-editor-filename");
if (nameInput) nameInput.value = _slugifySkillName(skillContent);
});
container.appendChild(btn);
}
// ============================================
// AI skills (Chat system prompt library)
// ============================================
async function skillFetchFiles() {
try {
const res = await fetch("/api/wfm/skills");
return res.ok ? await res.json() : [];
} catch { return []; }
}
async function skillFetchContent(filename) {
try {
const res = await fetch(`/api/wfm/skills/content?filename=${encodeURIComponent(filename)}`);
const data = await res.json();
return data.content ?? null;
} catch { return null; }
}
async function skillSaveFile(filename, content) {
try {
const res = await fetch("/api/wfm/skills/save", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ filename, content }),
});
const data = await res.json();
return data.status === "ok" ? data.file : null;
} catch { return null; }
}
async function skillDeleteFile(filename) {
try {
await fetch("/api/wfm/skills/delete", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ filename }),
});
} catch { /* ignore */ }
}
// system prompt として送る前に frontmatter (---...---) を取り除く
function _stripSkillFrontmatter(content) {
const m = content.match(/^---\r?\n[\s\S]*?\r?\n---\r?\n?/);
return (m ? content.slice(m[0].length) : content).trim();
}
let skillFiles = [];
let skillEditingFilename = null; // null = new file
let _activeSkillCache = null; // { filename, content } キャッシュ(送信毎の再フェッチを避ける)
function skillRenderList() {
const list = document.getElementById("wfm-ai-skill-list");
if (!list) return;
list.innerHTML = "";
if (skillFiles.length === 0) {
list.innerHTML = `<div class="wfm-pm-empty" style="font-size:12px;">${t("aiSkillNoFiles")}</div>`;
return;
}
for (const f of skillFiles) {
const item = document.createElement("div");
item.className = "wfm-wc-file-item";
item.innerHTML = `
<div class="wfm-wc-file-item-info">
<span class="wfm-wc-file-name" title="${escapeHtml(f.description || "")}">${escapeHtml(f.name)}</span>
<span class="wfm-wc-file-ext">.md</span>
</div>
<div class="wfm-wc-file-item-actions">
<button class="wfm-pm-action-btn wfm-ai-skill-edit-btn" title="Edit">&#9998;</button>
</div>
`;
item.querySelector(".wfm-ai-skill-edit-btn").addEventListener("click", async (e) => {
e.stopPropagation();
const content = await skillFetchContent(f.filename);
skillOpenEditor(f.filename, content ?? "");
});
list.appendChild(item);
}
}
function skillOpenEditor(filename, content) {
skillEditingFilename = filename || null;
const editor = document.getElementById("wfm-ai-skill-editor");
const nameInput = document.getElementById("wfm-ai-skill-editor-filename");
const contentTA = document.getElementById("wfm-ai-skill-editor-content");
const deleteBtn = document.getElementById("wfm-ai-skill-editor-delete-btn");
if (!editor) return;
nameInput.value = filename || "";
contentTA.value = content || "";
deleteBtn.style.display = filename ? "" : "none";
editor.style.display = "";
nameInput.focus();
}
function skillCloseEditor() {
skillEditingFilename = null;
const editor = document.getElementById("wfm-ai-skill-editor");
if (editor) editor.style.display = "none";
}
function skillPopulateSelect() {
const sel = document.getElementById("wfm-ai-chat-skill-select");
if (!sel) return;
const settings = loadAiSettings();
const wanted = sel.value || settings.activeSkillFilename || "";
sel.innerHTML = `<option value="">-- ${t("aiSkillNone")} --</option>` +
skillFiles.map((f) => `<option value="${escapeHtml(f.filename)}" title="${escapeHtml(f.description || "")}">${escapeHtml(f.name)}</option>`).join("");
sel.value = skillFiles.some((f) => f.filename === wanted) ? wanted : "";
_activeSkillCache = null;
}
async function skillRefreshFiles() {
skillFiles = await skillFetchFiles();
skillRenderList();
skillPopulateSelect();
}
// 選択中スキルの本文を取得(system prompt注入用、選択が変わるまでキャッシュ)
async function _getActiveSkillSystemPrompt() {
const sel = document.getElementById("wfm-ai-chat-skill-select");
const filename = sel?.value || "";
if (!filename) return null;
if (_activeSkillCache?.filename === filename) return _activeSkillCache.content;
const raw = await skillFetchContent(filename);
const content = _stripSkillFrontmatter(raw || "");
_activeSkillCache = { filename, content };
return content;
}
function initSkillManager() {
const selectEl = document.getElementById("wfm-ai-chat-skill-select");
const manageBtn = document.getElementById("wfm-ai-chat-skill-manage-btn");
const panel = document.getElementById("wfm-ai-skill-panel");
const closeBtn = document.getElementById("wfm-ai-skill-close-btn");
const newBtn = document.getElementById("wfm-ai-skill-new-btn");
const saveBtn = document.getElementById("wfm-ai-skill-editor-save-btn");
const deleteBtn = document.getElementById("wfm-ai-skill-editor-delete-btn");
const cancelBtn = document.getElementById("wfm-ai-skill-editor-cancel-btn");
if (!selectEl) return;
skillRefreshFiles();
selectEl.addEventListener("change", () => {
saveAiSettings({ activeSkillFilename: selectEl.value });
_activeSkillCache = null;
});
manageBtn?.addEventListener("click", () => {
if (!panel) return;
const show = panel.style.display === "none";
panel.style.display = show ? "" : "none";
if (show) skillRefreshFiles();
});
closeBtn?.addEventListener("click", () => {
if (panel) panel.style.display = "none";
});
newBtn?.addEventListener("click", () => {
skillOpenEditor(null, "---\nname: \ndescription: \n---\n\n");
});
saveBtn?.addEventListener("click", async () => {
const nameInput = document.getElementById("wfm-ai-skill-editor-filename");
const contentTA = document.getElementById("wfm-ai-skill-editor-content");
let filename = (nameInput?.value || "").trim();
const content = contentTA?.value || "";
if (!filename) { showToast(t("pleaseEnterFilename"), "error"); return; }
if (!/\.md$/i.test(filename)) filename += ".md";
if (!/^[\w\-. ]+\.md$/i.test(filename)) { showToast(t("invalidPathFormat"), "error"); return; }
const saved = await skillSaveFile(filename, content);
if (saved) {
showToast(t("savedAs", filename), "success");
skillCloseEditor();
await skillRefreshFiles();
selectEl.value = filename;
saveAiSettings({ activeSkillFilename: filename });
_activeSkillCache = null;
} else {
showToast(t("saveFailed"), "error");
}
});
deleteBtn?.addEventListener("click", async () => {
if (!skillEditingFilename) return;
if (!confirm(`Delete "${skillEditingFilename}"?`)) return;
await skillDeleteFile(skillEditingFilename);
showToast(t("deletedName", skillEditingFilename), "success");
if (selectEl.value === skillEditingFilename) {
saveAiSettings({ activeSkillFilename: "" });
_activeSkillCache = null;
}
skillCloseEditor();
await skillRefreshFiles();
});
cancelBtn?.addEventListener("click", () => skillCloseEditor());
}
function appendChatBubble(messagesEl, role, content, opts = {}) {
const div = document.createElement("div");
div.className = `wfm-ai-chat-msg wfm-ai-chat-msg-${role}`;
div.textContent = content;
if (content) div.textContent = content;
if (opts.imageUrl) {
const img = document.createElement("img");
img.src = opts.imageUrl;
img.className = "wfm-ai-chat-img";
div.appendChild(img);
}
if (opts.attachThumb) {
const img = document.createElement("img");
img.src = opts.attachThumb;
img.className = "wfm-ai-chat-attach-thumb";
div.appendChild(img);
}
if (role === "assistant" && content) {
const svgCode = _extractSvgCode(content);
if (svgCode) _appendSvgPreview(div, svgCode);
const skillBlock = _extractSkillBlock(content);
if (skillBlock) _appendSkillSaveButton(div, skillBlock);
}
messagesEl.appendChild(div);
messagesEl.scrollTop = messagesEl.scrollHeight;
return div;
@@ -403,9 +855,24 @@ function initChatTab() {
const sendBtn = document.getElementById("wfm-ai-chat-send-btn");
const clearBtn = document.getElementById("wfm-ai-chat-clear-btn");
const statusEl = document.getElementById("wfm-ai-chat-status");
const imgGenToggle = document.getElementById("wfm-ai-chat-imggen-toggle");
if (!messagesEl || !inputEl || !sendBtn) return;
if (imgGenToggle) {
const savedToggle = loadAiSettings();
imgGenToggle.checked = savedToggle.chatImageGenEnabled !== false;
imgGenToggle.addEventListener("change", () => {
saveAiSettings({ chatImageGenEnabled: imgGenToggle.checked });
});
}
document.getElementById("wfm-ai-chat-attachment-clear")?.addEventListener("click", () => {
_clearToolsImage();
});
initSkillManager();
let chatHistory = [];
async function sendMessage() {
@@ -414,7 +881,7 @@ function initChatTab() {
const settings = loadAiSettings();
const { backend = "ollama", backendUrl, model } = settings;
const url = backendUrl || (backend === "ollama" ? "http://localhost:11434" : "http://localhost:1234");
const url = backendUrl || getAiBackendDefaultUrl(backend);
if (!isValidBackendUrl(url)) {
showToast(t("aiToastInvalidUrl"), "error");
@@ -427,17 +894,43 @@ function initChatTab() {
inputEl.value = "";
inputEl.style.height = "";
chatHistory.push({ role: "user", content: text });
appendChatBubble(messagesEl, "user", text);
const userEntry = { role: "user", content: text };
if (_toolsImage) userEntry.images = [{ base64: _toolsImage.base64, mimeType: _toolsImage.mimeType }];
chatHistory.push(userEntry);
appendChatBubble(messagesEl, "user", text, _toolsImage ? { attachThumb: `data:${_toolsImage.mimeType};base64,${_toolsImage.base64}` } : {});
sendBtn.disabled = true;
statusEl.textContent = t("aiStatusChatting");
statusEl.className = "wfm-ai-trans-status wfm-ai-status-working";
try {
const reply = await callChat(url, backend, model, chatHistory);
chatHistory.push({ role: "assistant", content: reply });
appendChatBubble(messagesEl, "assistant", reply);
const tools = imgGenToggle?.checked !== false ? IMAGE_GEN_TOOLS : undefined;
const skillPrompt = await _getActiveSkillSystemPrompt();
const messagesToSend = skillPrompt
? [{ role: "system", content: skillPrompt }, ...chatHistory]
: chatHistory;
const reply = await callChat(url, backend, model, messagesToSend, tools);
const toolCall = reply.toolCalls?.find(
(tc) => (tc.function?.name || tc.name) === "generate_image"
);
if (toolCall) {
chatHistory.push({ role: "assistant", content: reply.content || "" });
if (reply.content) appendChatBubble(messagesEl, "assistant", reply.content);
statusEl.textContent = t("aiStatusGeneratingImage");
const args = _parseToolArgs(toolCall);
try {
const imageUrl = await generateImageFromChat(args.prompt, args.negative_prompt);
appendChatBubble(messagesEl, "assistant", "", { imageUrl });
} catch (genErr) {
appendChatBubble(messagesEl, "assistant", `${t("aiToastImageGenFailed")}${genErr.message}`);
showToast(t("aiToastImageGenFailed") + genErr.message, "error");
}
} else {
chatHistory.push({ role: "assistant", content: reply.content });
appendChatBubble(messagesEl, "assistant", reply.content);
}
statusEl.textContent = "";
statusEl.className = "wfm-ai-trans-status";
} catch (err) {
@@ -469,14 +962,49 @@ function initChatTab() {
});
}
// ============================================
// TOOLS ↔ Chat shared image attachment
// ============================================
let _toolsImage = null; // { file: File, base64: string, mimeType: string }
function _syncAttachmentUI() {
const vlmPreview = document.getElementById("wfm-ai-vlm-preview");
const vlmLabel = document.getElementById("wfm-ai-vlm-label");
const vlmClear = document.getElementById("wfm-ai-vlm-clear");
const chatAttach = document.getElementById("wfm-ai-chat-attachment");
const chatThumb = document.getElementById("wfm-ai-chat-attachment-thumb");
const chatLabel = document.getElementById("wfm-ai-chat-attachment-label");
if (_toolsImage) {
const dataUrl = `data:${_toolsImage.mimeType};base64,${_toolsImage.base64}`;
if (vlmPreview) { vlmPreview.src = dataUrl; vlmPreview.style.display = "block"; }
if (vlmLabel) vlmLabel.style.display = "none";
if (vlmClear) vlmClear.style.display = "flex";
if (chatAttach) chatAttach.style.display = "flex";
if (chatThumb) chatThumb.src = dataUrl;
if (chatLabel) chatLabel.textContent = t("aiChatAttachmentLabel");
} else {
if (vlmPreview) { vlmPreview.src = ""; vlmPreview.style.display = "none"; }
if (vlmLabel) vlmLabel.style.display = "";
if (vlmClear) vlmClear.style.display = "none";
if (chatAttach) chatAttach.style.display = "none";
if (chatThumb) chatThumb.src = "";
}
}
function _clearToolsImage() {
_toolsImage = null;
_syncAttachmentUI();
}
// ============================================
// VLM tab
// ============================================
function initVlmTab() {
const dropEl = document.getElementById("wfm-ai-vlm-drop");
const previewEl = document.getElementById("wfm-ai-vlm-preview");
const labelEl = document.getElementById("wfm-ai-vlm-label");
const clearEl = document.getElementById("wfm-ai-vlm-clear");
const fileInput = document.getElementById("wfm-ai-vlm-file");
const taskSel = document.getElementById("wfm-ai-vlm-task");
const runBtn = document.getElementById("wfm-ai-vlm-run");
@@ -489,8 +1017,6 @@ function initVlmTab() {
if (!dropEl) return;
let vlmImage = null; // { base64, mimeType }
function updateTaskUI() {
const isWildcard = taskSel?.value === "wildcard";
dropEl.style.display = isWildcard ? "none" : "";
@@ -501,10 +1027,9 @@ function initVlmTab() {
const loadImage = async (file) => {
if (!file || !file.type.startsWith("image/")) return;
vlmImage = await fileToBase64(file);
previewEl.src = `data:${vlmImage.mimeType};base64,${vlmImage.base64}`;
previewEl.style.display = "block";
labelEl.style.display = "none";
const { base64, mimeType } = await fileToBase64(file);
_toolsImage = { file, base64, mimeType };
_syncAttachmentUI();
};
dropEl.addEventListener("click", () => fileInput.click());
@@ -516,12 +1041,17 @@ function initVlmTab() {
dropEl.classList.remove("drag-over");
if (e.dataTransfer.files[0]) loadImage(e.dataTransfer.files[0]);
});
clearEl?.addEventListener("click", (e) => {
e.stopPropagation();
_clearToolsImage();
if (fileInput) fileInput.value = "";
});
runBtn.addEventListener("click", async () => {
const task = taskSel?.value || "describe";
const settings = loadAiSettings();
const { backend = "ollama", backendUrl, model } = settings;
const url = backendUrl || (backend === "ollama" ? "http://localhost:11434" : "http://localhost:1234");
const url = backendUrl || getAiBackendDefaultUrl(backend);
if (!isValidBackendUrl(url)) { showToast(t("aiToastInvalidUrl"), "error"); return; }
if (!model) { showToast(t("aiToastNoModel"), "error"); return; }
@@ -557,7 +1087,7 @@ function initVlmTab() {
return;
}
if (!vlmImage) { showToast(t("aiToastNoImage"), "error"); return; }
if (!_toolsImage) { showToast(t("aiToastNoImage"), "error"); return; }
runBtn.disabled = true;
statusEl.textContent = t("aiStatusRunning");
@@ -565,7 +1095,7 @@ function initVlmTab() {
resultEl.value = "";
try {
const result = await callVLM(url, backend, model, VLM_PROMPTS[task], vlmImage.base64, vlmImage.mimeType);
const result = await callVLM(url, backend, model, VLM_PROMPTS[task], _toolsImage.base64, _toolsImage.mimeType);
resultEl.value = result.trim();
statusEl.textContent = t("aiStatusDone");
statusEl.className = "wfm-ai-trans-status wfm-ai-status-ok";
@@ -595,3 +1125,7 @@ export function initAiTab() {
initVlmTab();
initSettingsTab();
}
// gallery-tab.js の外部(Comic Creator)向けブリッジ(半自動マンガ作成の画像プロンプト
// 下書き機能)が、設定タブと同じAI接続設定・LLM呼び出しロジックを再利用するためのexport。
export { callLLM, loadAiSettings, isValidBackendUrl };
+126 -5
View File
@@ -310,6 +310,29 @@ function applyI18nToHtml() {
if (aiFreeDstLabel) aiFreeDstLabel.textContent = t("aiSettingsOutputLang");
const aiSaveBtn = document.getElementById("wfm-ai-settings-save-btn");
if (aiSaveBtn) aiSaveBtn.textContent = t("aiSettingsSaveBtn");
const aiChatImgGenLabel = document.getElementById("wfm-ai-chat-imggen-label-text");
if (aiChatImgGenLabel) aiChatImgGenLabel.textContent = t("aiChatImgGenToggle");
const aiChatGenTitle = document.getElementById("wfm-ai-settings-chatgen-title");
if (aiChatGenTitle) aiChatGenTitle.textContent = t("aiSettingsChatGenTitle");
const aiChatGenDedicatedLabel = document.getElementById("wfm-ai-chatgen-dedicated-label");
if (aiChatGenDedicatedLabel) aiChatGenDedicatedLabel.textContent = t("aiSettingsChatGenDedicated");
const aiChatGenI2ITitle = document.getElementById("wfm-ai-settings-chatgen-i2i-title");
if (aiChatGenI2ITitle) aiChatGenI2ITitle.textContent = t("aiSettingsChatI2IGenTitle");
const aiChatGenI2IDedicatedLabel = document.getElementById("wfm-ai-chatgen-i2i-dedicated-label");
if (aiChatGenI2IDedicatedLabel) aiChatGenI2IDedicatedLabel.textContent = t("aiSettingsChatGenDedicated");
const aiSkillSel = document.getElementById("wfm-ai-chat-skill-select");
if (aiSkillSel) {
const firstOpt = aiSkillSel.querySelector("option[value='']");
if (firstOpt) firstOpt.textContent = `-- ${t("aiSkillNone")} --`;
}
const aiSkillManageBtn = document.getElementById("wfm-ai-chat-skill-manage-btn");
if (aiSkillManageBtn) aiSkillManageBtn.title = t("aiSkillManageBtnTitle");
const aiSkillPanelTitle = document.querySelector(".wfm-ai-skill-panel-title");
if (aiSkillPanelTitle) aiSkillPanelTitle.textContent = t("aiSkillPanelTitle");
const aiSkillNewBtn = document.getElementById("wfm-ai-skill-new-btn");
if (aiSkillNewBtn) aiSkillNewBtn.textContent = t("aiSkillNewBtn");
const aiSkillContentTA = document.getElementById("wfm-ai-skill-editor-content");
if (aiSkillContentTA) aiSkillContentTA.placeholder = t("aiSkillContentPlaceholder");
// Group panel labels
const propTitle = document.querySelector("#wfm-side-tab-group .wfm-group-section-title");
@@ -355,7 +378,8 @@ function applyI18nToHtml() {
"wfm-help-gen-11": "helpGen11", "wfm-help-gen-12": "helpGen12",
"wfm-help-gen-13": "helpGen13", "wfm-help-gen-14": "helpGen14",
"wfm-help-gen-15": "helpGen15", "wfm-help-gen-16": "helpGen16",
"wfm-help-gen-17": "helpGen17",
"wfm-help-gen-17": "helpGen17", "wfm-help-gen-18": "helpGen18",
"wfm-help-gen-19": "helpGen19",
"wfm-help-feeder-title": "helpFeederTitle",
"wfm-help-feeder-desc": "helpFeederDesc",
"wfm-help-feeder-imgloop-title": "helpFeederImgloopTitle",
@@ -370,6 +394,21 @@ function applyI18nToHtml() {
"wfm-help-feeder-gal-1": "helpFeederGal1", "wfm-help-feeder-gal-2": "helpFeederGal2",
"wfm-help-feeder-gal-3": "helpFeederGal3", "wfm-help-feeder-gal-4": "helpFeederGal4",
"wfm-help-feeder-gal-5": "helpFeederGal5", "wfm-help-feeder-gal-6": "helpFeederGal6",
"wfm-help-lab-title": "helpLabTitle",
"wfm-help-lab-desc": "helpLabDesc",
"wfm-help-lab-card-columns-title": "helpLabCardColumnsTitle",
"wfm-help-lab-1": "helpLab1", "wfm-help-lab-2": "helpLab2",
"wfm-help-lab-3": "helpLab3", "wfm-help-lab-4": "helpLab4",
"wfm-help-lab-5": "helpLab5", "wfm-help-lab-6": "helpLab6",
"wfm-help-lab-7": "helpLab7", "wfm-help-lab-8": "helpLab8",
"wfm-help-lab-card-plan-title": "helpLabCardPlanTitle",
"wfm-help-lab-plan-1": "helpLabPlan1", "wfm-help-lab-plan-2": "helpLabPlan2",
"wfm-help-lab-plan-3": "helpLabPlan3", "wfm-help-lab-plan-4": "helpLabPlan4",
"wfm-help-lab-plan-5": "helpLabPlan5", "wfm-help-lab-plan-6": "helpLabPlan6",
"wfm-help-lab-plan-7": "helpLabPlan7", "wfm-help-lab-plan-8": "helpLabPlan8",
"wfm-help-lab-card-results-title": "helpLabCardResultsTitle",
"wfm-help-lab-results-1": "helpLabResults1", "wfm-help-lab-results-2": "helpLabResults2",
"wfm-help-lab-results-3": "helpLabResults3",
"wfm-help-prompt-1": "helpPrompt1", "wfm-help-prompt-2": "helpPrompt2",
"wfm-help-prompt-3": "helpPrompt3", "wfm-help-prompt-4": "helpPrompt4",
"wfm-help-prompt-5": "helpPrompt5", "wfm-help-prompt-6": "helpPrompt6",
@@ -421,7 +460,18 @@ function applyI18nToHtml() {
"wfm-help-sidepanel-17": "helpSidepanel17",
"wfm-help-ai-title": "helpAiTitle",
"wfm-help-ai-1": "helpAi1", "wfm-help-ai-2": "helpAi2", "wfm-help-ai-3": "helpAi3",
"wfm-help-ai-4": "helpAi4", "wfm-help-ai-5": "helpAi5", "wfm-help-ai-6": "helpAi6",
"wfm-help-ai-4": "helpAi4", "wfm-help-ai-6": "helpAi6",
"wfm-help-ai-7": "helpAi7",
"wfm-help-ai-8": "helpAi8",
"wfm-help-ai-9": "helpAi9",
"wfm-help-ai-card-layout-title": "helpAiCardLayout",
"wfm-help-ai-card-translate-title": "helpAiCardTranslate",
"wfm-help-ai-card-chat-title": "helpAiCardChat",
"wfm-help-ai-card-svg-title": "helpAiCardSvg",
"wfm-help-ai-card-skills-title": "helpAiCardSkills",
"wfm-help-ai-card-skilltips-title": "helpAiCardSkillTips",
"wfm-help-ai-card-tools-title": "helpAiCardTools",
"wfm-help-ai-card-settings-title": "helpAiCardSettings",
"wfm-help-imageedit-title": "helpImageEditTitle",
"wfm-help-imageedit-tools-title": "helpImageEditToolsTitle",
"wfm-help-imageedit-layer-title": "helpImageEditLayerTitle",
@@ -444,7 +494,7 @@ function applyI18nToHtml() {
"wfm-help-imageedit-28": "helpImageEdit28", "wfm-help-imageedit-29": "helpImageEdit29",
"wfm-help-imageedit-30": "helpImageEdit30",
"wfm-help-imageedit-7b": "helpImageEdit7b", "wfm-help-imageedit-7c": "helpImageEdit7c",
"wfm-help-imageedit-7d": "helpImageEdit7d",
"wfm-help-imageedit-7d": "helpImageEdit7d", "wfm-help-imageedit-7e": "helpImageEdit7e",
"wfm-help-imageedit-8b": "helpImageEdit8b",
"wfm-help-imageedit-blur-title": "helpImageEditBlurTitle",
"wfm-help-imageedit-blur-1": "helpImageEditBlur1", "wfm-help-imageedit-blur-2": "helpImageEditBlur2",
@@ -457,7 +507,11 @@ function applyI18nToHtml() {
"wfm-help-imageedit-mask-title": "helpImageEditMaskTitle",
"wfm-help-imageedit-mask-1": "helpImageEditMask1", "wfm-help-imageedit-mask-2": "helpImageEditMask2",
"wfm-help-imageedit-mask-3": "helpImageEditMask3", "wfm-help-imageedit-mask-4": "helpImageEditMask4",
"wfm-help-imageedit-mask-5": "helpImageEditMask5",
"wfm-help-imageedit-mask-5": "helpImageEditMask5", "wfm-help-imageedit-mask-6": "helpImageEditMask6",
"wfm-help-imageedit-mask-7": "helpImageEditMask7", "wfm-help-imageedit-mask-8": "helpImageEditMask8",
"wfm-help-imageedit-mask-9": "helpImageEditMask9", "wfm-help-imageedit-mask-10": "helpImageEditMask10",
"wfm-help-imageedit-mask-11": "helpImageEditMask11", "wfm-help-imageedit-mask-12": "helpImageEditMask12",
"wfm-help-imageedit-mask-13": "helpImageEditMask13",
"wfm-help-imageedit-gmic-title": "helpImageEditGmicTitle",
"wfm-help-imageedit-gmic-1": "helpImageEditGmic1", "wfm-help-imageedit-gmic-2": "helpImageEditGmic2",
"wfm-help-imageedit-gmic-3": "helpImageEditGmic3", "wfm-help-imageedit-gmic-4": "helpImageEditGmic4",
@@ -477,12 +531,67 @@ function applyI18nToHtml() {
"wfm-help-trouble-1": "helpTrouble1", "wfm-help-trouble-2": "helpTrouble2",
"wfm-help-trouble-3": "helpTrouble3", "wfm-help-trouble-4": "helpTrouble4",
"wfm-help-trouble-5": "helpTrouble5", "wfm-help-trouble-6": "helpTrouble6",
"wfm-help-trouble-7": "helpTrouble7",
"wfm-help-trouble-7": "helpTrouble7", "wfm-help-trouble-8": "helpTrouble8",
"wfm-help-trouble-9": "helpTrouble9",
"wfm-help-support-title": "helpSupportTitle",
"wfm-help-support-desc": "helpSupportDesc",
"wfm-help-github-desc": "helpGithubDesc",
"wfm-help-kofi-desc": "helpKofiDesc",
"wfm-help-thanks": "helpThanks",
// -- Help card headings (card-based redesign) --
"wfm-help-about-card-getting-started-title": "helpAboutCardGettingStarted",
"wfm-help-wf-title": "helpWfTitle",
"wfm-help-wf-card-browse-title": "helpWfCardBrowse",
"wfm-help-wf-card-groups-title": "helpWfCardGroups",
"wfm-help-wf-card-panel-title": "helpWfCardPanel",
"wfm-help-gen-title": "helpGenTitle",
"wfm-help-gen-card-connect-title": "helpGenCardConnect",
"wfm-help-gen-card-tabs-title": "helpGenCardTabs",
"wfm-help-gen-card-seed-title": "helpGenCardSeed",
"wfm-help-gen-card-batchsetup-title": "helpGenCardBatchSetup",
"wfm-help-gen-card-batchtypes-title": "helpGenCardBatchTypes",
"wfm-help-prompt-title": "helpPromptTitle",
"wfm-help-prompt-card-ai-title": "helpPromptCardAi",
"wfm-help-prompt-card-presets-title": "helpPromptCardPresets",
"wfm-help-prompt-card-wildcards-title": "helpPromptCardWildcards",
"wfm-help-metadata-card-overview-title": "helpMetadataCardOverview",
"wfm-help-metadata-card-extracted-title": "helpMetadataCardExtracted",
"wfm-help-metadata-card-formats-title": "helpMetadataCardFormats",
"wfm-help-settings-title": "helpSettingsTitle",
"wfm-help-settings-card-general-title": "helpSettingsCardGeneral",
"wfm-help-settings-card-connections-title": "helpSettingsCardConnections",
"wfm-help-settings-card-workflow-title": "helpSettingsCardWorkflow",
"wfm-help-settings-card-editor-title": "helpSettingsCardEditor",
"wfm-help-settings-card-misc-title": "helpSettingsCardMisc",
"wfm-help-nodes-title": "helpNodesTitle",
"wfm-help-nodes-card-browse-title": "helpNodesCardBrowse",
"wfm-help-nodes-card-groups-title": "helpNodesCardGroups",
"wfm-help-nodes-card-panel-title": "helpNodesCardPanel",
"wfm-help-gallery-card-browse-title": "helpGalleryCardBrowse",
"wfm-help-gallery-card-folder-title": "helpGalleryCardFolder",
"wfm-help-gallery-card-detail-title": "helpGalleryCardDetail",
"wfm-help-gallery-card-actions-title": "helpGalleryCardActions",
"wfm-help-gallery-card-formats-title": "helpGalleryCardFormats",
"wfm-help-models-title": "helpModelsTitle",
"wfm-help-models-card-browse-title": "helpModelsCardBrowse",
"wfm-help-models-card-civitai-title": "helpModelsCardCivitai",
"wfm-help-models-card-apply-title": "helpModelsCardApply",
"wfm-help-models-card-groups-title": "helpModelsCardGroups",
"wfm-help-models-card-bulk-title": "helpModelsCardBulk",
"wfm-help-sidepanel-card-tabs-title": "helpSidepanelCardTabs",
"wfm-help-sidepanel-card-dnd-title": "helpSidepanelCardDnd",
"wfm-help-sidepanel-card-info-title": "helpSidepanelCardInfo",
"wfm-help-sidepanel-card-ai-title": "helpSidepanelCardAi",
"wfm-help-sidepanel-card-nav-title": "helpSidepanelCardNav",
"wfm-help-tagger-card-overview-title": "helpTaggerCardOverview",
"wfm-help-tagger-card-single-title": "helpTaggerCardSingle",
"wfm-help-tagger-card-sending-title": "helpTaggerCardSending",
"wfm-help-tagger-card-batch-title": "helpTaggerCardBatch",
"wfm-help-imageedit-card-overview-title": "helpImageEditCardOverview",
"wfm-help-shortcuts-card-general-title": "helpShortcutsCardGeneral",
"wfm-help-trouble-card-connection-title": "helpTroubleCardConnection",
"wfm-help-trouble-card-workflow-title": "helpTroubleCardWorkflow",
"wfm-help-trouble-card-tagger-title": "helpTroubleCardTagger",
};
for (const [id, key] of Object.entries(helpIdMap)) {
const el = document.getElementById(id);
@@ -495,6 +604,11 @@ function applyI18nToHtml() {
helpSearch.placeholder = t("helpSearchPlaceholder");
helpSearch.addEventListener("input", _onHelpSearch);
}
// Jump-to-tab buttons
document.querySelectorAll(".wfm-help-jump-btn").forEach((btn) => {
btn.textContent = t("helpJumpToTab");
});
}
function _onHelpSearch(e) {
@@ -588,6 +702,13 @@ function initHelpTab() {
document.getElementById(`wfm-help-page-${page}`)?.classList.add("active");
});
});
// Jump-to-tab buttons: switch to the real feature tab this help page documents
document.querySelectorAll(".wfm-help-jump-btn").forEach((btn) => {
btn.addEventListener("click", () => {
document.querySelector(`.wfm-tab[data-tab="${btn.dataset.jumpTab}"]`)?.click();
});
});
}
document.addEventListener("DOMContentLoaded", () => {
+24 -2
View File
@@ -240,7 +240,13 @@ export const comfyUI = {
});
const res = await fetch(`${this.baseUrl}/view?${params}`);
if (!res.ok) throw new Error(`Failed to fetch image: HTTP ${res.status}`);
return await res.blob();
const blob = await res.blob();
// /view はSVGをセキュリティ上application/octet-streamで返すため、
// <img>で表示できるよう拡張子から正しいMIMEタイプへ付け替える
if (imageData.filename?.toLowerCase().endsWith(".svg") && blob.type !== "image/svg+xml") {
return blob.slice(0, blob.size, "image/svg+xml");
}
return blob;
},
async uploadImage(file, filename, overwrite = true) {
@@ -300,6 +306,9 @@ export const comfyUI = {
// Extract images from SaveImage outputs only
const images = [];
// comfyui-tosvg の "Save SVG String" ノードは images ではなく
// saved_svg(ファイル名) / path(絶対パス) という独自キーで返す
const svgOutputs = [];
const outputs = history.outputs || {};
for (const nodeOutput of Object.values(outputs)) {
if (nodeOutput.images) {
@@ -307,10 +316,23 @@ export const comfyUI = {
images.push(img);
}
}
if (nodeOutput.saved_svg) {
// ComfyUI の実行エンジンは ui 出力の各値をイテラブルとして連結するため、
// ノード側が単一文字列で返すと 1 文字ずつ分解された配列になってしまう。
// (例: "a.svg" -> ["a",".","s","v","g"]) 文字配列を検出したら結合して復元する。
const joinIfCharArray = (v) =>
Array.isArray(v) && v.every((c) => typeof c === "string" && c.length === 1)
? v.join("")
: v;
svgOutputs.push({
filename: joinIfCharArray(nodeOutput.saved_svg),
path: joinIfCharArray(nodeOutput.path) || "",
});
}
}
onComplete?.(images, seed);
return { images, seed };
return { images, seed, svgOutputs };
} catch (err) {
onError?.(err);
throw err;
+554 -52
View File
@@ -4,6 +4,8 @@
import { comfyUI } from "./comfyui-client.js";
import { syncJsonHighlight } from "./json-highlight.js";
import { t } from "./i18n.js";
import { escapeHtml, setupSearchClearBtn } from "./util.js";
// ── Latent Image preset state ─────────────────────────────
const _LATENT_PRESET_KEY = "wfm_latent_presets";
@@ -85,7 +87,7 @@ function _applyLoraToNode(nodeId, loraPath, strModel, strClip, isLoraManager) {
};
comfyUI.currentWorkflow[nodeId].inputs.text = `<lora:${stem}:${strModel}:${strClip}>`;
} else {
comfyUI.currentWorkflow[nodeId].inputs.lora_name = loraPath;
comfyUI.currentWorkflow[nodeId].inputs.lora_name = comfyEditor.resolveLoraName(loraPath);
comfyUI.currentWorkflow[nodeId].inputs.strength_model = strModel;
comfyUI.currentWorkflow[nodeId].inputs.strength_clip = strClip;
}
@@ -153,6 +155,142 @@ function _syncRawJson() {
}
}
// ── Inpaint: 画像+マスクのRGBA合成 ──────────────────────
// mask は白=インペイント対象領域/黒=維持領域のグレースケール画像を想定(Image Editの
// マスクレイヤーも、手動でドロップする白黒マスクファイルも同じ規約)。
// ComfyUIネイティブのLoadImageはアルファチャンネルから mask = 1 - alpha を抽出するため、
// 合成後の alpha は 255 - maskGray とする。
async function _loadImageElement(src) {
// `instanceof Blob` は別レルム(他ウィンドウ/iframe)で生成されたBlob/Fileでは
// falseになる(コンストラクタの参照が異なるため)。Comic CreaterからiframeへBlobを
// 直接渡すInpaint連携で発生するため、実体で判定する(文字列URLかどうかだけを見る)。
const isBlobLike = typeof src !== "string";
const url = isBlobLike ? URL.createObjectURL(src) : src;
try {
const img = new Image();
img.src = url;
await new Promise((resolve, reject) => {
img.onload = resolve;
img.onerror = () => reject(new Error("Failed to load image"));
});
return img;
} finally {
if (isBlobLike) URL.revokeObjectURL(url);
}
}
async function _compositeImageWithMask(imageInput, maskInput) {
const img = await _loadImageElement(imageInput);
const mask = await _loadImageElement(maskInput);
const w = img.naturalWidth, h = img.naturalHeight;
const canvas = document.createElement("canvas");
canvas.width = w; canvas.height = h;
const ctx = canvas.getContext("2d");
ctx.drawImage(img, 0, 0, w, h);
const imgData = ctx.getImageData(0, 0, w, h);
const maskCanvas = document.createElement("canvas");
maskCanvas.width = w; maskCanvas.height = h;
const mctx = maskCanvas.getContext("2d");
mctx.drawImage(mask, 0, 0, w, h);
const maskData = mctx.getImageData(0, 0, w, h).data;
const data = imgData.data;
for (let i = 0; i < data.length; i += 4) {
data[i + 3] = 255 - maskData[i];
}
ctx.putImageData(imgData, 0, 0);
return new Promise((resolve) => canvas.toBlob(resolve, "image/png"));
}
// ── Inpaint: Mask Editor One (comfyui-mask-editor-one) ノード向けヘルパー ──────
// この custom node は LoadImage を介さず、画像は /mask_editor/store_image でサーバー側
// キャッシュ(bg_image_b64, node_idキー)へ、マスクは layer_data(JSON文字列)ウィジェットの
// 各レイヤーの「アルファチャンネル」から合成される(LoadImageの 1-alpha とは逆で、
// alpha値がそのままmask値になる規約)。
async function _imageInputToDataURL(imageInput) {
const img = await _loadImageElement(imageInput);
const canvas = document.createElement("canvas");
canvas.width = img.naturalWidth;
canvas.height = img.naturalHeight;
canvas.getContext("2d").drawImage(img, 0, 0);
return canvas.toDataURL("image/png");
}
async function _maskInputToAlphaDataURL(maskInput) {
const img = await _loadImageElement(maskInput);
const w = img.naturalWidth, h = img.naturalHeight;
const canvas = document.createElement("canvas");
canvas.width = w; canvas.height = h;
const ctx = canvas.getContext("2d");
ctx.drawImage(img, 0, 0, w, h);
const imgData = ctx.getImageData(0, 0, w, h);
const data = imgData.data;
for (let i = 0; i < data.length; i += 4) {
const gray = data[i];
data[i] = data[i + 1] = data[i + 2] = 255;
data[i + 3] = gray;
}
ctx.putImageData(imgData, 0, 0);
return canvas.toDataURL("image/png");
}
// ── プロンプト強調weight編集 (Ctrl+↑/↓) ──────────────────────
// A1111 / ComfyUIネイティブのCLIP Text Encodeと同様の操作感:
// 選択(無ければカーソル位置の括弧ブロックまたは単語)を (text:weight) 形式に変換し、
// weightを0.05刻みで増減する。weightが1.0に戻ったら括弧を除去する。
const _PROMPT_WEIGHT_DELIMITERS = new Set([",", "\n", "\r", "\t", " ", "(", ")", ":"]);
function _selectSurroundingParenBlock(text, pos) {
const openIdx = text.lastIndexOf("(", pos - 1);
if (openIdx === -1) return null;
const closeBefore = text.lastIndexOf(")", pos - 1);
if (closeBefore > openIdx) return null; // カーソルは既に閉じたブロックの外
const closeIdx = text.indexOf(")", pos);
if (closeIdx === -1) return null;
return { start: openIdx, end: closeIdx + 1 };
}
function _selectSurroundingWord(text, pos) {
let start = pos, end = pos;
while (start > 0 && !_PROMPT_WEIGHT_DELIMITERS.has(text[start - 1])) start--;
while (end < text.length && !_PROMPT_WEIGHT_DELIMITERS.has(text[end])) end++;
return { start, end };
}
function _attachPromptWeightControl(textarea) {
textarea.addEventListener("keydown", (e) => {
if (!e.ctrlKey || (e.key !== "ArrowUp" && e.key !== "ArrowDown")) return;
e.preventDefault();
const delta = e.key === "ArrowUp" ? 0.05 : -0.05;
const text = textarea.value;
let start = textarea.selectionStart;
let end = textarea.selectionEnd;
if (start === end) {
const range = _selectSurroundingParenBlock(text, start) || _selectSurroundingWord(text, start);
start = range.start;
end = range.end;
}
if (start === end) return;
const selected = text.substring(start, end);
const m = selected.match(/^\((.*):(-?[\d.]+)\)$/s);
const inner = m ? m[1] : selected;
let weight = (m ? parseFloat(m[2]) : 1.0) + delta;
weight = Math.round(weight * 100) / 100;
const replacement = weight === 1.0 ? inner : `(${inner}:${weight.toFixed(2)})`;
textarea.value = text.substring(0, start) + replacement + text.substring(end);
textarea.setSelectionRange(start, start + replacement.length);
});
}
export const comfyEditor = {
models: {
checkpoints: [],
@@ -199,6 +337,13 @@ export const comfyEditor = {
}
},
// ComfyUI(Windows)は"\"区切りでLoraのenumを返すため、内部の"/"区切り表記と突き合わせて実際の表記に変換する
resolveLoraName(name) {
const normalized = name.replace(/\\/g, "/");
const found = this.models.loras.find((n) => n.replace(/\\/g, "/") === normalized);
return found || name;
},
renderAll(analysis, workflow) {
this.renderPromptTab(analysis, "wfm-gen-prompt-fields");
this.renderImageTab(analysis, "wfm-gen-image-fields");
@@ -221,21 +366,23 @@ export const comfyEditor = {
<div class="wfm-form-group">
<label>Positive Prompt</label>
<div style="display:flex;gap:8px;margin-bottom:6px;">
<select id="wfm-prompt-pos-target" class="wfm-select" style="width:auto;flex:1">
${positiveNodes.map((n) => `<option value="${n.id}" data-text-key="${n.textKey || "text"}" selected>ID:${n.id} (${n.title})</option>`).join("")}
<select id="wfm-prompt-pos-target" class="wfm-select" style="width:auto;flex:1;min-width:0;">
${positiveNodes.map((n, i) => `<option value="${n.id}" data-text-key="${n.textKey || "text"}" ${i === 0 ? "selected" : ""}>ID:${n.id} (${n.title})</option>`).join("")}
${nodeOpts}
</select>
<button class="wfm-btn wfm-btn-sm" id="wfm-prompt-pos-apply">Apply</button>
<button class="wfm-btn wfm-btn-sm" id="wfm-prompt-pos-revert" title="${t("revertPromptTitle")}">↺</button>
<button class="wfm-btn wfm-btn-sm" id="wfm-prompt-pos-apply" title="Apply (Alt+Click: Apply &amp; Generate)">Apply</button>
</div>
<textarea class="wfm-textarea" id="wfm-prompt-pos-text" rows="6">${positiveNodes[0]?.text || ""}</textarea>
</div>
<div class="wfm-form-group">
<label>Negative Prompt</label>
<div style="display:flex;gap:8px;margin-bottom:6px;">
<select id="wfm-prompt-neg-target" class="wfm-select" style="width:auto;flex:1">
${negativeNodes.map((n) => `<option value="${n.id}" data-text-key="${n.textKey || "text"}" selected>ID:${n.id} (${n.title})</option>`).join("")}
<select id="wfm-prompt-neg-target" class="wfm-select" style="width:auto;flex:1;min-width:0;">
${negativeNodes.map((n, i) => `<option value="${n.id}" data-text-key="${n.textKey || "text"}" ${i === 0 ? "selected" : ""}>ID:${n.id} (${n.title})</option>`).join("")}
${nodeOpts}
</select>
<button class="wfm-btn wfm-btn-sm" id="wfm-prompt-neg-revert" title="${t("revertPromptTitle")}">↺</button>
<button class="wfm-btn wfm-btn-sm" id="wfm-prompt-neg-apply">Apply</button>
</div>
<textarea class="wfm-textarea" id="wfm-prompt-neg-text" rows="6">${negativeNodes[0]?.text || ""}</textarea>
@@ -254,7 +401,7 @@ export const comfyEditor = {
</div>
`;
document.getElementById("wfm-prompt-pos-apply")?.addEventListener("click", () => {
document.getElementById("wfm-prompt-pos-apply")?.addEventListener("click", (e) => {
const nodeId = document.getElementById("wfm-prompt-pos-target")?.value;
const text = document.getElementById("wfm-prompt-pos-text")?.value;
if (nodeId && comfyUI.currentWorkflow?.[nodeId]) {
@@ -262,6 +409,7 @@ export const comfyEditor = {
const textKey = promptNode?.textKey || "text";
comfyUI.currentWorkflow[nodeId].inputs[textKey] = text;
_syncRawJson();
if (e.altKey) document.dispatchEvent(new CustomEvent("wfm:apply-and-generate"));
}
});
@@ -276,6 +424,27 @@ export const comfyEditor = {
}
});
// Revert: テキストエリアを直前にApplyされたノードの現在値へ戻す
document.getElementById("wfm-prompt-pos-revert")?.addEventListener("click", () => {
const nodeId = document.getElementById("wfm-prompt-pos-target")?.value;
const wfNode = comfyUI.currentWorkflow?.[nodeId];
const ta = document.getElementById("wfm-prompt-pos-text");
if (!nodeId || !wfNode || !ta) return;
const promptNode = (analysis.prompt_nodes || []).find(n => n.id === nodeId);
const textKey = promptNode?.textKey || "text";
ta.value = wfNode.inputs[textKey] ?? "";
});
document.getElementById("wfm-prompt-neg-revert")?.addEventListener("click", () => {
const nodeId = document.getElementById("wfm-prompt-neg-target")?.value;
const wfNode = comfyUI.currentWorkflow?.[nodeId];
const ta = document.getElementById("wfm-prompt-neg-text");
if (!nodeId || !wfNode || !ta) return;
const promptNode = (analysis.prompt_nodes || []).find(n => n.id === nodeId);
const textKey = promptNode?.textKey || "text";
ta.value = wfNode.inputs[textKey] ?? "";
});
// Track last focused prompt textarea for Paste button
["wfm-prompt-pos-text", "wfm-prompt-neg-text"].forEach((taId) => {
const ta = document.getElementById(taId);
@@ -285,6 +454,7 @@ export const comfyEditor = {
_lastPromptFocus = { id: taId, selStart: ta.selectionStart, selEnd: ta.selectionEnd };
});
});
_attachPromptWeightControl(ta);
});
// Embedding filter
@@ -353,6 +523,7 @@ export const comfyEditor = {
.map((s) => {
const models = this.models[s.key] || [];
const currentVal = s.nodes?.[0]?.[s.inputKey] || "";
const isMissing = !!currentVal && !models.includes(currentVal);
const targetOpts = s.nodes
.map((n) => `<option value="${n.id}">ID:${n.id} (${n.title})</option>`)
.join("");
@@ -370,14 +541,19 @@ export const comfyEditor = {
return `
<div class="wfm-form-group" style="border-bottom:1px solid var(--wfm-border);padding-bottom:12px;">
<label>${s.label}</label>
<input type="text" class="wfm-input wfm-model-filter" placeholder="Filter..." data-target="wfm-model-${s.key}" style="margin-bottom:4px;">
<select class="wfm-select" id="wfm-model-${s.key}" style="margin-bottom:4px;">
<div class="wfm-search-wrap" style="margin-bottom:4px;width:100%;">
<input type="text" class="wfm-input wfm-search-input wfm-model-filter" id="wfm-model-${s.key}-filter" placeholder="Filter..." data-target="wfm-model-${s.key}">
<button type="button" class="wfm-search-clear-btn" id="wfm-model-${s.key}-filter-clear" title="Clear search">✕</button>
</div>
<select class="wfm-select ${isMissing ? "wfm-select-missing" : ""}" id="wfm-model-${s.key}" style="margin-bottom:4px;">
${isMissing ? `<option value="${escapeHtml(currentVal)}" selected>⚠ ${escapeHtml(currentVal)} (${t("modelNotFound")})</option>` : ""}
${models.map((m) => `<option value="${m}" ${m === currentVal ? "selected" : ""}>${m}</option>`).join("")}
</select>
${isMissing ? `<div class="wfm-model-missing-hint">${t("modelNotFoundHint")}</div>` : ""}
${extrasHtml}
<div style="display:flex;gap:8px;align-items:center;margin-top:4px;">
<select class="wfm-select" id="wfm-model-${s.key}-target" style="flex:1;">${targetOpts}</select>
<button class="wfm-btn wfm-btn-sm wfm-model-apply" data-key="${s.key}" data-input="${s.inputKey}">Apply</button>
<button class="wfm-btn wfm-btn-sm wfm-model-apply" data-key="${s.key}" data-input="${s.inputKey}" title="Apply (Alt+Click: Apply &amp; Generate)">Apply</button>
</div>
</div>
`;
@@ -386,8 +562,8 @@ export const comfyEditor = {
// Filter inputs
el.querySelectorAll(".wfm-model-filter").forEach((input) => {
input.addEventListener("input", () => {
const targetId = input.dataset.target;
const targetId = input.dataset.target;
const rebuild = () => {
const select = document.getElementById(targetId);
if (!select) return;
const filter = input.value.toLowerCase();
@@ -397,12 +573,14 @@ export const comfyEditor = {
.filter((m) => m.toLowerCase().includes(filter))
.map((m) => `<option value="${m}">${m}</option>`)
.join("");
});
};
input.addEventListener("input", rebuild);
setupSearchClearBtn(input.id, `${input.id}-clear`, rebuild);
});
// Apply buttons
el.querySelectorAll(".wfm-model-apply").forEach((btn) => {
btn.addEventListener("click", () => {
btn.addEventListener("click", (e) => {
const key = btn.dataset.key;
let inputKey = btn.dataset.input;
const select = document.getElementById(`wfm-model-${key}`);
@@ -424,6 +602,7 @@ export const comfyEditor = {
if (!isNaN(exVal)) comfyUI.currentWorkflow[nodeId].inputs[exInputKey] = exVal;
});
_syncRawJson();
if (e.altKey) document.dispatchEvent(new CustomEvent("wfm:apply-and-generate"));
}
});
});
@@ -530,7 +709,10 @@ export const comfyEditor = {
<!-- Single tab -->
<div class="wfm-lora-tab-content" id="wfm-lora-panel-single">
<input type="text" class="wfm-input" id="wfm-lora-filter" placeholder="Filter...">
<div class="wfm-search-wrap" style="width:100%;">
<input type="text" class="wfm-input wfm-search-input" id="wfm-lora-filter" placeholder="Filter...">
<button type="button" class="wfm-search-clear-btn" id="wfm-lora-filter-clear" title="Clear search">✕</button>
</div>
<select class="wfm-select" id="wfm-lora-select">
${loras.map((m) => `<option value="${m}" ${m === currentVal ? "selected" : ""}>${m}</option>`).join("")}
</select>
@@ -630,8 +812,9 @@ export const comfyEditor = {
}
// ── Single: filter ───────────────────────────────────
document.getElementById("wfm-lora-filter")?.addEventListener("input", (e) => {
const filter = e.target.value.toLowerCase();
const loraFilterInput = document.getElementById("wfm-lora-filter");
const rebuildLoraSingleList = () => {
const filter = loraFilterInput?.value.toLowerCase() || "";
const select = document.getElementById("wfm-lora-select");
if (!select) return;
select.innerHTML = loras
@@ -639,7 +822,9 @@ export const comfyEditor = {
.map((m) => `<option value="${m}">${m}</option>`)
.join("");
_refreshLoraSingleDynamic(metadata, civitaiCache);
});
};
loraFilterInput?.addEventListener("input", rebuildLoraSingleList);
setupSearchClearBtn("wfm-lora-filter", "wfm-lora-filter-clear", rebuildLoraSingleList);
// ── Single: update SYNTAX/TRIGGERS on model or strength change ──
document.getElementById("wfm-lora-select")?.addEventListener("change", () => _refreshLoraSingleDynamic(metadata, civitaiCache));
@@ -783,7 +968,7 @@ export const comfyEditor = {
} else {
const first = stackModels[0];
if (first) {
comfyUI.currentWorkflow[nodeId].inputs.lora_name = first;
comfyUI.currentWorkflow[nodeId].inputs.lora_name = comfyEditor.resolveLoraName(first);
comfyUI.currentWorkflow[nodeId].inputs.strength_model = _stackStrengths[first]?.m ?? 1.0;
comfyUI.currentWorkflow[nodeId].inputs.strength_clip = _stackStrengths[first]?.c ?? 1.0;
}
@@ -856,23 +1041,39 @@ export const comfyEditor = {
const sampler = analysis.sampler_nodes?.[0];
const latent = analysis.latent_nodes?.[0];
// "Advanced Sampling" workflows (Flux.1/Flux.2, SD3.5, Chroma...) spread seed/steps/cfg/
// sampler/scheduler/denoise across RandomNoise + CFGGuider + KSamplerSelect + a *Scheduler
// node instead of one KSampler. sampler.*NodeId (set in analyzeWorkflow) says which real
// node each field writes back to; null/"" means that workflow has no such control at all
// (e.g. Flux2Scheduler has no named "scheduler" combo) so the field is disabled here.
const schedulerAvailable = !!sampler && sampler.schedulerNodeId != null;
const denoiseAvailable = !!sampler && sampler.denoiseNodeId != null;
el.innerHTML = `
<div style="display:flex;flex-direction:row;gap:0;align-items:flex-start;">
<div style="flex:1;min-width:0;padding-right:14px;border-right:1px solid var(--wfm-border);">
<h3 style="font-size:13px;font-weight:600;text-transform:uppercase;letter-spacing:0.5px;color:var(--wfm-text-secondary);margin:0 0 12px;">KSampler</h3>
<h3 style="font-size:13px;font-weight:600;text-transform:uppercase;letter-spacing:0.5px;color:var(--wfm-text-secondary);margin:0 0 12px;">${sampler?.advanced ? "Sampler (Advanced)" : "KSampler"}</h3>
${sampler ? `
<input type="hidden" id="wfm-settings-sampler-id" value="${sampler.id}" data-seed-key="${sampler.seedKey || "seed"}">
<input type="hidden" id="wfm-settings-sampler-id"
data-seed-key="${sampler.seedKey || "seed"}"
data-seed-node-id="${sampler.seedNodeId ?? sampler.id}"
data-steps-node-id="${sampler.stepsNodeId ?? sampler.id}"
data-cfg-key="${sampler.cfgKey || "cfg"}"
data-cfg-node-id="${sampler.cfgNodeId ?? sampler.id}"
data-sampler-node-id="${sampler.samplerNodeId ?? sampler.id}"
data-scheduler-node-id="${sampler.schedulerNodeId ?? ""}"
data-denoise-node-id="${sampler.denoiseNodeId ?? ""}">
<div class="wfm-form-group">
<label>Seed</label>
<input type="number" class="wfm-input" id="wfm-settings-seed" value="${sampler.seed ?? -1}">
<input type="number" class="wfm-input" id="wfm-settings-seed" value="${sampler.seed ?? ""}" placeholder="${sampler.seed === undefined ? "linked" : ""}">
</div>
<div class="wfm-form-group">
<label>Steps</label>
<input type="number" class="wfm-input" id="wfm-settings-steps" value="${sampler.steps ?? 20}" min="1" max="200">
<input type="number" class="wfm-input" id="wfm-settings-steps" value="${sampler.steps ?? ""}" placeholder="${sampler.steps === undefined ? "linked" : ""}" min="1" max="200">
</div>
<div class="wfm-form-group">
<label>CFG</label>
<input type="number" class="wfm-input" id="wfm-settings-cfg" value="${sampler.cfg ?? 7}" step="0.5" min="0">
<input type="number" class="wfm-input" id="wfm-settings-cfg" value="${sampler.cfg ?? ""}" placeholder="${sampler.cfg === undefined ? "linked" : ""}" step="0.5" min="0">
</div>
<div class="wfm-form-group">
<label>Sampler</label>
@@ -882,15 +1083,17 @@ export const comfyEditor = {
</div>
<div class="wfm-form-group">
<label>Scheduler</label>
<select class="wfm-select" id="wfm-settings-scheduler">
${this.models.schedulers.map((s) => `<option value="${s}" ${s === sampler.scheduler ? "selected" : ""}>${s}</option>`).join("")}
<select class="wfm-select" id="wfm-settings-scheduler" ${schedulerAvailable ? "" : "disabled"}>
${schedulerAvailable
? this.models.schedulers.map((s) => `<option value="${s}" ${s === sampler.scheduler ? "selected" : ""}>${s}</option>`).join("")
: `<option value="">N/A</option>`}
</select>
</div>
<div class="wfm-form-group">
<label>Denoise</label>
<input type="number" class="wfm-input" id="wfm-settings-denoise" value="${sampler.denoise ?? 1.0}" step="0.05" min="0" max="1">
<input type="number" class="wfm-input" id="wfm-settings-denoise" value="${sampler.denoise ?? ""}" placeholder="${denoiseAvailable && sampler.denoise === undefined ? "linked" : ""}" step="0.05" min="0" max="1" ${denoiseAvailable ? "" : "disabled"}>
</div>
<button class="wfm-btn wfm-btn-sm" id="wfm-settings-sampler-apply">Apply</button>
<button class="wfm-btn wfm-btn-sm" id="wfm-settings-sampler-apply" title="Apply (Alt+Click: Apply &amp; Generate)">Apply</button>
` : "<p class='wfm-placeholder'>No KSampler node found</p>"}
</div>
<div style="flex:1;min-width:0;padding-left:14px;">
@@ -899,17 +1102,18 @@ export const comfyEditor = {
<input type="hidden" id="wfm-settings-latent-id" value="${latent.id}">
<div class="wfm-form-group">
<label>Width</label>
<input type="number" class="wfm-input" id="wfm-settings-width" value="${latent.width ?? 512}" step="8" min="64">
<input type="number" class="wfm-input" id="wfm-settings-width" value="${latent.width ?? ""}" placeholder="${latent.width === undefined ? "linked" : ""}" step="8" min="64">
</div>
<div class="wfm-form-group">
<label>Height</label>
<input type="number" class="wfm-input" id="wfm-settings-height" value="${latent.height ?? 512}" step="8" min="64">
<input type="number" class="wfm-input" id="wfm-settings-height" value="${latent.height ?? ""}" placeholder="${latent.height === undefined ? "linked" : ""}" step="8" min="64">
</div>
<div class="wfm-form-group">
<label>Batch Size</label>
<input type="number" class="wfm-input" id="wfm-settings-batch" value="${latent.batch_size ?? 1}" min="1" max="64">
</div>
<button class="wfm-btn wfm-btn-sm" id="wfm-settings-latent-apply">Apply</button>
${latent.width === undefined || latent.height === undefined ? `<p class="wfm-placeholder" style="margin-top:6px;">Width/Height is linked to another node (e.g. auto-follows the input image) — leave blank to keep it linked.</p>` : ""}
<div style="margin-top:10px;border-top:1px solid var(--wfm-border);padding-top:10px;">
<div style="display:flex;flex-wrap:wrap;gap:4px;margin-bottom:8px;">
${[512, 768, 1024, 2048].map((s) => `<button class="wfm-btn wfm-btn-sm wfm-latent-sq-btn" data-size="${s}">${s}</button>`).join("")}
@@ -934,27 +1138,35 @@ export const comfyEditor = {
</div>
`;
document.getElementById("wfm-settings-sampler-apply")?.addEventListener("click", () => {
const nodeId = document.getElementById("wfm-settings-sampler-id")?.value;
if (!nodeId || !comfyUI.currentWorkflow?.[nodeId]) return;
const inputs = comfyUI.currentWorkflow[nodeId].inputs;
// KSamplerAdvanced uses noise_seed; fall back to seed
const seedKey = document.getElementById("wfm-settings-sampler-id")?.dataset?.seedKey || "seed";
inputs[seedKey] = parseInt(document.getElementById("wfm-settings-seed")?.value) || -1;
inputs.steps = parseInt(document.getElementById("wfm-settings-steps")?.value) || 20;
inputs.cfg = parseFloat(document.getElementById("wfm-settings-cfg")?.value) || 7;
inputs.sampler_name = document.getElementById("wfm-settings-sampler-name")?.value;
inputs.scheduler = document.getElementById("wfm-settings-scheduler")?.value;
inputs.denoise = parseFloat(document.getElementById("wfm-settings-denoise")?.value) || 1.0;
document.getElementById("wfm-settings-sampler-apply")?.addEventListener("click", (e) => {
const ds = document.getElementById("wfm-settings-sampler-id")?.dataset || {};
const write = (nodeId, key, value) => {
if (!nodeId || !comfyUI.currentWorkflow?.[nodeId]) return;
comfyUI.currentWorkflow[nodeId].inputs[key] = value;
};
const seedEl = document.getElementById("wfm-settings-seed");
if (seedEl?.value !== "") write(ds.seedNodeId, ds.seedKey || "seed", parseInt(seedEl.value) || -1);
const stepsEl = document.getElementById("wfm-settings-steps");
if (stepsEl?.value !== "") write(ds.stepsNodeId, "steps", parseInt(stepsEl.value) || 20);
const cfgEl = document.getElementById("wfm-settings-cfg");
if (cfgEl?.value !== "") write(ds.cfgNodeId, ds.cfgKey || "cfg", parseFloat(cfgEl.value) || 7);
write(ds.samplerNodeId, "sampler_name", document.getElementById("wfm-settings-sampler-name")?.value);
if (ds.schedulerNodeId) write(ds.schedulerNodeId, "scheduler", document.getElementById("wfm-settings-scheduler")?.value);
const denoiseEl = document.getElementById("wfm-settings-denoise");
if (ds.denoiseNodeId && denoiseEl?.value !== "") write(ds.denoiseNodeId, "denoise", parseFloat(denoiseEl.value) || 1.0);
_syncRawJson();
if (e.altKey) document.dispatchEvent(new CustomEvent("wfm:apply-and-generate"));
});
document.getElementById("wfm-settings-latent-apply")?.addEventListener("click", () => {
const nodeId = document.getElementById("wfm-settings-latent-id")?.value;
if (!nodeId || !comfyUI.currentWorkflow?.[nodeId]) return;
const inputs = comfyUI.currentWorkflow[nodeId].inputs;
inputs.width = parseInt(document.getElementById("wfm-settings-width")?.value) || 512;
inputs.height = parseInt(document.getElementById("wfm-settings-height")?.value) || 512;
const wEl = document.getElementById("wfm-settings-width");
const hEl = document.getElementById("wfm-settings-height");
// Blank = leave the (linked) width/height alone instead of clobbering it with a default
if (wEl?.value !== "") inputs.width = parseInt(wEl.value) || 512;
if (hEl?.value !== "") inputs.height = parseInt(hEl.value) || 512;
inputs.batch_size = parseInt(document.getElementById("wfm-settings-batch")?.value) || 1;
_syncRawJson();
});
@@ -1027,14 +1239,18 @@ export const comfyEditor = {
if (!el) return;
const loadNodes = analysis.load_image_nodes || [];
if (loadNodes.length === 0) {
el.innerHTML = `<p class="wfm-placeholder">No LoadImage nodes found in workflow</p>`;
const meoNodes = analysis.mask_editor_one_nodes || [];
if (loadNodes.length === 0 && meoNodes.length === 0) {
el.innerHTML = `<p class="wfm-placeholder">No LoadImage / Mask Editor One nodes found in workflow</p>`;
return;
}
// Render up to 4 image input slots
const slots = loadNodes.slice(0, 4);
// Mask Editor One ノード(画像+マスクを内包、常に両方必須)— 別枠で最大2件表示
const meoSlots = meoNodes.slice(0, 2);
el.innerHTML = `
${slots.length === 0 ? "" : `
<div class="wfm-i2i-grid">
${slots.map((node, i) => `
<div class="wfm-i2i-slot" data-slot="${i}" data-node-id="${node.id}">
@@ -1051,6 +1267,23 @@ export const comfyEditor = {
<input type="file" accept="image/*" class="wfm-i2i-file" id="wfm-i2i-file-${i}" style="display:none;">
</label>
</div>
${node.mask_used ? `
<div class="wfm-i2i-mask-section">
<div class="wfm-i2i-mask-header">
<span>Mask</span>
<span class="wfm-i2i-mask-filename" id="wfm-i2i-mask-filename-${i}"></span>
</div>
<div class="wfm-i2i-preview-wrap wfm-i2i-mask-preview-wrap" id="wfm-i2i-mask-preview-wrap-${i}" style="display:none;">
<img class="wfm-i2i-preview-img" id="wfm-i2i-mask-preview-${i}">
</div>
<div class="wfm-i2i-drop-zone wfm-i2i-mask-drop-zone" id="wfm-i2i-mask-drop-${i}">
<label class="wfm-i2i-drop-label">
Drop mask (white=inpaint) or click to select
<input type="file" accept="image/*" class="wfm-i2i-file" id="wfm-i2i-mask-file-${i}" style="display:none;">
</label>
</div>
</div>
` : ""}
<div style="display:flex;gap:6px;margin-top:6px;">
<button class="wfm-btn wfm-btn-sm wfm-btn-primary wfm-i2i-apply" data-slot="${i}" disabled>Apply</button>
<span class="wfm-i2i-status" id="wfm-i2i-status-${i}"></span>
@@ -1058,6 +1291,46 @@ export const comfyEditor = {
</div>
`).join("")}
</div>
`}
${meoSlots.length === 0 ? "" : `
<div class="wfm-i2i-grid" style="margin-top:12px;">
${meoSlots.map((node, i) => `
<div class="wfm-i2i-slot" data-meo-slot="${i}" data-node-id="${node.id}">
<div class="wfm-i2i-slot-header">
<span style="font-weight:600;font-size:12px;">ID:${node.id} ${node.title} (Mask Editor One)</span>
</div>
<div class="wfm-i2i-preview-wrap" id="wfm-meo-preview-wrap-${i}" style="display:none;">
<img class="wfm-i2i-preview-img" id="wfm-meo-preview-${i}">
</div>
<div class="wfm-i2i-drop-zone" id="wfm-meo-drop-${i}">
<label class="wfm-i2i-drop-label">
Drop image or click to select
<input type="file" accept="image/*" class="wfm-i2i-file" id="wfm-meo-file-${i}" style="display:none;">
</label>
</div>
<div class="wfm-i2i-mask-section">
<div class="wfm-i2i-mask-header">
<span>Mask</span>
<span class="wfm-i2i-mask-filename" id="wfm-meo-mask-filename-${i}"></span>
</div>
<div class="wfm-i2i-preview-wrap wfm-i2i-mask-preview-wrap" id="wfm-meo-mask-preview-wrap-${i}" style="display:none;">
<img class="wfm-i2i-preview-img" id="wfm-meo-mask-preview-${i}">
</div>
<div class="wfm-i2i-drop-zone wfm-i2i-mask-drop-zone" id="wfm-meo-mask-drop-${i}">
<label class="wfm-i2i-drop-label">
Drop mask (white=inpaint) or click to select
<input type="file" accept="image/*" class="wfm-i2i-file" id="wfm-meo-mask-file-${i}" style="display:none;">
</label>
</div>
</div>
<div style="display:flex;gap:6px;margin-top:6px;">
<button class="wfm-btn wfm-btn-sm wfm-btn-primary wfm-meo-apply" data-slot="${i}" disabled>Apply</button>
<span class="wfm-i2i-status" id="wfm-meo-status-${i}"></span>
</div>
</div>
`).join("")}
</div>
`}
`;
// Initialize each slot
@@ -1069,7 +1342,13 @@ export const comfyEditor = {
const filenameEl = document.getElementById(`wfm-i2i-filename-${i}`);
const statusEl = document.getElementById(`wfm-i2i-status-${i}`);
const dropZone = document.getElementById(`wfm-i2i-drop-${i}`);
const maskFileInput = document.getElementById(`wfm-i2i-mask-file-${i}`);
const maskDropZone = document.getElementById(`wfm-i2i-mask-drop-${i}`);
const maskPreviewWrap = document.getElementById(`wfm-i2i-mask-preview-wrap-${i}`);
const maskPreviewImg = document.getElementById(`wfm-i2i-mask-preview-${i}`);
const maskFilenameEl = document.getElementById(`wfm-i2i-mask-filename-${i}`);
let pendingFile = null;
let pendingMaskFile = null;
const applyFile = (file) => {
if (!file || !file.type.startsWith("image/")) return;
@@ -1082,10 +1361,24 @@ export const comfyEditor = {
statusEl.textContent = "";
};
const applyMaskFile = (file) => {
if (!file || !file.type.startsWith("image/")) return;
pendingMaskFile = file;
const url = URL.createObjectURL(file);
maskPreviewImg.src = url;
maskPreviewWrap.style.display = "";
maskFilenameEl.textContent = file.name;
applyBtn.disabled = false;
statusEl.textContent = "";
};
// File input change
fileInput?.addEventListener("change", () => {
if (fileInput.files.length > 0) applyFile(fileInput.files[0]);
});
maskFileInput?.addEventListener("change", () => {
if (maskFileInput.files.length > 0) applyMaskFile(maskFileInput.files[0]);
});
// Drag & drop
if (dropZone) {
@@ -1102,14 +1395,39 @@ export const comfyEditor = {
if (e.dataTransfer.files.length > 0) applyFile(e.dataTransfer.files[0]);
});
}
if (maskDropZone) {
maskDropZone.addEventListener("dragover", (e) => {
e.preventDefault();
maskDropZone.classList.add("drag-over");
});
maskDropZone.addEventListener("dragleave", () => {
maskDropZone.classList.remove("drag-over");
});
maskDropZone.addEventListener("drop", (e) => {
e.preventDefault();
maskDropZone.classList.remove("drag-over");
if (e.dataTransfer.files.length > 0) applyMaskFile(e.dataTransfer.files[0]);
});
}
// Apply button: upload to ComfyUI and set on node
// (マスクが指定されている場合は画像+マスクをRGBA合成して1枚のPNGとしてアップロードする)
applyBtn?.addEventListener("click", async () => {
if (!pendingFile) return;
if (!pendingFile && !pendingMaskFile) return;
applyBtn.disabled = true;
statusEl.textContent = "Uploading...";
try {
const result = await comfyUI.uploadImage(pendingFile, pendingFile.name);
let result;
if (pendingMaskFile) {
const baseImage = pendingFile || previewImg.src;
if (!baseImage) throw new Error("No base image to apply mask to");
const composedBlob = await _compositeImageWithMask(baseImage, pendingMaskFile);
const fileName = (pendingFile?.name || node.image || "inpaint.png").replace(/\.[^.]+$/, "") + "_masked.png";
const composedFile = new File([composedBlob], fileName, { type: "image/png" });
result = await comfyUI.uploadImage(composedFile, fileName);
} else {
result = await comfyUI.uploadImage(pendingFile, pendingFile.name);
}
if (result.name) {
// Update workflow node
if (comfyUI.currentWorkflow?.[node.id]) {
@@ -1129,20 +1447,97 @@ export const comfyEditor = {
}
});
});
// Initialize each Mask Editor One slot(画像+マスク両方が揃って初めてApply可能)
meoSlots.forEach((node, i) => {
const fileInput = document.getElementById(`wfm-meo-file-${i}`);
const maskFileInput = document.getElementById(`wfm-meo-mask-file-${i}`);
const dropZone = document.getElementById(`wfm-meo-drop-${i}`);
const maskDropZone = document.getElementById(`wfm-meo-mask-drop-${i}`);
const previewWrap = document.getElementById(`wfm-meo-preview-wrap-${i}`);
const previewImg = document.getElementById(`wfm-meo-preview-${i}`);
const maskPreviewWrap = document.getElementById(`wfm-meo-mask-preview-wrap-${i}`);
const maskPreviewImg = document.getElementById(`wfm-meo-mask-preview-${i}`);
const maskFilenameEl = document.getElementById(`wfm-meo-mask-filename-${i}`);
const applyBtn = el.querySelector(`.wfm-meo-apply[data-slot="${i}"]`);
const statusEl = document.getElementById(`wfm-meo-status-${i}`);
let pendingFile = null;
let pendingMaskFile = null;
const updateApplyEnabled = () => { applyBtn.disabled = !(pendingFile && pendingMaskFile); };
const applyFile = (file) => {
if (!file || !file.type.startsWith("image/")) return;
pendingFile = file;
previewImg.src = URL.createObjectURL(file);
previewWrap.style.display = "";
statusEl.textContent = "";
updateApplyEnabled();
};
const applyMaskFile = (file) => {
if (!file || !file.type.startsWith("image/")) return;
pendingMaskFile = file;
maskPreviewImg.src = URL.createObjectURL(file);
maskPreviewWrap.style.display = "";
maskFilenameEl.textContent = file.name;
statusEl.textContent = "";
updateApplyEnabled();
};
fileInput?.addEventListener("change", () => {
if (fileInput.files.length > 0) applyFile(fileInput.files[0]);
});
maskFileInput?.addEventListener("change", () => {
if (maskFileInput.files.length > 0) applyMaskFile(maskFileInput.files[0]);
});
[[dropZone, applyFile], [maskDropZone, applyMaskFile]].forEach(([zone, handler]) => {
if (!zone) return;
zone.addEventListener("dragover", (e) => { e.preventDefault(); zone.classList.add("drag-over"); });
zone.addEventListener("dragleave", () => zone.classList.remove("drag-over"));
zone.addEventListener("drop", (e) => {
e.preventDefault();
zone.classList.remove("drag-over");
if (e.dataTransfer.files.length > 0) handler(e.dataTransfer.files[0]);
});
});
applyBtn?.addEventListener("click", async () => {
if (!pendingFile || !pendingMaskFile) return;
applyBtn.disabled = true;
statusEl.textContent = "Uploading...";
try {
await this.applyImageAndMaskToMaskEditorOneNode(pendingFile, pendingMaskFile, node.id);
statusEl.textContent = "✓ Applied";
statusEl.style.color = "var(--wfm-success)";
} catch (err) {
statusEl.textContent = `✗ ${err.message}`;
statusEl.style.color = "var(--wfm-danger)";
applyBtn.disabled = false;
}
});
});
},
async applyImageToSlot(file, slotIndex = 0) {
const loadNodes = comfyUI.currentAnalysis?.load_image_nodes || [];
// opts.workflow/opts.analysis を渡すと comfyUI.currentWorkflow/currentAnalysis の代わりに
// そちらへ書き込み、DOM更新は行わずアップロード後のファイル名だけを返す
// (GenerateUIタブの表示状態には触れない。Chatペインの画像添付I2I連携から利用)。
async applyImageToSlot(file, slotIndex = 0, opts = {}) {
const workflow = opts.workflow || comfyUI.currentWorkflow;
const analysis = opts.analysis || comfyUI.currentAnalysis;
const loadNodes = analysis?.load_image_nodes || [];
const node = loadNodes[slotIndex];
if (!node) throw new Error("No LoadImage node at slot " + slotIndex);
const result = await comfyUI.uploadImage(file, file.name);
if (!result.name) throw new Error("Upload returned no filename");
if (comfyUI.currentWorkflow?.[node.id]) {
comfyUI.currentWorkflow[node.id].inputs.image = result.name;
if (workflow?.[node.id]) {
workflow[node.id].inputs.image = result.name;
}
if (opts.workflow) return result.name;
const previewWrap = document.getElementById(`wfm-i2i-preview-wrap-${slotIndex}`);
const previewImg = document.getElementById(`wfm-i2i-preview-${slotIndex}`);
const filenameEl = document.getElementById(`wfm-i2i-filename-${slotIndex}`);
@@ -1161,6 +1556,113 @@ export const comfyEditor = {
return result.name;
},
// imageInput/maskInput: File/Blob いずれも可。マスクは白=インペイント対象領域のグレースケール想定。
// 画像とマスクをRGBA合成し、1枚のPNGとして対象LoadImageノードへアップロードする
// (ComfyUIネイティブのアルファ→MASK抽出に準拠。Image Edit「Inpaint」タブのRunボタンから利用)。
// opts.workflow/opts.analysis を渡すと、comfyUI.currentWorkflow/currentAnalysis の代わりに
// そのワークフローへ書き込む(GenerateUIタブの表示・DOM更新は行わない。専用ワークフロー実行用)。
async applyImageAndMaskToSlot(imageInput, maskInput, slotIndex = 0, opts = {}) {
const workflow = opts.workflow || comfyUI.currentWorkflow;
const analysis = opts.analysis || comfyUI.currentAnalysis;
const loadNodes = analysis?.load_image_nodes || [];
const node = loadNodes[slotIndex];
if (!node) throw new Error("No LoadImage node at slot " + slotIndex);
const composedBlob = await _compositeImageWithMask(imageInput, maskInput);
const fileName = `inpaint_${Math.random().toString(36).slice(2, 10)}.png`;
const composedFile = new File([composedBlob], fileName, { type: "image/png" });
const result = await comfyUI.uploadImage(composedFile, fileName);
if (!result.name) throw new Error("Upload returned no filename");
if (workflow?.[node.id]) {
workflow[node.id].inputs.image = result.name;
}
if (opts.workflow) return result.name;
const previewWrap = document.getElementById(`wfm-i2i-preview-wrap-${slotIndex}`);
const previewImg = document.getElementById(`wfm-i2i-preview-${slotIndex}`);
const filenameEl = document.getElementById(`wfm-i2i-filename-${slotIndex}`);
const statusEl = document.getElementById(`wfm-i2i-status-${slotIndex}`);
const applyBtn = document.querySelector(`.wfm-i2i-apply[data-slot="${slotIndex}"]`);
if (previewImg) {
previewImg.src = `/view?filename=${encodeURIComponent(result.name)}&type=input`;
if (previewWrap) previewWrap.style.display = "";
}
if (filenameEl) filenameEl.textContent = result.name;
if (statusEl) { statusEl.textContent = `✓ ${result.name}`; statusEl.style.color = "var(--wfm-success)"; }
if (applyBtn) applyBtn.disabled = true;
_syncRawJson();
return result.name;
},
// imageInput/maskInput: File/Blob いずれも可。マスクは白=インペイント対象領域のグレースケール想定。
// Mask Editor One (comfyui-mask-editor-one) ノード向け。画像はサーバー側キャッシュへ
// /mask_editor/store_image でPOSHし(node_idキー、bg_image_b64)、マスクは layer_data
// ウィジェットへ「アルファチャンネル=mask値」のレイヤーとして書き込む。
// opts.workflow を渡すと comfyUI.currentWorkflow の代わりにそのワークフローへ書き込む。
async applyImageAndMaskToMaskEditorOneNode(imageInput, maskInput, nodeId, opts = {}) {
const workflow = opts.workflow || comfyUI.currentWorkflow;
const bgDataUrl = await _imageInputToDataURL(imageInput);
const maskDataUrl = await _maskInputToAlphaDataURL(maskInput);
const resp = await fetch(`${comfyUI.baseUrl}/mask_editor/store_image`, {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ node_id: String(nodeId), bg_image_b64: bgDataUrl }),
});
if (!resp.ok) throw new Error(`Failed to store image for Mask Editor One (node ${nodeId})`);
if (workflow?.[nodeId]) {
workflow[nodeId].inputs.layer_data = JSON.stringify({
layers: [{ visible: true, opacity: 1, operation: "add", imageData: maskDataUrl }],
});
}
if (!opts.workflow) _syncRawJson();
},
// Inpaint Run から呼ばれるポジ/ネガプロンプト設定。
// opts.workflow/opts.analysis を渡すと、GenerateUIタブの選択中ターゲット(DOM)に依存せず、
// そのワークフロー内の最初の該当role prompt_nodeへ直接反映する(専用ワークフロー実行用)。
setPromptText(role, text, opts = {}) {
if (opts.workflow && opts.analysis) {
const node = (opts.analysis.prompt_nodes || []).find((n) => n.role === role);
if (node && opts.workflow[node.id]) {
opts.workflow[node.id].inputs[node.textKey || "text"] = text;
}
return;
}
const textareaId = role === "positive" ? "wfm-prompt-pos-text" : "wfm-prompt-neg-text";
const textarea = document.getElementById(textareaId);
if (textarea) textarea.value = text;
this.syncToWorkflow();
_syncRawJson();
},
// Inpaint Run から呼ばれる grow_mask_by / denoise 設定。
// ワークフロー内の最初の VAEEncodeForInpaint ノード / denoise を持つ最初の sampler ノードへ反映する
// (複数のインペイントパイプラインが同一ワークフローに存在するケースは現状非対応)。
// workflow/analysis を渡すと comfyUI.currentWorkflow/currentAnalysis の代わりにそちらへ書き込む。
setInpaintParams({ growMaskBy, denoise, workflow, analysis } = {}) {
const wf = workflow || comfyUI.currentWorkflow;
const an = analysis || comfyUI.currentAnalysis;
const encodeNode = an?.inpaint_encode_nodes?.[0];
if (encodeNode && growMaskBy != null && wf?.[encodeNode.id]) {
wf[encodeNode.id].inputs.grow_mask_by = growMaskBy;
}
const samplerNode = (an?.sampler_nodes || []).find((n) => n.denoise !== undefined);
if (samplerNode && denoise != null && wf?.[samplerNode.id]) {
wf[samplerNode.id].inputs.denoise = denoise;
}
if (!workflow) _syncRawJson();
},
syncToWorkflow() {
// Sync prompt texts before generation
const posSelect = document.getElementById("wfm-prompt-pos-target");
+610 -27
View File
@@ -5,6 +5,61 @@
// Cache for /object_info (loaded once, shared)
let _objectInfoCache = null;
// convertUiToApi() の COMBO フォールバック(未一致時に選択肢の先頭へ無警告で差し替え)が
// ckpt_name に対して発生した場合の記録。呼び出し元が読み込み直後に確認して警告表示できるよう、
// 直近の convertUiToApi() 呼び出し分だけを保持する。
let _lastCheckpointSubstitutions = [];
// convertUiToApi() で除外された Bypass(mode:4) / Mute(mode:2) ノードの記録。
// API形式には mode 情報が残らないため、呼び出し元がRaw JSON表示時に
// 「このワークフローにはバイパス/ミュート中のノードがあった」と伝えられるよう、
// 直近の convertUiToApi() 呼び出し分だけを保持する。
let _lastBypassedNodes = [];
let _lastMutedNodes = [];
/**
* Trace a link's source through any Bypass-mode (mode 4) nodes AND Reroute nodes, matching each
* one's output slot to an input slot of the same type and following the connection upstream
* (recursively, for chains of either/both). Mirrors ComfyUI's own Bypass behavior, where a
* bypassed node is removed but its wires are reconnected end-to-end — Reroute needs the identical
* treatment because it's a UI-only passthrough node with no backend node class at all: leaving it
* in the API payload makes ComfyUI reject the whole prompt with "missing_node_type" (Reroute
* always has to be resolved through, regardless of its mode).
* Returns null when no pass-through source exists (the matching input is unconnected),
* in which case the caller should treat the input as unlinked.
*/
function _resolveBypassSource(nodeById, linkMap, nodeId, slot, visited) {
const idStr = String(nodeId);
const node = nodeById[idStr];
if (!node || (node.mode !== 4 && node.type !== "Reroute")) return [idStr, slot];
if (visited.has(idStr)) return null; // circular bypass/reroute chain guard
visited.add(idStr);
const outputs = node.outputs || [];
const inputs = node.inputs || [];
let inIdx;
if (node.type === "Reroute") {
// Reroute is always exactly one input -> one output. Its stored input type is commonly
// the generic "*" even when the output shows the propagated concrete type (e.g. MODEL),
// so the type-match search used for Bypass below would fail to find it — just take the
// sole input.
inIdx = 0;
} else {
const outType = outputs[slot]?.type;
if (inputs[slot]?.type === outType && linkMap[idStr]?.[slot]) {
inIdx = slot;
} else {
inIdx = inputs.findIndex((inp, i) => inp.type === outType && linkMap[idStr]?.[i]);
}
}
if (inIdx === -1 || inIdx === undefined) return null;
const upstream = linkMap[idStr][inIdx];
if (!upstream) return null;
return _resolveBypassSource(nodeById, linkMap, upstream[0], upstream[1], visited);
}
async function _loadObjectInfo() {
if (_objectInfoCache) return _objectInfoCache;
try {
@@ -37,7 +92,7 @@ function _getWidgetInputNames(objectInfo, classType) {
names.push(name);
} else if (typeof type === "string") {
const upper = type.toUpperCase();
if (upper === "INT" || upper === "FLOAT" || upper === "STRING" || upper === "BOOLEAN" || upper === "COMBO") {
if (upper === "INT" || upper === "FLOAT" || upper === "STRING" || upper === "BOOLEAN" || upper === "COMBO" || upper === "COMFY_DYNAMICCOMBO_V3") {
names.push(name);
}
// Other uppercase types (MODEL, CLIP, etc.) are link inputs, skip
@@ -51,7 +106,7 @@ function _getWidgetInputNames(objectInfo, classType) {
names.push(name);
} else if (typeof type === "string") {
const upper = type.toUpperCase();
if (upper === "INT" || upper === "FLOAT" || upper === "STRING" || upper === "BOOLEAN") {
if (upper === "INT" || upper === "FLOAT" || upper === "STRING" || upper === "BOOLEAN" || upper === "COMFY_DYNAMICCOMBO_V3") {
names.push(name);
}
}
@@ -62,7 +117,7 @@ function _getWidgetInputNames(objectInfo, classType) {
/**
* Get ordered widget input types for a node class (parallel to _getWidgetInputNames).
* Returns type info: "INT", "FLOAT", "STRING", "BOOLEAN", or "COMBO".
* Returns type info: "INT", "FLOAT", "STRING", "BOOLEAN", "COMBO", or "COMFY_DYNAMICCOMBO_V3".
*/
function _getWidgetInputTypes(objectInfo, classType) {
const info = objectInfo[classType];
@@ -77,7 +132,7 @@ function _getWidgetInputTypes(objectInfo, classType) {
types.push("COMBO");
} else if (typeof type === "string") {
const upper = type.toUpperCase();
if (upper === "INT" || upper === "FLOAT" || upper === "STRING" || upper === "BOOLEAN" || upper === "COMBO") {
if (upper === "INT" || upper === "FLOAT" || upper === "STRING" || upper === "BOOLEAN" || upper === "COMBO" || upper === "COMFY_DYNAMICCOMBO_V3") {
types.push(upper);
}
}
@@ -88,7 +143,7 @@ function _getWidgetInputTypes(objectInfo, classType) {
types.push("COMBO");
} else if (typeof type === "string") {
const upper = type.toUpperCase();
if (upper === "INT" || upper === "FLOAT" || upper === "STRING" || upper === "BOOLEAN" || upper === "COMBO") {
if (upper === "INT" || upper === "FLOAT" || upper === "STRING" || upper === "BOOLEAN" || upper === "COMBO" || upper === "COMFY_DYNAMICCOMBO_V3") {
types.push(upper);
}
}
@@ -96,6 +151,19 @@ function _getWidgetInputTypes(objectInfo, classType) {
return types;
}
/**
* Resolve the sub-input names for a DynamicCombo's currently-selected option.
* objectInfo spec shape: ["COMFY_DYNAMICCOMBO_V3", { options: [{ key, inputs: { required: {...} } }, ...] }]
*/
function _getDynamicComboSubNames(objectInfo, classType, widgetName, selectedKey) {
const info = objectInfo[classType];
const spec = info?.input?.required?.[widgetName] || info?.input?.optional?.[widgetName];
const options = spec?.[1]?.options;
if (!Array.isArray(options)) return [];
const opt = options.find((o) => o.key === selectedKey) || options[0];
return Object.keys(opt?.inputs?.required || {});
}
/**
* Detect if a widget value is a frontend-only extra (like "control_after_generate").
* These values appear in widgets_values but are not in object_info inputs.
@@ -113,6 +181,124 @@ function _isExtraWidgetValue(val, expectedType) {
return false;
}
/**
* True when a subgraph-template node's widget input (by name) is actually wired end-to-end —
* either redirected from an outer parent-graph link, or wired to another internal node within the
* same subgraph template (boundary links from the subgraph's own input ports, origin_id === -10,
* don't count: those resolve to a plain injected widget value instead, handled separately).
*/
function _isLinkedWidgetName(remappedNode, sgDef, origInternalId, redirectedTargets, name) {
const inputDef = (remappedNode.inputs || []).find((i) => i.widget && i.name === name);
if (!inputDef) return false;
const slotIdx = remappedNode.inputs.indexOf(inputDef);
if (redirectedTargets.has(`${remappedNode.id}:${slotIdx}`)) return true;
return inputDef.link != null && (sgDef.links || []).some(
(l) => l.id === inputDef.link && String(l.target_id) === origInternalId && l.target_slot === slotIdx && l.origin_id !== -10
);
}
/**
* Simulate consuming widgets_values against object_info's widget name/type order, accounting for
* frontend-only "control_after_generate" extras (e.g. "fixed" after a seed) that occupy one extra
* slot and shift every later index by one. When skipLinked is true, widgets the caller's
* isLinkedName() flags as linked are treated as consuming zero widgets_values entries (the
* "modern" ComfyUI format); with it false, every widget is assumed present (the "legacy full"
* format some subgraph templates store). Returns each widget's actual widgets_values index
* (or -1 if the array ran out), plus consumedIndices — every index a widget's own turn advanced
* past (normally just its value, but two when a control_after_generate extra was skipped) — and
* how many entries were consumed in total (the latter is how callers detect which of the two
* formats a given widgets_values array actually follows).
*
* consumedIndices matters because convertUiToApi's own widget-mapping loop only skips a
* control_after_generate extra while advancing past the *next* widget's turn (see its
* `!linkedSlotNames.has(name)` branch) — if that next widget turns out to be linked, the loop
* `continue`s before ever looking at the extra, leaving it unconsumed and silently misread as the
* value of whatever non-linked widget comes after. Stripping a linked widget's position alone
* (without its swallowed extra) reproduces exactly that bug one level up, in the injection step.
*/
function _simulateWidgetValues(widgetNames, widgetTypes, widgetsValues, isLinkedName, skipLinked) {
let idx = 0;
const positions = {};
const consumedIndices = {};
for (let nIdx = 0; nIdx < widgetNames.length; nIdx++) {
const name = widgetNames[nIdx];
if (skipLinked && isLinkedName(name)) {
positions[name] = -1;
consumedIndices[name] = [];
continue;
}
if (idx >= widgetsValues.length) {
positions[name] = -1;
consumedIndices[name] = [];
continue;
}
const consumed = [idx];
let p = idx;
idx++;
if (_isExtraWidgetValue(widgetsValues[p], widgetTypes[nIdx]) && idx < widgetsValues.length) {
consumed.push(idx);
p = idx;
idx++;
}
positions[name] = p;
consumedIndices[name] = consumed;
}
return { positions, consumedIndices, consumed: idx };
}
/**
* Strip a subgraph-template node's widgets_values entries belonging to widget slots that are
* actually linked (see _isLinkedWidgetName), so convertUiToApi's own widget-mapping loop — which
* assumes the "modern" format where linked widgets contribute zero widgets_values entries — maps
* every remaining widget to the right value instead of drifting by however many linked entries
* were left in place. No-op when widgets_values already follows the modern format (nothing to
* strip) or the node has no widget inputs at all.
*/
function _stripLegacyLinkedWidgetValues(objectInfo, remappedNode, sgDef, origInternalId, redirectedTargets) {
const widgetsValues = remappedNode.widgets_values;
const allWidgetInputs = (remappedNode.inputs || []).filter((i) => i.widget);
if (!widgetsValues || allWidgetInputs.length === 0) return;
const widgetNames = _getWidgetInputNames(objectInfo, remappedNode.type);
const widgetTypes = _getWidgetInputTypes(objectInfo, remappedNode.type);
const isLinkedName = (name) => _isLinkedWidgetName(remappedNode, sgDef, origInternalId, redirectedTargets, name);
// If skipping linked widgets already accounts for every entry, widgets_values is already in
// the modern (no dangling linked entries) format — nothing to strip.
const skipSim = _simulateWidgetValues(widgetNames, widgetTypes, widgetsValues, isLinkedName, true);
if (skipSim.consumed === widgetsValues.length) return;
// Otherwise it's "legacy full": recompute with every widget present to find exactly which
// indices the linked ones occupy — including any control_after_generate extra a linked
// widget's own turn would have consumed, which must be dropped too (see _simulateWidgetValues).
const fullSim = _simulateWidgetValues(widgetNames, widgetTypes, widgetsValues, isLinkedName, false);
const linkedIdx = new Set();
for (const name of widgetNames) {
if (isLinkedName(name)) {
for (const i of fullSim.consumedIndices[name] || []) linkedIdx.add(i);
}
}
if (linkedIdx.size > 0) {
remappedNode.widgets_values = widgetsValues.filter((_, i) => !linkedIdx.has(i));
}
}
/**
* Find the widgets_values array index that corresponds to a given widget input name on a
* subgraph-template node, for injecting an outer subgraph-node's un-linked widget value into it.
* Assumes _stripLegacyLinkedWidgetValues has already normalized widgets_values to the modern
* format (linked widgets contribute zero entries), matching what convertUiToApi's own
* widget-mapping loop expects.
*/
function _findInjectedWidgetIndex(objectInfo, remappedNode, sgDef, origInternalId, redirectedTargets, targetName) {
const widgetNames = _getWidgetInputNames(objectInfo, remappedNode.type);
const widgetTypes = _getWidgetInputTypes(objectInfo, remappedNode.type);
const widgetsValues = remappedNode.widgets_values || [];
const isLinkedName = (name) => _isLinkedWidgetName(remappedNode, sgDef, origInternalId, redirectedTargets, name);
const sim = _simulateWidgetValues(widgetNames, widgetTypes, widgetsValues, isLinkedName, true);
return sim.positions[targetName] ?? -1;
}
/**
* Flatten a subgraph-containing UI workflow into a plain UI workflow.
*
@@ -123,10 +309,17 @@ function _isExtraWidgetValue(val, expectedType) {
*
* Strategy: expand internal nodes into the parent, redirect parent links through
* the boundary ports, and convert internal links from object to array format.
* Widget values in internal nodes are preserved as-is (they are synced at save time
* by ComfyUI frontend). convertUiToApi handles widget mapping via object_info.
*
* Widget values: the outer subgraph node's own widgets_values hold the values actually
* set via the subgraph's collapsed form (what the user sees/edits). The internal nodes'
* widgets_values, stored in the subgraph template (definitions.subgraphs[].nodes), are
* only stale defaults from when the template was authored — ComfyUI does NOT keep them
* synced in saved workflow JSON. Un-linked outer widget inputs are therefore copied onto
* the matching internal node's widgets_values (via objectInfo to get the correct index,
* since the internal node's real class type is known). Linked outer inputs are left to
* the "Redirect parent links" step above, which takes priority.
*/
function _flattenSubgraphs(workflow) {
function _flattenSubgraphs(workflow, objectInfo) {
const defs = workflow.definitions?.subgraphs;
if (!defs || defs.length === 0) return workflow;
@@ -162,16 +355,20 @@ function _flattenSubgraphs(workflow) {
}
// === Map subgraph input ports → internal target {nodeId, slot} ===
// A single boundary port can fan out to MULTIPLE internal targets (e.g. a "width" pin
// feeding both EmptyFlux2LatentImage.width as a widget AND a PreviewAny.source wildcard
// link purely for canvas display) — collect all of them, not just the last one seen.
const inputPortTargets = {};
for (let portIdx = 0; portIdx < (sgDef.inputs || []).length; portIdx++) {
const port = sgDef.inputs[portIdx];
for (const linkId of (port.linkIds || [])) {
const iLink = (sgDef.links || []).find(l => l.id === linkId);
if (iLink && iLink.origin_id === -10) {
inputPortTargets[portIdx] = {
if (!inputPortTargets[portIdx]) inputPortTargets[portIdx] = [];
inputPortTargets[portIdx].push({
targetNodeId: nodeIdRemap[iLink.target_id],
targetSlot: iLink.target_slot,
};
});
}
}
}
@@ -192,6 +389,12 @@ function _flattenSubgraphs(workflow) {
}
// === Redirect parent links ===
// Track which {internal node, input slot} pairs end up resolved by a real outer
// link after redirection — needed below to tell apart "boundary-only" links
// (prompt/model-name ports that are actually widget values, see injection step)
// from ports that truly carry a link end-to-end (e.g. width/height wired to a
// ResolutionSelector node).
const redirectedTargets = new Set();
for (const link of wf.links) {
if (link[3] === node.id) {
const dstSlot = link[4];
@@ -200,10 +403,15 @@ function _flattenSubgraphs(workflow) {
? (sgDef.inputs || []).findIndex(p => p.name === inputName)
: -1;
if (portIdx === -1) portIdx = dstSlot;
const target = inputPortTargets[portIdx];
// Only the port's first fanned-out target is redirected here (a real outer link
// feeding a fanned-out port is rare — not seen in any known template so far).
// The far more common case (an outer *widget value*, no real link, fanning out to
// multiple internal targets) is handled fully below, for every target.
const target = inputPortTargets[portIdx]?.[0];
if (target) {
link[3] = target.targetNodeId;
link[4] = target.targetSlot;
redirectedTargets.add(`${target.targetNodeId}:${target.targetSlot}`);
}
}
if (link[1] === node.id) {
@@ -217,10 +425,102 @@ function _flattenSubgraphs(workflow) {
}
// === Add internal nodes (remapped IDs) ===
const remappedByOrigId = {};
for (const iNode of sgDef.nodes) {
const remapped = JSON.parse(JSON.stringify(iNode));
remapped.id = nodeIdRemap[iNode.id];
// Propagate the outer subgraph-node's Mute/Bypass mode onto every internal node.
// Without this, muting or bypassing a whole subgraph instance (e.g. disabling one of
// several parallel Flux.2 sampling pipelines via Ctrl-B) leaves its internal nodes at
// their template-authored mode (normally 0/enabled), so convertUiToApi's mode check
// below never excludes them — they end up in the API payload and can be picked up by
// node-existence-based UI logic (e.g. "first matching node found") ahead of the nodes
// actually driving the enabled pipeline.
if (node.mode === 2 || node.mode === 4) {
remapped.mode = node.mode;
}
// Some subgraph-template nodes store widgets_values in the "legacy full" format (one
// entry per widget input, including ones that are actually linked — either redirected
// from an outer parent-graph link, or wired to another internal node within the same
// subgraph template, e.g. EmptyFlux2LatentImage.width <- GetImageSize). Strip those
// entries so convertUiToApi's widget-mapping loop (which assumes the "modern" format:
// linked widgets contribute zero entries) doesn't drift every subsequent widget by
// however many linked entries were left in place — see _stripLegacyLinkedWidgetValues.
// Boundary links that terminate in a plain widget value (e.g. prompt text) are NOT
// treated as linked here — those resolve via the outer-value injection step below.
_stripLegacyLinkedWidgetValues(objectInfo, remapped, sgDef, String(iNode.id), redirectedTargets);
addedNodes.push(remapped);
remappedByOrigId[iNode.id] = remapped;
}
// === Inject outer subgraph-node widget values into internal nodes ===
// Only un-linked widget inputs — linked ones are already redirected above. A port can fan
// out to several internal targets (see inputPortTargets collection above) — apply the same
// value to every one of them, not just the first. Iterating per PORT (rather than per
// outer widget) matters for unfilled templates whose outer widgets_values is empty ([]) —
// there is then no outer override to apply, but the fan-out's widget-type target (e.g.
// EmptyFlux2LatentImage.width) still holds its own template-authored default, and that
// same value is what a sibling non-widget target (e.g. a PreviewAny used to render the
// value into a text template) needs too.
const outerWidgetInputs = (node.inputs || []).filter((inp) => inp.widget);
for (let portIdx = 0; portIdx < (sgDef.inputs || []).length; portIdx++) {
const targets = inputPortTargets[portIdx];
if (!targets || targets.length === 0) continue;
const port = sgDef.inputs[portIdx];
const outerInp = outerWidgetInputs.find((inp) => inp.name === port.name);
const outerWidgetIdx = outerInp ? outerWidgetInputs.indexOf(outerInp) : -1;
const hasOuterOverride = !!outerInp && outerInp.link == null && outerWidgetIdx !== -1
&& outerWidgetIdx < (node.widgets_values || []).length;
const outerValue = hasOuterOverride ? node.widgets_values[outerWidgetIdx] : undefined;
// Value to apply to non-widget (wildcard) fan-out targets: the outer override if
// present, otherwise whatever a sibling widget-type target ends up holding (its own
// unmodified template default, when there is no outer override).
let fallbackLiteral = outerValue;
for (const target of targets) {
const origInternalId = String(target.targetNodeId).split(":").pop();
const remappedNode = remappedByOrigId[origInternalId];
if (!remappedNode) continue;
const targetInputDef = (remappedNode.inputs || [])[target.targetSlot];
if (!targetInputDef?.widget) continue;
// Compute where in widgets_values this widget's value actually lives — accounting
// for linked slots (which consume no entry) and control_after_generate-style
// extras (which shift later indices by one). See _findInjectedWidgetIndex for why
// a plain name-index lookup silently corrupts sibling widgets here.
const iWidgetIdx = _findInjectedWidgetIndex(
objectInfo, remappedNode, sgDef, origInternalId, redirectedTargets, targetInputDef.name
);
if (iWidgetIdx === -1) continue;
if (!remappedNode.widgets_values) remappedNode.widgets_values = [];
if (hasOuterOverride) remappedNode.widgets_values[iWidgetIdx] = outerValue;
if (fallbackLiteral === undefined) fallbackLiteral = remappedNode.widgets_values[iWidgetIdx];
}
if (fallbackLiteral === undefined) continue;
for (const target of targets) {
const origInternalId = String(target.targetNodeId).split(":").pop();
const remappedNode = remappedByOrigId[origInternalId];
if (!remappedNode) continue;
const targetInputDef = (remappedNode.inputs || [])[target.targetSlot];
if (!targetInputDef || targetInputDef.widget) continue;
// Not a widget-representable input — typically a required wildcard ("*") link slot
// with no widget UI (e.g. a "Preview as Text" node used to render a width/height
// value into a prompt template string). There is no upstream node to link it to
// once flattened (the value only ever existed as this outer widget or a sibling
// target's own default), so stash it for convertUiToApi() to inject as a plain
// literal value instead of a link.
if (!remappedNode._wfmLiteralInputs) remappedNode._wfmLiteralInputs = {};
remappedNode._wfmLiteralInputs[targetInputDef.name] = fallbackLiteral;
}
}
// === Add internal links (object format → array format) ===
@@ -253,8 +553,11 @@ export const comfyWorkflow = {
detectFormat(workflow, filename) {
if (!workflow || typeof workflow !== "object") return "unknown";
if (Array.isArray(workflow.nodes) && workflow.links !== undefined) {
// App format: UI-based structure with definitions (subgraphs) or linearMode
if (workflow.definitions || workflow.extra?.linearMode === true) return "app";
// App format: simplified web-app-style UI (linearMode) or .app.json filename.
// A workflow that merely *contains* subgraphs (definitions.subgraphs) is still
// a normal node graph — convertUiToApi() flattens subgraphs before conversion,
// so it's treated as "ui" rather than blocked as unsupported "app" format.
if (workflow.extra?.linearMode === true) return "app";
if (filename && /\.app\.json$/i.test(filename)) return "app";
return "ui";
}
@@ -267,14 +570,30 @@ export const comfyWorkflow = {
/**
* Convert UI-format workflow to API-format using /object_info for accurate widget mapping.
*/
getLastCheckpointSubstitutions() {
return _lastCheckpointSubstitutions;
},
getLastBypassedNodes() {
return _lastBypassedNodes;
},
getLastMutedNodes() {
return _lastMutedNodes;
},
async convertUiToApi(workflow) {
_lastCheckpointSubstitutions = [];
_lastBypassedNodes = [];
_lastMutedNodes = [];
if (!workflow.nodes || !workflow.links) return {};
// Flatten subgraphs before conversion
const flatWorkflow = _flattenSubgraphs(workflow);
const objectInfo = await _loadObjectInfo();
// Flatten subgraphs before conversion (needs objectInfo to correctly map outer
// subgraph-node widget values onto internal nodes' widgets_values indices)
const flatWorkflow = _flattenSubgraphs(workflow, objectInfo);
// Build link map: dstNode -> { dstSlot -> [srcNodeId, srcSlot] }
const linkMap = {};
for (const link of flatWorkflow.links) {
@@ -282,10 +601,27 @@ export const comfyWorkflow = {
if (!linkMap[dstNode]) linkMap[dstNode] = {};
linkMap[dstNode][dstSlot] = [String(srcNode), srcSlot];
}
const nodeById = {};
for (const n of flatWorkflow.nodes) nodeById[String(n.id)] = n;
const api = {};
for (const node of flatWorkflow.nodes) {
if (node.mode === 4) continue; // muted/bypassed
// Mute (mode 2): excluded, no pass-through — matches ComfyUI itself, where
// muting a node with required downstream dependents is expected to error.
// Bypass (mode 4): excluded here too, but its wires are rerouted below via
// _resolveBypassSource() so downstream nodes reconnect to its upstream source.
if (node.mode === 2) {
_lastMutedNodes.push({ nodeId: String(node.id), title: node.title || node.type });
continue;
}
if (node.mode === 4) {
_lastBypassedNodes.push({ nodeId: String(node.id), title: node.title || node.type });
continue;
}
// Reroute: UI-only passthrough node, no backend node class — including it in the API
// payload triggers a "missing_node_type" 400 from ComfyUI. Its wires are already
// resolved through via _resolveBypassSource() below, same as a Bypassed node's.
if (node.type === "Reroute") continue;
// Skip note/display-only nodes that are unknown to ComfyUI backend
if (!objectInfo[node.type] && _isDisplayOnlyNode(node)) continue;
const nodeId = String(node.id);
@@ -301,7 +637,9 @@ export const comfyWorkflow = {
const linkedSlotNames = new Set();
inputDefs.forEach((inp, idx) => {
if (nodeLinks[idx]) {
inputs[inp.name] = nodeLinks[idx];
const resolved = _resolveBypassSource(nodeById, linkMap, nodeLinks[idx][0], nodeLinks[idx][1], new Set());
if (!resolved) return; // Bypass chain with no upstream source — leave unlinked
inputs[inp.name] = resolved;
linkedInputNames.add(inp.name);
linkedSlotNames.add(inp.name);
}
@@ -365,6 +703,22 @@ export const comfyWorkflow = {
wIdx++;
}
}
// DynamicCombo (e.g. SaveImageAdvanced's "format"): val is the selected
// option's key (e.g. "png"). Per comfy_api/latest/_io.py
// DynamicCombo._expand_schema_for_dynamic, the backend looks up flat
// dot-prefixed keys ("format", "format.bit_depth", ...) in the raw
// inputs dict and assembles them into a single dict itself at execution
// time — it does NOT accept a pre-built dict under the "format" key.
if (expectedType === "COMFY_DYNAMICCOMBO_V3") {
inputs[name] = val;
const subNames = _getDynamicComboSubNames(objectInfo, node.type, name, val);
for (const subName of subNames) {
if (wIdx >= widgets.length) break;
inputs[`${name}.${subName}`] = widgets[wIdx];
wIdx++;
}
continue;
}
// For COMBO inputs, validate the value against the available choices.
// Dynamic COMBO options (e.g. Impact Pack's "Select to add Wildcard") may
// differ between the saved workflow and the current ComfyUI instance
@@ -379,6 +733,14 @@ export const comfyWorkflow = {
if (spec) {
const choices = Array.isArray(spec[0]) ? spec[0] : null;
if (choices && choices.length > 0 && !choices.includes(val)) {
if (name === "ckpt_name") {
_lastCheckpointSubstitutions.push({
nodeId: String(node.id),
title: node.title || node.type,
original: val,
replaced: choices[0],
});
}
val = choices[0];
}
}
@@ -407,6 +769,15 @@ export const comfyWorkflow = {
inputs["wildcard_text"] = widgets[0];
}
// Literal values for non-widget (e.g. wildcard "*") inputs that a subgraph boundary
// widget fanned out to — see the injection step in _flattenSubgraphs for why these
// can't be represented as widgets_values entries or resolved as a link.
if (node._wfmLiteralInputs) {
for (const [k, v] of Object.entries(node._wfmLiteralInputs)) {
if (!(k in inputs)) inputs[k] = v;
}
}
api[nodeId] = {
class_type: node.type,
inputs,
@@ -487,6 +858,8 @@ export const comfyWorkflow = {
vae_nodes: [],
save_nodes: [],
load_image_nodes: [],
inpaint_encode_nodes: [],
mask_editor_one_nodes: [],
text_encoder_nodes: [],
diffusion_model_nodes: [],
controlnet_nodes: [],
@@ -514,15 +887,48 @@ export const comfyWorkflow = {
// KSamplerAdvanced uses noise_seed instead of seed
const seedKey = "seed" in inputs ? "seed" : "noise_seed";
const seedVal = inputs.seed ?? inputs.noise_seed;
// seed/steps/cfg/denoise are sometimes wired to Primitive nodes (e.g. a shared
// "steps" value switched between two LoRA presets) instead of holding a direct
// number — leave those undefined so the settings-tab UI shows "linked" instead of
// a link-reference array, and Apply doesn't clobber the link with a literal value.
result.sampler_nodes.push({
id, type: ct, title,
seed: inputs.seed ?? inputs.noise_seed,
seedKey,
steps: inputs.steps, cfg: inputs.cfg,
sampler_name: inputs.sampler_name, scheduler: inputs.scheduler,
denoise: inputs.denoise,
seed: typeof seedVal === "number" ? seedVal : undefined,
seedKey, seedNodeId: id,
steps: typeof inputs.steps === "number" ? inputs.steps : undefined, stepsNodeId: id,
cfg: typeof inputs.cfg === "number" ? inputs.cfg : undefined, cfgNodeId: id,
sampler_name: inputs.sampler_name, samplerNodeId: id,
scheduler: inputs.scheduler, schedulerNodeId: id,
denoise: typeof inputs.denoise === "number" ? inputs.denoise : undefined, denoiseNodeId: id,
});
}
// CFGGuider / BasicGuider / DualCFGGuider — used by "Advanced Sampling" workflows
// (Flux.1/Flux.2, SD3.5, Chroma, HiDream E1, etc.) in place of KSampler's
// positive/negative inputs. These feed SamplerCustomAdvanced rather than driving a
// sampler themselves, so role propagation must start here too, or CLIPTextEncode
// nodes downstream stay "unknown" role.
if (ct === "CFGGuider") {
if (Array.isArray(inputs.positive)) samplerPositiveRef[inputs.positive[0]] = true;
if (Array.isArray(inputs.negative)) samplerNegativeRef[inputs.negative[0]] = true;
}
if (ct === "BasicGuider") {
if (Array.isArray(inputs.conditioning)) samplerPositiveRef[inputs.conditioning[0]] = true;
}
// DualCFGGuider (HiDream E1 instruct-pix2pix style edit): cond1/cond2 both derive from
// the positive text (often via InstructPixToPixConditioning), negative is separate —
// cond2 is left unmarked since it doesn't cleanly map to either role.
if (ct === "DualCFGGuider") {
if (Array.isArray(inputs.cond1)) samplerPositiveRef[inputs.cond1[0]] = true;
if (Array.isArray(inputs.negative)) samplerNegativeRef[inputs.negative[0]] = true;
}
// SamplerCustom (older/simpler counterpart to SamplerCustomAdvanced): holds
// positive/negative directly instead of going through a separate Guider node.
if (ct === "SamplerCustom") {
if (Array.isArray(inputs.positive)) samplerPositiveRef[inputs.positive[0]] = true;
if (Array.isArray(inputs.negative)) samplerNegativeRef[inputs.negative[0]] = true;
}
}
// === Pass 1b: Expand refs through CONDITIONING graph (BFS, 5 iterations) ===
@@ -536,6 +942,7 @@ export const comfyWorkflow = {
"ControlNetApply", "ControlNetApplyAdvanced",
"IPAdapterApply", "IPAdapterApplyFaceID",
"StyleModelApply",
"FluxGuidance", "FluxKontextMultiReferenceLatentMethod",
]);
for (let iter = 0; iter < 5; iter++) {
@@ -590,6 +997,29 @@ export const comfyWorkflow = {
}
}
}
// InstructPixToPixConditioning (HiDream E1 edit) — unlike COND_PASSTHROUGH nodes,
// this has *separate* positive/negative inputs feeding separate outputs, so each
// role must route only to its own input (not both) or the negative CLIPTextEncode
// would incorrectly get marked positive too via the positive-output branch.
if (ct === "InstructPixToPixConditioning") {
if (isPos && Array.isArray(inputs.positive)) samplerPositiveRef[inputs.positive[0]] = true;
if (isNeg && Array.isArray(inputs.negative)) samplerNegativeRef[inputs.negative[0]] = true;
}
// ComfySwitchNode ("If/Else Switch", on_false/on_true/switch) — used by Ernie
// Image's prompt-enhancement toggle to pick between the raw PrimitiveStringMultiline
// text and an LLM-generated (TextGenerate) rewrite. The rewrite can't be known
// statically, so propagate the role through both branches — only the branch that
// resolves to a literal string source (e.g. PrimitiveStringMultiline) will end up
// producing a prompt_nodes entry in Pass 2.
if (ct === "ComfySwitchNode") {
for (const key of ["on_false", "on_true"]) {
const tv = inputs[key];
if (Array.isArray(tv)) {
if (isPos) samplerPositiveRef[tv[0]] = true;
if (isNeg) samplerNegativeRef[tv[0]] = true;
}
}
}
}
}
@@ -611,6 +1041,72 @@ export const comfyWorkflow = {
return "unknown";
};
// --- Advanced Sampler: SamplerCustomAdvanced ---
// "Advanced Sampling" pattern used by Flux.1/Flux.2, SD3.5, Chroma, HiDream E1, etc.:
// instead of one KSampler node holding seed/steps/cfg/sampler/scheduler, those values
// are spread across RandomNoise (noise_seed) → a Guider node (cfg) → KSamplerSelect
// (sampler_name) → a *Scheduler node (steps/denoise), all feeding SamplerCustomAdvanced.
// Collect them into one composite entry so Settings-tab editing still works; each
// value's *NodeId tracks which real node to write back to (null = no such control
// exists on this workflow, e.g. Flux2Scheduler has no named "scheduler" combo).
if (ct === "SamplerCustomAdvanced") {
const noiseId = Array.isArray(inputs.noise) ? String(inputs.noise[0]) : null;
const guiderId = Array.isArray(inputs.guider) ? String(inputs.guider[0]) : null;
const samplerSelId = Array.isArray(inputs.sampler) ? String(inputs.sampler[0]) : null;
const schedulerId = Array.isArray(inputs.sigmas) ? String(inputs.sigmas[0]) : null;
const noiseInputs = (noiseId && workflow[noiseId]?.inputs) || {};
const guiderNode = guiderId ? workflow[guiderId] : null;
const guiderInputs = guiderNode?.inputs || {};
// DualCFGGuider (HiDream E1 instruct-pix2pix edit) has no plain "cfg" input — its
// two CFG knobs are cfg_conds/cfg_cond2_negative. Use cfg_conds as the
// representative value so Settings still shows/edits *something* meaningful.
const guiderCfgKey = guiderNode?.class_type === "DualCFGGuider" ? "cfg_conds" : "cfg";
const samplerSelInputs = (samplerSelId && workflow[samplerSelId]?.inputs) || {};
const schedulerInputs = (schedulerId && workflow[schedulerId]?.inputs) || {};
result.sampler_nodes.push({
id, type: ct, title, advanced: true,
seed: typeof noiseInputs.noise_seed === "number" ? noiseInputs.noise_seed : undefined,
seedKey: "noise_seed", seedNodeId: noiseId,
steps: typeof schedulerInputs.steps === "number" ? schedulerInputs.steps : undefined,
stepsNodeId: schedulerId,
cfg: typeof guiderInputs[guiderCfgKey] === "number" ? guiderInputs[guiderCfgKey] : undefined,
cfgNodeId: guiderCfgKey in guiderInputs ? guiderId : null,
cfgKey: guiderCfgKey,
sampler_name: samplerSelInputs.sampler_name, samplerNodeId: samplerSelId,
scheduler: undefined, schedulerNodeId: "scheduler" in schedulerInputs ? schedulerId : null,
denoise: typeof schedulerInputs.denoise === "number" ? schedulerInputs.denoise : undefined,
denoiseNodeId: "denoise" in schedulerInputs ? schedulerId : null,
});
}
// --- Advanced Sampler: SamplerCustom ---
// Older/simpler counterpart to SamplerCustomAdvanced: no RandomNoise/Guider
// indirection — noise_seed and cfg are its own widgets, and positive/negative feed it
// directly. sampler_name/steps/scheduler/denoise still come from separate
// KSamplerSelect/*Scheduler nodes via its sampler/sigmas inputs.
if (ct === "SamplerCustom") {
const samplerSelId = Array.isArray(inputs.sampler) ? String(inputs.sampler[0]) : null;
const schedulerId = Array.isArray(inputs.sigmas) ? String(inputs.sigmas[0]) : null;
const samplerSelInputs = (samplerSelId && workflow[samplerSelId]?.inputs) || {};
const schedulerInputs = (schedulerId && workflow[schedulerId]?.inputs) || {};
result.sampler_nodes.push({
id, type: ct, title, advanced: true,
seed: typeof inputs.noise_seed === "number" ? inputs.noise_seed : undefined,
seedKey: "noise_seed", seedNodeId: id,
steps: typeof schedulerInputs.steps === "number" ? schedulerInputs.steps : undefined,
stepsNodeId: schedulerId,
cfg: typeof inputs.cfg === "number" ? inputs.cfg : undefined,
cfgNodeId: id,
sampler_name: samplerSelInputs.sampler_name, samplerNodeId: samplerSelId,
scheduler: schedulerInputs.scheduler, schedulerNodeId: "scheduler" in schedulerInputs ? schedulerId : null,
denoise: typeof schedulerInputs.denoise === "number" ? schedulerInputs.denoise : undefined,
denoiseNodeId: "denoise" in schedulerInputs ? schedulerId : null,
});
}
// --- Checkpoint nodes ---
// Matches: CheckpointLoaderSimple, CheckpointLoader, "Checkpoint Loader" (WAS), etc.
if (ct.includes("CheckpointLoader") || ct === "Checkpoint Loader") {
@@ -677,8 +1173,9 @@ export const comfyWorkflow = {
}
}
// Qwen-based image+text encoder
if (ct === "TextEncodeQwenImageEditPlus") {
// Qwen-based image+text encoder (Plus variant takes up to 3 reference images;
// the base variant takes one — both share the same "prompt" widget)
if (ct === "TextEncodeQwenImageEditPlus" || ct === "TextEncodeQwenImageEdit") {
result.prompt_nodes.push({
id, type: ct, title, role: getRole(),
text: inputs.prompt || "",
@@ -686,6 +1183,39 @@ export const comfyWorkflow = {
});
}
// TextEncodeBooguEdit (Boogu image-edit model) — prompt + negative_prompt in one node
if (ct === "TextEncodeBooguEdit") {
if (typeof inputs.prompt === "string") {
result.prompt_nodes.push({
id, type: ct, title: `${title} [positive]`, role: "positive",
text: inputs.prompt, textKey: "prompt",
});
}
if (typeof inputs.negative_prompt === "string") {
result.prompt_nodes.push({
id, type: ct, title: `${title} [negative]`, role: "negative",
text: inputs.negative_prompt, textKey: "negative_prompt",
});
}
}
// Mage-Flow text encoder — prompt + negative_prompt in one node (fixed roles,
// unlike KSampler-derived getRole() since both wires originate from this node)
if (ct === "TextEncodeMageFlowEdit") {
if (typeof inputs.prompt === "string") {
result.prompt_nodes.push({
id, type: ct, title: `${title} [positive]`, role: "positive",
text: inputs.prompt, textKey: "prompt",
});
}
if (typeof inputs.negative_prompt === "string") {
result.prompt_nodes.push({
id, type: ct, title: `${title} [negative]`, role: "negative",
text: inputs.negative_prompt, textKey: "negative_prompt",
});
}
}
// SDXLPromptStyler / SDXLPromptStylerAdvanced — contains both pos & neg in one node
if (ct === "SDXLPromptStyler" || ct === "SDXLPromptStylerAdvanced") {
if (inputs.text_positive !== undefined) {
@@ -739,10 +1269,29 @@ export const comfyWorkflow = {
}
// --- Latent nodes ---
if (ct === "EmptyLatentImage" || ct === "EmptySD3LatentImage") {
// EmptyFlux2LatentImage (Flux.2 templates) often has width/height wired to a
// GetImageSize node (auto-follows the reference image) rather than a direct number —
// leave those as undefined, same treatment as TextEncodeMageFlowEdit below, so the
// settings-tab UI shows "linked" instead of a stale default and Apply doesn't clobber it.
if (ct === "EmptyLatentImage" || ct === "EmptySD3LatentImage" || ct === "EmptyFlux2LatentImage") {
result.latent_nodes.push({
id, type: ct, title,
width: inputs.width, height: inputs.height,
width: typeof inputs.width === "number" ? inputs.width : undefined,
height: typeof inputs.height === "number" ? inputs.height : undefined,
batch_size: inputs.batch_size,
});
}
// TextEncodeMageFlowEdit also carries width/height/batch_size directly
// (it builds the latent internally instead of a separate EmptyLatentImage node).
// width/height are commonly wired to a ResolutionSelector-style helper node
// (array link ref) rather than a direct number — leave those as undefined so
// the settings-tab UI falls back to its default instead of rendering a link ref.
if (ct === "TextEncodeMageFlowEdit") {
result.latent_nodes.push({
id, type: ct, title,
width: typeof inputs.width === "number" ? inputs.width : undefined,
height: typeof inputs.height === "number" ? inputs.height : undefined,
batch_size: inputs.batch_size,
});
}
@@ -809,6 +1358,22 @@ export const comfyWorkflow = {
});
}
// --- VAE Encode (for Inpainting) nodes ---
if (ct === "VAEEncodeForInpaint") {
result.inpaint_encode_nodes.push({
id, type: ct, title,
grow_mask_by: inputs.grow_mask_by,
});
}
// --- Mask Editor One nodes (comfyui-mask-editor-one) ---
// 画像とマスクをノード自身が内包する(LoadImageを介さない)インペイント画像ソース。
// image出力はサーバー側キャッシュ(bg_image_b64、node_idキー)から、mask出力は
// layer_data(JSON文字列)ウィジェットの各レイヤーのアルファチャンネルから合成される。
if (ct === "MaskEditorOne") {
result.mask_editor_one_nodes.push({ id, type: ct, title });
}
// --- Text encoder (CLIP) nodes ---
if (ct === "DualCLIPLoader" || ct === "CLIPLoader" || ct === "ClipLoaderGGUF" || ct === "DualClipLoaderGGUF") {
result.text_encoder_nodes.push({
@@ -850,6 +1415,24 @@ export const comfyWorkflow = {
}
}
// --- Post-pass: flag LoadImage nodes whose MASK output (slot 1) is wired to something
// downstream (directly, or via a pass-through node like MaskEditorNode). These are the
// "inpaint-capable" slots — image + mask both come from the same node's two outputs, so
// painting a mask for them only requires re-uploading that one node's image with the mask
// baked into the alpha channel (matches ComfyUI's native LoadImage alpha→MASK extraction). ---
const loadImageIds = new Set(result.load_image_nodes.filter(n => n.type === "LoadImage").map(n => n.id));
if (loadImageIds.size > 0) {
for (const node of Object.values(workflow)) {
if (!node?.inputs) continue;
for (const v of Object.values(node.inputs)) {
if (Array.isArray(v) && v.length === 2 && Number(v[1]) === 1 && loadImageIds.has(String(v[0]))) {
const target = result.load_image_nodes.find(n => n.id === String(v[0]));
if (target) target.mask_used = true;
}
}
}
}
result.all_nodes.sort((a, b) => Number(a.id) - Number(b.id));
return result;
},
+229 -2
View File
@@ -7,10 +7,11 @@ import { showToast } from "./app.js";
import { t } from "./i18n.js";
import { loadFileIntoMetadataTab } from "./metadata-tab.js";
import { loadWorkflowIntoEditor } from "./generate-tab.js";
import { escapeHtml, setupSearchClearBtn } from "./util.js";
import { escapeHtml, setupSearchClearBtn, getAiBackendDefaultUrl } from "./util.js";
import { comfyWorkflow } from "./comfyui-workflow.js";
import { comfyUI } from "./comfyui-client.js";
import { comfyEditor } from "./comfyui-editor.js";
import { callLLM, loadAiSettings, isValidBackendUrl } from "./ai-tab.js";
// ── 定数 ─────────────────────────────────────────────────────
@@ -43,6 +44,170 @@ const API = {
export const FEEDER_GROUP = "__Feeder__";
// ComfyUI Comic Creater からiframe越しに画像を受け取り、Generate UIのImage入力スロットへ直接セットする(I2I連携)。
// Comic Creater側の「I2Iへ送る」ボタンから
// iframe.contentWindow._wfmReceiveImageForI2I(blob, name, workflowData?, workflowFilename?) として呼ばれる。
// 画像スロットへのセット自体は wfm-gallery-send-genui-image-btn のクリックハンドラ(Galleryの選択画像を送る版)と同一。
// workflowData が渡された場合(Comic Creater側の設定タブでデフォルトワークフローが有効な時)は、
// 画像をセットする前にそのワークフローを読み込む。
window._wfmReceiveImageForI2I = async (blob, name, workflowData, workflowFilename) => {
try {
if (workflowData) {
try {
// iframeロード直後などモデルリスト未取得のままワークフローを読み込むと、
// Model/生成UIタブのCheckpoint等ドロップダウンが空のままレンダリングされてしまう。
// 接続確認・モデルリスト取得を保証してからワークフローを読み込む
if (!comfyUI.connected) {
await comfyUI.checkConnection();
}
if (comfyUI.connected && (!comfyEditor.models.checkpoints || comfyEditor.models.checkpoints.length === 0)) {
await comfyEditor.loadModelLists();
}
await loadWorkflowIntoEditor(workflowData, workflowFilename || "workflow.json");
} catch (e) {
console.warn("[I2I] failed to load default workflow:", e);
}
}
const file = new File([blob], name || "cc-image.png", { type: blob.type || "image/png" });
document.querySelector('[data-tab="generate"]')?.click();
document.querySelector('.wfm-gen-subtab-btn[data-subtab="input"]')?.click();
document.querySelector('.wfm-input-inner-tab[data-input-tab="image"]')?.click();
await comfyEditor.applyImageToSlot(file, 0);
showToast(t("gallerySentGenUI"), "success");
return true;
} catch (e) {
showToast(t("errorWithMsg", e.message), "error");
return false;
}
};
// ComfyUI Comic Creater からiframe越しに合成画像+マスクを受け取り、Image Edit タブの
// Inpaint機能をUIを開かずに直接実行して結果URLを返す(Inpaint連携)。
// Comic Creater側の Image タブ「Inpaint」から
// iframe.contentWindow._wfmReceiveInpaintRequest(imageBlob, maskBlob, params, workflowData?, workflowFilename?) として呼ばれる。
// workflowData が渡された場合(Comic Creater側の設定タブでInpaint用デフォルトワークフローが有効な時)は、
// 実行前にそのワークフローを読み込む。渡されない場合はGenerate UIに現在ロード中のワークフローをそのまま使う。
window._wfmReceiveInpaintRequest = async (imageBlob, maskBlob, params, workflowData, workflowFilename) => {
try {
if (workflowData) {
if (!comfyUI.connected) {
await comfyUI.checkConnection();
}
if (comfyUI.connected && (!comfyEditor.models.checkpoints || comfyEditor.models.checkpoints.length === 0)) {
await comfyEditor.loadModelLists();
}
await loadWorkflowIntoEditor(workflowData, workflowFilename || "workflow.json");
}
return await window._wfmImageEditTab.runInpaintExternal(imageBlob, maskBlob, params);
} catch (e) {
return { ok: false, message: e.message };
}
};
// ComfyUI Comic Creater からiframe越しに画像を受け取り、Image Edit タブの
// Select I2I機能をUIを開かずに直接実行して結果URLを返す(I2I連携、マスク不要)。
// Comic Creater側の Image タブ「Select→I2I」から
// iframe.contentWindow._wfmReceiveI2IRunRequest(imageBlob, params, workflowData?, workflowFilename?) として呼ばれる。
// workflowData が渡された場合(Comic Creater側のI2I設定でデフォルトワークフローが有効な時)は、
// 実行前にそのワークフローを読み込む。渡されない場合はGenerate UIに現在ロード中のワークフローをそのまま使う。
window._wfmReceiveI2IRunRequest = async (imageBlob, params, workflowData, workflowFilename) => {
try {
if (workflowData) {
if (!comfyUI.connected) {
await comfyUI.checkConnection();
}
if (comfyUI.connected && (!comfyEditor.models.checkpoints || comfyEditor.models.checkpoints.length === 0)) {
await comfyEditor.loadModelLists();
}
await loadWorkflowIntoEditor(workflowData, workflowFilename || "workflow.json");
}
return await window._wfmImageEditTab.runI2IExternal(imageBlob, params);
} catch (e) {
return { ok: false, message: e.message };
}
};
// ComfyUI Comic Creater からiframe越しにコマの設定(シーン・要素・セリフ等)を受け取り、
// AIタブの設定タブと同じLLM接続設定(Ollama/LM Studio)で画像生成プロンプトの下書きを
// 生成して返す(半自動マンガ作成の「L」ボタン連携用)。
// Comic Creater側のスクリプトタブ「L」ボタンから
// iframe.contentWindow._wfmReceiveLLMPromptRequest(context) として呼ばれる。
// context: { scene, elements, dialogues, existingPrompt }(いずれも文字列、空文字可)
window._wfmReceiveLLMPromptRequest = async (context) => {
try {
const settings = loadAiSettings();
const { backend = "ollama", backendUrl, model } = settings;
const url = backendUrl || getAiBackendDefaultUrl(backend);
if (!isValidBackendUrl(url)) return { ok: false, message: "AI settings: invalid backend URL (configure it in the Settings tab)" };
if (!model) return { ok: false, message: "AI settings: no model selected (configure it in the Settings tab)" };
const { scene = "", elements = "", dialogues = "", existingPrompt = "" } = context || {};
const prompt = [
"Create a concise Stable Diffusion image generation prompt (English, comma-separated tags/phrases describing scene, composition, character appearance and action) for one manga panel, based on the following context.",
"Output only the prompt text, nothing else.",
scene ? `Scene: ${scene}` : null,
elements ? `Characters/elements: ${elements}` : null,
dialogues ? `Dialogue: ${dialogues}` : null,
existingPrompt ? `Current draft prompt (revise/improve it): ${existingPrompt}` : null,
].filter(Boolean).join("\n");
const result = await callLLM(url, backend, model, prompt);
const text = (result || "").trim();
if (!text) return { ok: false, message: "LLM returned an empty response" };
return { ok: true, text };
} catch (e) {
return { ok: false, message: e.message };
}
};
// ComfyUI Comic Creater からiframe越しに画像プロンプト・サイズを受け取り、Generate UIで
// テキストから画像を生成して結果URLを返す(半自動マンガ作成のコマ単位バッチ画像生成用)。
// Comic Creater側のスクリプトタブ「画像を一括生成」から
// iframe.contentWindow._wfmReceiveGenerateRequest(prompt, width, height, negative, workflowData?, workflowFilename?)
// として呼ばれる。I2I/Inpaintと異なり画像アップロードは行わない(txt2img)。
// workflowData が渡された場合(Comic Creater側のT2I設定でデフォルトワークフローが有効な時)は、
// 実行前にそのワークフローを読み込む。渡されない場合はGenerate UIに現在ロード中のワークフローをそのまま使う。
window._wfmReceiveGenerateRequest = async (prompt, width, height, negative, workflowData, workflowFilename) => {
try {
if (!window._wfmGenerateTab?.generate) return { ok: false, message: "Generate UI is not ready yet" };
if (workflowData) {
try {
if (!comfyUI.connected) {
await comfyUI.checkConnection();
}
if (comfyUI.connected && (!comfyEditor.models.checkpoints || comfyEditor.models.checkpoints.length === 0)) {
await comfyEditor.loadModelLists();
}
await loadWorkflowIntoEditor(workflowData, workflowFilename || "workflow.json");
} catch (e) {
console.warn("[T2I] failed to load default workflow:", e);
}
}
const analysis = comfyUI.currentAnalysis;
if (!comfyUI.currentWorkflow || !analysis) return { ok: false, message: "No workflow loaded in Generate UI" };
const workflow = JSON.parse(JSON.stringify(comfyUI.currentWorkflow));
const latent = analysis.latent_nodes?.[0];
if (latent && width && height && workflow[latent.id]) {
workflow[latent.id].inputs.width = width;
workflow[latent.id].inputs.height = height;
}
comfyEditor.setPromptText("positive", prompt || "", { workflow, analysis });
if (negative) comfyEditor.setPromptText("negative", negative, { workflow, analysis });
await window._wfmGenerateTab.generate(workflow);
const resultUrl = document.getElementById("wfm-gen-result-img")?.src;
if (!resultUrl) return { ok: false, message: "No result image produced" };
return { ok: true, url: resultUrl };
} catch (e) {
return { ok: false, message: e.message };
}
};
// ── ページング ────────────────────────────────────────────────
const PAGE_SIZE = 50;
let _renderedCount = 0;
@@ -1506,6 +1671,68 @@ function bindEvents() {
}
});
// 選択画像を ComfyUI Comic Creator の選択コマ/オーバーレイへ送信
// (ComfyUI Comic CreaterからこのGalleryタブがiframe埋め込みされている場合のみ表示・動作する)
const sendCcBtn = document.getElementById("wfm-gallery-send-cc-btn");
if (sendCcBtn) {
let embedded = false;
try {
embedded = !!(window.parent && window.parent !== window);
} catch (e) {
embedded = false;
}
if (embedded) sendCcBtn.style.display = "";
sendCcBtn.addEventListener("click", () => {
if (!state.selectedImage) {
showToast(t("gallerySelectImageFirst"), "info");
return;
}
const url = API.serveImage(state.selectedImage.path);
// I2I送信元がImageタブだった場合はそちらへ画像を読み込ませる(_ccI2ITargetModeはComic Creater側が
// 「I2Iへ送る」ボタン押下時にセットするフラグ。undefined/'layout'なら従来通りコマ/オーバーレイへ挿入)
let targetMode = null;
try {
targetMode = window.parent?._ccI2ITargetMode || null;
} catch (e) {
targetMode = null;
}
if (targetMode === "image") {
let imageTab = null;
try {
if (window.parent && window.parent !== window && typeof window.parent._ccImageTab?.loadFromUrl === "function") {
imageTab = window.parent._ccImageTab;
}
} catch (e) {
imageTab = null;
}
if (!imageTab) {
showToast(t("galleryCCNotAvailable"), "info");
return;
}
imageTab.loadFromUrl(url, (state.selectedImage.filename || "cc-image").replace(/\.[^.]+$/, ""));
showToast(t("gallerySentCC"), "success");
return;
}
let insertFn = null;
try {
if (window.parent && window.parent !== window && typeof window.parent.insertImageFromUrl === "function") {
insertFn = window.parent.insertImageFromUrl;
}
} catch (e) {
insertFn = null;
}
if (!insertFn) {
showToast(t("galleryCCNotAvailable"), "info");
return;
}
insertFn(url);
showToast(t("gallerySentCC"), "success");
});
}
// 検索
document.getElementById("wfm-gallery-search")?.addEventListener("input", (e) => {
state.search = e.target.value;
@@ -1591,7 +1818,7 @@ function bindEvents() {
if (window.opener && typeof window.opener.wfmReceiveWorkflow === "function") {
window.opener.wfmReceiveWorkflow(state.embeddedWorkflow);
await navigator.clipboard.writeText(JSON.stringify(state.embeddedWorkflow, null, 2)).catch(() => {});
showToast(t("workflowSentToCanvas"), "success");
showToast(t("workflowSentToCanvasDirect"), "success");
return;
}
// フォールバック: localStorage + タイトルドラッグ(UI形式のみ)
+225 -69
View File
@@ -9,44 +9,8 @@ import { comfyEditor } from "./comfyui-editor.js";
import { t } from "./i18n.js";
import { syncJsonHighlight, syncScroll } from "./json-highlight.js";
import { initFeederTab, refreshFeederNodeList } from "./feeder-tab.js";
import { getSettings, readJsonStorage } from "./util.js";
// ============================================
// Eagle Auto-Save
// ============================================
function getEagleSettings() {
const s = getSettings();
return {
url: s.eagleUrl || "http://localhost:41595",
autoSave: !!s.eagleAutoSave,
};
}
async function saveToEagle(imageUrl, name, tags = []) {
const eagle = getEagleSettings();
if (!eagle.autoSave) return;
try {
const res = await fetch("/api/wfm/eagle/add", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({
eagleUrl: eagle.url,
url: imageUrl,
name,
tags: ["wfm-comfyui", ...tags],
}),
});
const data = await res.json();
if (data.status === "success") {
console.log("[Eagle] Saved:", name);
} else {
console.warn("[Eagle] Save failed:", data.message);
}
} catch (err) {
console.warn("[Eagle] Save error:", err.message);
}
}
import { initLabTab } from "./lab-tab.js";
import { getSettings, readJsonStorage, escapeHtml, getEagleSettings, saveToEagle } from "./util.js";
// ============================================
// Gallery Metadata - ワークフロー保存
@@ -218,21 +182,52 @@ async function saveCurrentWorkflow() {
// Workflow Loading
// ============================================
// ワークフロー読み込み時、設定タブで有効化されていれば checkpoint loader 系ノード全件の
// ckpt_name をデフォルトモデルへ強制上書きする(保存済みワークフローのモデルが
// 環境と合わず生成エラー/不鮮明な画像になるのを防ぐ回避策)。
// analyzeWorkflow() より前に apiWorkflow 自体を書き換える必要がある — analysis後に
// 書き換えると Model タブの表示(analysis.checkpoint_nodes 由来)が古い値のまま残るため。
async function _applyDefaultCheckpointIfEnabled(apiWorkflow) {
try {
const res = await fetch("/api/wfm/settings");
if (!res.ok) return;
const settings = await res.json();
if (!settings.default_checkpoint_enabled || !settings.default_checkpoint_name) return;
let applied = false;
for (const node of Object.values(apiWorkflow)) {
const ct = node?.class_type || "";
if (node?.inputs && (ct.includes("CheckpointLoader") || ct === "Checkpoint Loader" || ct === "ImageMetadataPromptLoader")) {
node.inputs.ckpt_name = settings.default_checkpoint_name;
applied = true;
}
}
if (applied) showToast(t("defaultCheckpointApplied", settings.default_checkpoint_name), "info");
} catch { /* non-critical, ignore */ }
}
export async function loadWorkflowIntoEditor(workflow, filename) {
let apiWorkflow = workflow;
const format = comfyWorkflow.detectFormat(workflow, filename);
let ckptWarning = null;
if (format === "app") {
showToast(t("appFormatNotSupported"), "error");
return false;
} else if (format === "ui") {
apiWorkflow = await comfyWorkflow.convertUiToApi(workflow);
const ckptSubs = comfyWorkflow.getLastCheckpointSubstitutions();
if (ckptSubs.length > 0) {
const names = [...new Set(ckptSubs.map((s) => s.original))].join(", ");
ckptWarning = t("checkpointSubstitutedWarning", names);
}
} else if (format === "unknown") {
showToast(t("unknownWorkflowFormat"), "error");
return false;
}
comfyUI.currentWorkflow = apiWorkflow;
await _applyDefaultCheckpointIfEnabled(apiWorkflow);
comfyUI.currentAnalysis = comfyWorkflow.analyzeWorkflow(apiWorkflow);
// Render editor tabs
@@ -247,6 +242,30 @@ export async function loadWorkflowIntoEditor(workflow, filename) {
syncJsonHighlight(rawHighlight, jsonStr);
}
// Update Bypass/Mute node indicator (shared Raw JSON widget header, visible on
// Input/Model/Settings tabs). API-format JSON has no mode field, so this info is
// only available right after a UI→API conversion — captured via comfyWorkflow's
// getLastBypassedNodes()/getLastMutedNodes() before it's discarded.
const bypassNote = document.getElementById("wfm-gen-rawjson-bypass-note");
if (bypassNote) {
const bypassed = format === "ui" ? comfyWorkflow.getLastBypassedNodes() : [];
const muted = format === "ui" ? comfyWorkflow.getLastMutedNodes() : [];
const lines = [];
if (bypassed.length > 0) {
lines.push(t("rawJsonBypassNote", bypassed.map((n) => `${n.title} (${n.nodeId})`).join(", ")));
}
if (muted.length > 0) {
lines.push(t("rawJsonMutedNote", muted.map((n) => `${n.title} (${n.nodeId})`).join(", ")));
}
if (lines.length > 0) {
bypassNote.innerHTML = lines.map((l) => escapeHtml(l)).join("<br>");
bypassNote.style.display = "";
} else {
bypassNote.textContent = "";
bypassNote.style.display = "none";
}
}
// Update workflow name display
const nameEl = document.getElementById("wfm-gen-wf-name");
if (nameEl) {
@@ -260,7 +279,11 @@ export async function loadWorkflowIntoEditor(workflow, filename) {
refreshFeederNodeList();
showToast(t("workflowLoadedName", filename || ""), "success");
if (ckptWarning) {
showToast(ckptWarning, "error");
} else {
showToast(t("workflowLoadedName", filename || ""), "success");
}
return true;
}
@@ -1397,7 +1420,7 @@ async function _expandWildcardsInWorkflow(workflow) {
// Generation (core — throws on error)
// ============================================
async function _coreGenerate(silent = false) {
async function _coreGenerate(silent = false, workflowOverride = null) {
const progressBar = document.getElementById("wfm-gen-progress-bar");
const progressText = document.getElementById("wfm-gen-progress-text");
const resultImg = document.getElementById("wfm-gen-result-img");
@@ -1409,9 +1432,10 @@ async function _coreGenerate(silent = false) {
if (progressBar) progressBar.style.width = "0%";
if (progressText) progressText.textContent = "Starting...";
const workflowExpanded = await _expandWildcardsInWorkflow({ ...comfyUI.currentWorkflow });
const baseWorkflow = workflowOverride || comfyUI.currentWorkflow;
const workflowExpanded = await _expandWildcardsInWorkflow({ ...baseWorkflow });
const workflowForGenerate = _applyStyleToWorkflow(workflowExpanded);
const { images, seed } = await comfyUI.generate(
const { images, seed, svgOutputs } = await comfyUI.generate(
workflowForGenerate,
{
seedMode,
@@ -1429,18 +1453,49 @@ async function _coreGenerate(silent = false) {
if (progressText) progressText.textContent = `Done (${images.length} image${images.length !== 1 ? "s" : ""})`;
if (progressBar) progressBar.style.width = "100%";
if (images.length > 0) {
const blob = await comfyUI.getImageBlob(images[0]);
// type=temp はプレビュー用の一時画像 (PreviewImage, SVG String Preview など) のため
// 生成結果表示からは除外し、実際に保存された成果物のみを表示する
const outputImages = images.filter((img) => img.type !== "temp");
if (svgOutputs?.length > 0) {
// comfyui-tosvg の Save SVG String は images ではなく saved_svg/path で返すため、
// images配列には(あれば)プレビュー用の一時PNGしか入らず実際の保存物と食い違う。
// 実際に保存されたSVGファイルをそのままプレビューに表示する。
// /view はSVGをセキュリティ上application/octet-streamで返すため使えず、
// 代わりにGalleryタブの配信エンドポイント(絶対パス指定・正しいContent-Type)を使う。
const svgUrl = (svg) => `/wfm/gallery/image/serve?path=${encodeURIComponent(svg.path)}`;
if (resultImg && svgOutputs[0].path) {
resultImg.src = svgUrl(svgOutputs[0]);
resultImg.style.display = "block";
}
if (resultThumbs && svgOutputs.length > 1) {
resultThumbs.innerHTML = "";
svgOutputs.forEach((svg, i) => {
if (!svg.path) return;
const thumb = document.createElement("img");
thumb.src = svgUrl(svg);
thumb.className = `wfm-gen-thumb ${i === 0 ? "active" : ""}`;
thumb.addEventListener("click", () => {
resultImg.src = thumb.src;
resultThumbs.querySelectorAll(".wfm-gen-thumb").forEach((t) => t.classList.remove("active"));
thumb.classList.add("active");
});
resultThumbs.appendChild(thumb);
});
}
} else if (outputImages.length > 0) {
const blob = await comfyUI.getImageBlob(outputImages[0]);
const url = URL.createObjectURL(blob);
if (resultImg) {
resultImg.src = url;
resultImg.style.display = "block";
}
if (resultThumbs && images.length > 1) {
if (resultThumbs && outputImages.length > 1) {
resultThumbs.innerHTML = "";
for (let i = 0; i < images.length; i++) {
const b = i === 0 ? blob : await comfyUI.getImageBlob(images[i]);
for (let i = 0; i < outputImages.length; i++) {
const b = i === 0 ? blob : await comfyUI.getImageBlob(outputImages[i]);
const u = i === 0 ? url : URL.createObjectURL(b);
const thumb = document.createElement("img");
thumb.src = u;
@@ -1455,18 +1510,28 @@ async function _coreGenerate(silent = false) {
}
}
if (getEagleSettings().autoSave && images.length > 0) {
for (const img of images) {
if (getEagleSettings().autoSave && outputImages.length > 0) {
for (const img of outputImages) {
const viewUrl = `/view?filename=${encodeURIComponent(img.filename)}&subfolder=${encodeURIComponent(img.subfolder || "")}&type=${encodeURIComponent(img.type || "output")}`;
saveToEagle(viewUrl, img.filename);
saveToEagle(viewUrl, img.filename, [], img);
}
}
if (getEagleSettings().autoSave && svgOutputs?.length > 0) {
// comfyui-tosvg の "Save SVG String" は絶対パスを直接返すため、/view を介さず
// サーバー側でそのパスを検証した上で addFromPath させる
for (const svg of svgOutputs) {
saveToEagle("", svg.filename, [], { filename: svg.filename, localPath: svg.path });
}
}
if (images.length > 0) {
saveGeneratedImagesMeta(images, { ...comfyUI.currentWorkflow }).catch(() => {});
saveGeneratedImagesMeta(images, { ...baseWorkflow }).catch(() => {});
}
if (!silent) showToast(t("generationComplete"), "success");
return { images, seed };
}
// ============================================
@@ -1559,20 +1624,89 @@ async function _runBatchGenerate() {
if (loraNodes.length === 0) { showToast(t("modelsGenUINoNode", "LoRA"), "error"); return; }
const list = [..._getSelectedLoraGroupItems()];
if (list.length === 0) { showToast(t("batchNoneSelected", "LoRAs"), "error"); return; }
await _runBatchLoop(list, (loraName) => {
for (const node of loraNodes) {
if (!comfyUI.currentWorkflow?.[node.id]) continue;
if (node.is_lora_manager) {
// 通常のLoraLoaderはComfyUI側のenumリストに存在しないファイル名だとバリデーションエラーになる。
// ComfyUI(Windows)はサブフォルダ区切りに"\"を使うが内部リストは"/"のため、事前に正しい表記へ変換しておく。
let loraNameMap = null;
if (loraNodes.some((node) => !node.is_lora_manager)) {
try {
const known = await comfyUI.fetchLoras();
loraNameMap = new Map(known.map((n) => [n.replace(/\\/g, "/"), n]));
const missing = list.filter((name) => !loraNameMap.has(name.replace(/\\/g, "/")));
if (missing.length > 0) {
showToast(t("batchLoraMissing", missing.length, list.length, missing[0]), "error");
}
} catch {}
}
// Positiveプロンプトへlora構文+トリガーワードを反映するための準備(Single/Stack適用と同じ仕組み)
const positiveNodes = (comfyUI.currentAnalysis?.prompt_nodes || []).filter((n) => n.role === "positive");
let metadata = {}, civitaiCache = {};
try {
const [metaRes, civRes] = await Promise.all([
fetch("/api/wfm/models/metadata"),
fetch("/api/wfm/models/civitai/cache"),
]);
metadata = metaRes.ok ? await metaRes.json() : {};
civitaiCache = civRes.ok ? await civRes.json() : {};
} catch {}
// バッチ開始前のプロンプトを保存し、完了・停止後に復元する
const posTextarea = document.getElementById("wfm-prompt-pos-text");
const savedTextareaValue = posTextarea ? posTextarea.value : null;
const savedNodeTexts = new Map();
for (const node of positiveNodes) {
const wfNode = comfyUI.currentWorkflow?.[node.id];
if (wfNode) savedNodeTexts.set(node.id, wfNode.inputs[node.textKey || "text"]);
}
try {
await _runBatchLoop(list, (loraName) => {
for (const node of loraNodes) {
if (!comfyUI.currentWorkflow?.[node.id]) continue;
if (node.is_lora_manager) {
const stem = loraName.replace(/\\/g, "/").split("/").pop().replace(/\.[^.]+$/, "");
comfyUI.currentWorkflow[node.id].inputs.loras = {
__value__: [{ name: stem, strength: 1.0, active: true, expanded: false, clipStrength: 1.0, locked: false }],
};
comfyUI.currentWorkflow[node.id].inputs.text = `<lora:${stem}:1:1>`;
} else {
const actualName = loraNameMap?.get(loraName.replace(/\\/g, "/")) || loraName;
comfyUI.currentWorkflow[node.id].inputs.lora_name = actualName;
}
}
if (positiveNodes.length > 0) {
const stem = loraName.replace(/\\/g, "/").split("/").pop().replace(/\.[^.]+$/, "");
comfyUI.currentWorkflow[node.id].inputs.loras = {
__value__: [{ name: stem, strength: 1.0, active: true, expanded: false, clipStrength: 1.0, locked: false }],
};
comfyUI.currentWorkflow[node.id].inputs.text = `<lora:${stem}:1:1>`;
} else {
comfyUI.currentWorkflow[node.id].inputs.lora_name = loraName;
const firstStandardNode = loraNodes.find((n) => !n.is_lora_manager);
const strModel = firstStandardNode ? (comfyUI.currentWorkflow[firstStandardNode.id]?.inputs.strength_model ?? 1.0) : 1.0;
const strClip = firstStandardNode ? (comfyUI.currentWorkflow[firstStandardNode.id]?.inputs.strength_clip ?? 1.0) : 1.0;
const loraSyntax = `<lora:${stem}:${strModel}:${strClip}>`;
const sha = (metadata[loraName] || {}).sha256;
const civInfo = sha && civitaiCache[sha];
const triggerWords = civInfo?.trainedWords || [];
const append = triggerWords.length > 0 ? `${loraSyntax}, ${triggerWords.join(", ")}` : loraSyntax;
for (const node of positiveNodes) {
const wfNode = comfyUI.currentWorkflow?.[node.id];
if (!wfNode) continue;
const base = (savedNodeTexts.get(node.id) || "").replace(/,\s*$/, "").trim();
wfNode.inputs[node.textKey || "text"] = base ? `${base}, ${append}` : append;
}
if (posTextarea && savedTextareaValue !== null) {
const base = savedTextareaValue.replace(/,\s*$/, "").trim();
posTextarea.value = base ? `${base}, ${append}` : append;
}
}
}, (name) => name.replace(/\.[^.]+$/, ""));
} finally {
// プロンプトをバッチ開始前の状態へ復元
for (const node of positiveNodes) {
const wfNode = comfyUI.currentWorkflow?.[node.id];
if (wfNode && savedNodeTexts.has(node.id)) {
wfNode.inputs[node.textKey || "text"] = savedNodeTexts.get(node.id);
}
}
}, (name) => name.replace(/\.[^.]+$/, ""));
if (posTextarea && savedTextareaValue !== null) posTextarea.value = savedTextareaValue;
}
break;
}
case "prompt": {
@@ -1660,14 +1794,20 @@ async function _runBatchGenerate() {
// Generate entry point
// ============================================
async function handleGenerate() {
if (!comfyUI.currentWorkflow) {
// workflowOverride: 明示的に渡された場合、comfyUI.currentWorkflow の代わりにこのワークフローで
// 生成する(GenerateUIの表示状態には触れない。Image Edit「Inpaint」の専用ワークフロー実行から利用)。
// ボタンのclickハンドラから呼ばれる場合は第一引数がMouseEventになるため、その場合は無視する。
async function handleGenerate(workflowOverride = null) {
if (workflowOverride instanceof Event) workflowOverride = null;
if (!workflowOverride && !comfyUI.currentWorkflow) {
showToast(t("noWorkflowLoaded"), "error");
return;
}
if (comfyUI.generating) return;
comfyEditor.syncToWorkflow();
// オーバーライド実行時は GenerateUI 側の表示中プロンプトを別ワークフローへ誤って書き込まないよう同期をスキップする
if (!workflowOverride) comfyEditor.syncToWorkflow();
const genBtn = document.getElementById("wfm-gen-generate-btn");
const interruptBtn = document.getElementById("wfm-gen-interrupt-btn");
@@ -1678,18 +1818,20 @@ async function handleGenerate() {
_ckptBatch.paused = false;
_ckptBatch._resumeResolve = null;
const batchEnabled = _activeBatchType !== null;
// オーバーライド実行時はバッチモードの影響を受けない単発生成に固定する
const batchEnabled = !workflowOverride && _activeBatchType !== null;
try {
if (batchEnabled) {
await _runBatchGenerate();
} else {
try {
await _coreGenerate(false);
return await _coreGenerate(false, workflowOverride);
} catch (err) {
const progressText = document.getElementById("wfm-gen-progress-text");
if (progressText) progressText.textContent = "Error";
showToast(t("generationError", err.message), "error");
throw err;
}
}
} finally {
@@ -1750,7 +1892,15 @@ export async function initGenerateTab() {
});
// Generate button
document.getElementById("wfm-gen-generate-btn")?.addEventListener("click", handleGenerate);
document.getElementById("wfm-gen-generate-btn")?.addEventListener("click", () => {
handleGenerate().catch(() => {});
});
// Cross-tab entry point (Image Edit「Inpaint」タブの Run ボタンなど外部から生成を呼び出す用)
window._wfmGenerateTab = { generate: handleGenerate };
// Alt+Apply from Input/Model/Settings tabs → Apply & Generate
document.addEventListener("wfm:apply-and-generate", () => handleGenerate());
// Interrupt button (stops both single generation and batch loop)
document.getElementById("wfm-gen-interrupt-btn")?.addEventListener("click", async () => {
@@ -1769,7 +1919,7 @@ export async function initGenerateTab() {
function moveRawJsonToTab(tabKey) {
const widget = document.getElementById("wfm-gen-rawjson-widget");
if (!widget) return;
if (tabKey === "feeder" || tabKey === "batch") {
if (tabKey === "feeder" || tabKey === "batch" || tabKey === "lab") {
widget.style.display = "none";
return;
}
@@ -1793,6 +1943,9 @@ export async function initGenerateTab() {
if (target === "model" && comfyUI.currentAnalysis) {
comfyEditor.renderLoraPane(comfyUI.currentAnalysis, "wfm-gen-lora-fields");
}
// Lab has its own Run/Results panel — hide the shared Generate/Seed/Batch column
const rightCol = document.querySelector(".wfm-gen-right");
if (rightCol) rightCol.style.display = (target === "lab") ? "none" : "";
});
});
@@ -1969,6 +2122,9 @@ export async function initGenerateTab() {
// Feeder tab
await initFeederTab();
// Lab tab (experimental I2I batch generation)
initLabTab();
// Style dropdown
await _loadStyles();
+600 -63
View File
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+218 -6
View File
@@ -2,6 +2,7 @@
* Image Edit Tab - Draw Tool
* Inspired by comfyui-mask-editor-one PaintTool.js
* Supports color drawing and erasing with a soft round brush.
* Also supports image brushes loaded from Mask Editor One's ABR brush library.
*/
export class DrawTool {
@@ -13,47 +14,93 @@ export class DrawTool {
this.opacity = 1.0;
this.color = "#ff0000";
this.mode = "draw"; // "draw" | "erase"
this.spacing = 0.25; // stamp interval as fraction of brushSize (image brush only)
this.angle = 0; // degrees [0, 359]
this.sizeJitter = false;
this.sizeJitterAmount = 0.5;
this.rotationJitter = false;
// Image brush from ABR library (null = default circle brush)
this.brushImage = null;
this.brushName = "Circle";
this._drawing = false;
this._lastX = 0;
this._lastY = 0;
// Cached stamp canvas
// Cached circle stamp
this._stamp = null;
this._stampSize = 0;
this._stampHard = 0;
this._stampColor = null;
// Cached image stamp
this._imgStamp = null;
this._imgStampSize = 0;
this._imgStampImg = null;
this._imgStampColor = null;
// Stroke buffer: prevents intra-stroke opacity accumulation (image brush only)
this._baseCanvas = null;
this._strokeCanvas = null;
this._strokeCtx = null;
this._onChange = null;
}
setCanvas(canvas) {
this.canvas = canvas;
this.ctx = canvas.getContext("2d");
this._stamp = null;
this._stamp = null;
this._imgStamp = null;
}
onChange(fn) { this._onChange = fn; }
setImageBrush(img, name) {
this.brushImage = img;
this.brushName = name;
this._imgStamp = null;
}
clearImageBrush() {
this.brushImage = null;
this.brushName = "Circle";
this._stamp = null;
this._imgStamp = null;
}
activate() {
if (this.canvas) this.canvas.style.cursor = "none";
}
deactivate() {
this._drawing = false;
this._clearStrokeBuffer();
if (this.canvas) this.canvas.style.cursor = "";
}
onMouseDown(x, y) {
this._drawing = true;
this._lastX = x;
this._lastY = y;
this._paint(x, y);
this._lastX = x;
this._lastY = y;
if (this.brushImage) {
this._initStrokeBuffer();
this._paintToStroke(x, y);
this._mergeStroke();
} else {
this._paint(x, y);
}
}
onMouseMove(x, y) {
if (!this._drawing) return;
this._paintLine(this._lastX, this._lastY, x, y);
if (this.brushImage) {
this._paintLineToStroke(this._lastX, this._lastY, x, y);
this._mergeStroke();
} else {
this._paintLine(this._lastX, this._lastY, x, y);
}
this._lastX = x;
this._lastY = y;
}
@@ -61,6 +108,7 @@ export class DrawTool {
onMouseUp() {
if (this._drawing) {
this._drawing = false;
this._clearStrokeBuffer();
if (this._onChange) this._onChange();
}
}
@@ -69,6 +117,83 @@ export class DrawTool {
if (this._drawing) this.onMouseUp();
}
// ── Stroke buffer (image brush only) ─────────────────────────────
_initStrokeBuffer() {
const w = this.canvas.width;
const h = this.canvas.height;
this._baseCanvas = document.createElement("canvas");
this._baseCanvas.width = w;
this._baseCanvas.height = h;
this._baseCanvas.getContext("2d").drawImage(this.canvas, 0, 0);
this._strokeCanvas = document.createElement("canvas");
this._strokeCanvas.width = w;
this._strokeCanvas.height = h;
this._strokeCtx = this._strokeCanvas.getContext("2d");
}
_clearStrokeBuffer() {
this._baseCanvas = null;
this._strokeCanvas = null;
this._strokeCtx = null;
}
_mergeStroke() {
const ctx = this.ctx;
const w = this.canvas.width;
const h = this.canvas.height;
ctx.clearRect(0, 0, w, h);
ctx.drawImage(this._baseCanvas, 0, 0);
ctx.save();
if (this.mode === "erase") {
ctx.globalCompositeOperation = "destination-out";
} else {
ctx.globalCompositeOperation = "source-over";
}
ctx.globalAlpha = this.opacity;
ctx.drawImage(this._strokeCanvas, 0, 0);
ctx.restore();
}
_paintToStroke(x, y) {
const saved = this.ctx;
this.ctx = this._strokeCtx;
if (this.sizeJitter || this.rotationJitter) {
const savedSize = this.brushSize;
const savedAngle = this.angle;
const savedStamp = this._imgStamp;
const savedStampSize = this._imgStampSize;
if (this.sizeJitter) {
this.brushSize = Math.max(1, savedSize * (1 - Math.random() * this.sizeJitterAmount));
}
if (this.rotationJitter) {
this.angle = Math.random() * 360;
}
this._paintImageBrush(x, y);
this.brushSize = savedSize;
this.angle = savedAngle;
this._imgStamp = savedStamp;
this._imgStampSize = savedStampSize;
} else {
this._paintImageBrush(x, y);
}
this.ctx = saved;
}
_paintLineToStroke(x0, y0, x1, y1) {
const dist = Math.hypot(x1 - x0, y1 - y0);
const step = Math.max(1, this.brushSize * this.spacing);
const steps = Math.ceil(dist / step);
for (let i = 1; i <= steps; i++) {
const t = i / steps;
this._paintToStroke(x0 + (x1 - x0) * t, y0 + (y1 - y0) * t);
}
}
// ── Circle brush ─────────────────────────────────────────────────
_getStamp() {
if (
this._stamp &&
@@ -122,6 +247,93 @@ export class DrawTool {
}
}
// ── Image brush ──────────────────────────────────────────────────
_getImageStamp(size) {
size = Math.max(1, size);
if (
this._imgStamp &&
this._imgStampSize === size &&
this._imgStampImg === this.brushImage &&
this._imgStampColor === this.color
) return this._imgStamp;
const img = this.brushImage;
const srcW = img.naturalWidth || img.width;
const srcH = img.naturalHeight || img.height;
const aspect = (srcW > 0 && srcH > 0) ? srcW / srcH : 1;
const stampH = size;
const stampW = Math.max(1, Math.round(size * aspect));
const sc = document.createElement("canvas");
sc.width = stampW;
sc.height = stampH;
const stx = sc.getContext("2d");
stx.drawImage(img, 0, 0, stampW, stampH);
const imgData = stx.getImageData(0, 0, stampW, stampH);
const d = imgData.data;
// Detect alpha channel (ABR-exported PNGs carry alpha = brush density)
let hasAlpha = false;
for (let i = 3; i < d.length; i += 4) {
if (d[i] < 250) { hasAlpha = true; break; }
}
let invertLum = false;
if (!hasAlpha) {
const corners = [0, stampW - 1, stampW * (stampH - 1), stampW * stampH - 1];
let bgLum = 0;
for (const ci of corners) {
const ii = ci * 4;
bgLum += (d[ii] * 0.299 + d[ii + 1] * 0.587 + d[ii + 2] * 0.114) / 255;
}
invertLum = (bgLum / corners.length) > 0.5;
}
// Parse target color
const hex = this.color.replace("#", "");
const cr = parseInt(hex.slice(0, 2), 16);
const cg = parseInt(hex.slice(2, 4), 16);
const cb = parseInt(hex.slice(4, 6), 16);
// Convert to target color pixels; alpha = brush density
for (let i = 0; i < d.length; i += 4) {
let alpha;
if (hasAlpha) {
alpha = d[i + 3] / 255;
} else {
const lum = (d[i] * 0.299 + d[i + 1] * 0.587 + d[i + 2] * 0.114) / 255;
alpha = invertLum ? 1 - lum : lum;
}
d[i] = cr; d[i + 1] = cg; d[i + 2] = cb;
d[i + 3] = Math.round(alpha * 255);
}
stx.putImageData(imgData, 0, 0);
this._imgStamp = sc;
this._imgStampSize = size;
this._imgStampImg = this.brushImage;
this._imgStampColor = this.color;
return sc;
}
_paintImageBrush(x, y) {
const stamp = this._getImageStamp(Math.round(this.brushSize));
this.ctx.globalCompositeOperation = "source-over";
if (this.angle) {
this.ctx.save();
this.ctx.translate(Math.round(x), Math.round(y));
this.ctx.rotate((this.angle * Math.PI) / 180);
this.ctx.drawImage(stamp, -stamp.width / 2, -stamp.height / 2);
this.ctx.restore();
} else {
this.ctx.drawImage(stamp, Math.round(x - stamp.width / 2), Math.round(y - stamp.height / 2));
}
this.ctx.globalCompositeOperation = "source-over";
}
static getCanvasPos(canvas, event) {
const rect = canvas.getBoundingClientRect();
const scaleX = canvas.width / rect.width;
+28 -7
View File
@@ -28,6 +28,7 @@ export class Layer {
this.textProps = null; // テキストレイヤー用プロパティ(再編集・再描画に使用)
this.locked = false; // ロック中は SelectTool の変形を禁止
this.maskApply = false; // マスクレイヤー: true=クリッピングマスクとして機能
this.operation = "add"; // マスクレイヤー合成モード: "add" | "subtract"
}
clear() {
@@ -39,13 +40,23 @@ export class Layer {
thumb.width = size;
thumb.height = size;
const ctx = thumb.getContext("2d");
ctx.fillStyle = "#aaa";
ctx.fillRect(0, 0, size, size);
ctx.fillStyle = "#fff";
for (let x = 0; x < size; x += 8)
for (let y = 0; y < size; y += 8)
if ((x / 8 + y / 8) % 2 === 0) ctx.fillRect(x, y, 8, 8);
ctx.drawImage(this.canvas, 0, 0, size, size);
if (this.type === "mask") {
// マスクレイヤー: 黒背景に白マスクのグレースケール表示
ctx.fillStyle = "#000";
ctx.fillRect(0, 0, size, size);
ctx.drawImage(this.canvas, 0, 0, size, size);
} else {
// 通常レイヤー: チェッカーボード背景(透過表示用)
ctx.fillStyle = "#aaa";
ctx.fillRect(0, 0, size, size);
ctx.fillStyle = "#fff";
for (let x = 0; x < size; x += 8)
for (let y = 0; y < size; y += 8)
if ((x / 8 + y / 8) % 2 === 0) ctx.fillRect(x, y, 8, 8);
ctx.drawImage(this.canvas, 0, 0, size, size);
}
return thumb.toDataURL("image/png");
}
@@ -59,6 +70,7 @@ export class Layer {
textProps: this.textProps ?? null,
locked: this.locked ?? false,
maskApply: this.maskApply ?? false,
operation: this.operation ?? "add",
};
}
@@ -80,6 +92,7 @@ export class Layer {
layer.textProps = json.textProps ?? null;
layer.locked = json.locked ?? false;
layer.maskApply = json.maskApply ?? false;
layer.operation = json.operation ?? "add";
if (json.imageData) {
return new Promise(resolve => {
@@ -182,6 +195,14 @@ export class LayerManager {
if (layer && layer.type === "mask") { layer.maskApply = !layer.maskApply; this._emit("change"); }
}
toggleOperation(id) {
const layer = this.layers.find(l => l.id === id);
if (layer && layer.type === "mask") {
layer.operation = layer.operation === "add" ? "subtract" : "add";
this._emit("change");
}
}
setOpacity(id, opacity) {
const layer = this.layers.find(l => l.id === id);
if (layer) { layer.opacity = Math.max(0, Math.min(1, opacity)); this._emit("change"); }
+529
View File
@@ -0,0 +1,529 @@
/**
* Image Edit Tab - Mask Editor One 互換追加ツール
* Color, Alpha, Text, Vector, Shape の各マスクツール。
* マスクレイヤー canvas に直接白(add)または destination-out(erase)で描画する。
*/
// ── Color Tool ───────────────────────────────────────────────────────────────
// bgCanvas(背景合成画像)のクリック色に近いピクセルをマスク選択する。
export class MaskColorTool {
constructor() {
this.tolerance = 40; // 0-255
this.feather = 5; // 0-100 (tolerance に対する%)
this.mode = "add"; // "add" | "subtract"
this._canvas = null;
this._ctx = null;
this._bgCanvas = null;
this._onChange = null;
}
setCanvas(canvas) { this._canvas = canvas; this._ctx = canvas.getContext("2d"); }
setBgCanvas(canvas) { this._bgCanvas = canvas; }
onChange(fn) { this._onChange = fn; }
activate() { if (this._canvas) this._canvas.style.cursor = "crosshair"; }
deactivate() { if (this._canvas) this._canvas.style.cursor = ""; }
onMouseDown(x, y) { this._selectByColor(Math.round(x), Math.round(y)); }
onMouseMove() {}
onMouseUp() {}
onMouseLeave() {}
_selectByColor(px, py) {
if (!this._bgCanvas || !this._ctx || !this._canvas) return;
const bgCtx = this._bgCanvas.getContext("2d");
const bw = this._bgCanvas.width;
const bh = this._bgCanvas.height;
if (bw === 0 || bh === 0) return;
const srcData = bgCtx.getImageData(0, 0, bw, bh);
const dw = this._canvas.width;
const dh = this._canvas.height;
const sx = bw / dw;
const sy = bh / dh;
const bpx = Math.min(bw - 1, Math.round(px * sx));
const bpy = Math.min(bh - 1, Math.round(py * sy));
const idx = (bpy * bw + bpx) * 4;
if (idx < 0 || idx + 3 >= srcData.data.length) return;
const tr = srcData.data[idx];
const tg = srcData.data[idx + 1];
const tb = srcData.data[idx + 2];
const outData = new Uint8ClampedArray(dw * dh * 4);
const tol = this.tolerance;
for (let dy = 0; dy < dh; dy++) {
for (let dx = 0; dx < dw; dx++) {
const bx = Math.min(bw - 1, Math.round(dx * sx));
const by = Math.min(bh - 1, Math.round(dy * sy));
const si = (by * bw + bx) * 4;
const r = srcData.data[si];
const g = srcData.data[si + 1];
const b = srcData.data[si + 2];
const dist = Math.sqrt((r - tr) ** 2 + (g - tg) ** 2 + (b - tb) ** 2);
let alpha;
if (tol <= 0) {
alpha = dist === 0 ? 255 : 0;
} else {
const fStart = tol * (1 - this.feather / 100);
if (dist <= fStart) alpha = 255;
else if (dist <= tol) alpha = Math.round(255 * (1 - (dist - fStart) / (tol - fStart)));
else alpha = 0;
}
const j = (dy * dw + dx) * 4;
outData[j] = outData[j + 1] = outData[j + 2] = 255;
outData[j + 3] = alpha;
}
}
const tmp = document.createElement("canvas");
tmp.width = dw; tmp.height = dh;
tmp.getContext("2d").putImageData(new ImageData(outData, dw, dh), 0, 0);
const ctx = this._ctx;
ctx.globalCompositeOperation = this.mode === "subtract" ? "destination-out" : "lighten";
ctx.drawImage(tmp, 0, 0);
ctx.globalCompositeOperation = "source-over";
if (this._onChange) this._onChange();
}
}
// ── Alpha Tool ───────────────────────────────────────────────────────────────
// 元画像のアルファチャンネルをマスクとして抽出する。
export class MaskAlphaTool {
constructor() {
this.threshold = 128; // 0-255
this.invert = false;
this._canvas = null;
this._ctx = null;
this._srcImg = null; // HTMLImageElement or HTMLCanvasElement
this._onChange = null;
}
setCanvas(canvas) { this._canvas = canvas; this._ctx = canvas.getContext("2d"); }
setSourceImage(img) { this._srcImg = img; }
onChange(fn) { this._onChange = fn; }
activate() { if (this._canvas) this._canvas.style.cursor = "default"; }
deactivate() { if (this._canvas) this._canvas.style.cursor = ""; }
onMouseDown() {}
onMouseMove() {}
onMouseUp() {}
onMouseLeave() {}
extract() {
if (!this._srcImg || !this._ctx || !this._canvas) return;
const w = this._canvas.width;
const h = this._canvas.height;
const tmp = document.createElement("canvas");
tmp.width = w; tmp.height = h;
tmp.getContext("2d").drawImage(this._srcImg, 0, 0, w, h);
const src = tmp.getContext("2d").getImageData(0, 0, w, h);
const out = new Uint8ClampedArray(w * h * 4);
for (let i = 0; i < src.data.length; i += 4) {
let a = src.data[i + 3];
if (this.threshold > 0) a = a >= this.threshold ? 255 : 0;
if (this.invert) a = 255 - a;
out[i] = out[i + 1] = out[i + 2] = 255;
out[i + 3] = a;
}
this._ctx.clearRect(0, 0, w, h);
this._ctx.putImageData(new ImageData(out, w, h), 0, 0);
if (this._onChange) this._onChange();
}
}
// ── Text Tool ────────────────────────────────────────────────────────────────
// クリック位置にテキストを白(add)または消去(erase)でスタンプする。
export const MASK_TEXT_FONTS = [
"Arial", "Arial Black", "Georgia", "Times New Roman",
"Courier New", "Verdana", "Trebuchet MS", "Impact",
"Comic Sans MS", "Helvetica", "Tahoma",
];
export class MaskTextTool {
constructor() {
this.text = "Hello";
this.fontFamily = "Arial";
this.fontSize = 64;
this.bold = false;
this.italic = false;
this.align = "left";
this.mode = "add";
this._canvas = null;
this._ctx = null;
this._overlay = null;
this._onChange = null;
}
setCanvas(canvas) { this._canvas = canvas; this._ctx = canvas.getContext("2d"); }
onChange(fn) { this._onChange = fn; }
activate() { if (this._canvas) this._canvas.style.cursor = "crosshair"; }
deactivate() { this._closeOverlay(); if (this._canvas) this._canvas.style.cursor = ""; }
onMouseDown(x, y) {
if (this._overlay) { this._closeOverlay(); return; }
this._showOverlay(x, y);
}
onMouseMove() {}
onMouseUp() {}
onMouseLeave() {}
_getFont() {
const parts = [];
if (this.italic) parts.push("italic");
if (this.bold) parts.push("bold");
parts.push(`${this.fontSize}px`);
parts.push(`"${this.fontFamily}", sans-serif`);
return parts.join(" ");
}
_showOverlay(canvasX, canvasY) {
const cv = this._canvas;
const rect = cv.getBoundingClientRect();
const cssX = Math.round(canvasX * (rect.width / cv.width)) + rect.left;
const cssY = Math.round(canvasY * (rect.height / cv.height)) + rect.top;
const overlay = document.createElement("div");
overlay.style.cssText = [
`position:fixed;left:${cssX}px;top:${cssY}px;`,
"background:var(--wfm-surface,#2a2a2a);",
"border:1px solid var(--wfm-border,#444);",
"border-radius:4px;padding:6px;z-index:99999;",
"box-shadow:0 4px 16px rgba(0,0,0,0.5);min-width:200px;",
].join("");
const ta = document.createElement("textarea");
ta.value = this.text;
ta.rows = 3;
ta.placeholder = "Enter text…";
ta.style.cssText = [
"width:100%;resize:vertical;box-sizing:border-box;",
"background:var(--wfm-bg,#1a1a1a);color:var(--wfm-text,#ddd);",
"border:1px solid var(--wfm-border,#444);border-radius:3px;",
"padding:4px;font-size:12px;",
].join("");
overlay.appendChild(ta);
const btnRow = document.createElement("div");
btnRow.style.cssText = "display:flex;gap:4px;margin-top:4px;";
const okBtn = document.createElement("button");
okBtn.textContent = "Stamp";
okBtn.className = "wfm-btn wfm-btn-sm wfm-btn-primary";
okBtn.style.flex = "1";
okBtn.onclick = () => {
if (ta.value.trim()) { this.text = ta.value; this._stamp(canvasX, canvasY); }
this._closeOverlay();
};
const cancelBtn = document.createElement("button");
cancelBtn.textContent = "Cancel";
cancelBtn.className = "wfm-btn wfm-btn-sm";
cancelBtn.style.flex = "1";
cancelBtn.onclick = () => this._closeOverlay();
btnRow.appendChild(okBtn);
btnRow.appendChild(cancelBtn);
overlay.appendChild(btnRow);
const hint = document.createElement("div");
hint.textContent = "Ctrl+Enter: Stamp / Esc: Cancel";
hint.style.cssText = "font-size:10px;color:var(--wfm-text-secondary,#888);margin-top:3px;";
overlay.appendChild(hint);
ta.addEventListener("keydown", e => {
if (e.key === "Enter" && (e.ctrlKey || e.metaKey)) { e.preventDefault(); okBtn.click(); }
else if (e.key === "Escape") cancelBtn.click();
e.stopPropagation();
});
overlay.addEventListener("mousedown", e => e.stopPropagation());
document.body.appendChild(overlay);
this._overlay = overlay;
ta.focus(); ta.select();
}
_closeOverlay() {
if (this._overlay) { this._overlay.remove(); this._overlay = null; }
}
_stamp(x, y) {
const ctx = this._ctx;
ctx.save();
ctx.font = this._getFont();
ctx.textAlign = this.align;
ctx.textBaseline = "top";
if (this.mode === "erase") {
ctx.globalCompositeOperation = "destination-out";
ctx.fillStyle = "rgba(0,0,0,1)";
} else {
ctx.globalCompositeOperation = "source-over";
ctx.fillStyle = "white";
}
const lines = this.text.split("\n");
const lineHeight = this.fontSize * 1.2;
for (let i = 0; i < lines.length; i++) ctx.fillText(lines[i], x, y + i * lineHeight);
ctx.restore();
if (this._onChange) this._onChange();
}
}
// ── Vector Tool ──────────────────────────────────────────────────────────────
// クリックでポイント追加、Catmull-Rom スプラインで閉じたパスを塗りつぶす。
const VECTOR_CLOSE_R = 12;
export class MaskVectorTool {
constructor() {
this.mode = "add";
this._canvas = null;
this._ctx = null;
this._previewCanvas = null;
this._points = [];
this._hoverX = null;
this._hoverY = null;
this.onBeforeCommit = null;
this._onChange = null;
}
setCanvas(canvas) { this._canvas = canvas; this._ctx = canvas.getContext("2d"); }
setPreviewCanvas(canvas) { this._previewCanvas = canvas; }
onChange(fn) { this._onChange = fn; }
activate() { if (this._canvas) this._canvas.style.cursor = "crosshair"; this._renderPreview(); }
deactivate() { if (this._canvas) this._canvas.style.cursor = ""; this._clearPreview(); }
reset() { this._points = []; this._hoverX = null; this._hoverY = null; this._clearPreview(); }
onMouseDown(x, y) {
if (this._points.length >= 3) {
const f = this._points[0];
if (Math.hypot(x - f.x, y - f.y) <= VECTOR_CLOSE_R) { this._commitPath(true); return; }
}
this._points.push({ x, y });
this._renderPreview();
}
onMouseMove(x, y) { this._hoverX = x; this._hoverY = y; this._renderPreview(); }
onMouseLeave() { this._hoverX = null; this._hoverY = null; this._renderPreview(); }
onMouseUp() {}
onKeyDown(e) {
if (e.key === "Escape") {
e.preventDefault(); this.reset();
} else if (e.key === "Enter" && this._points.length >= 2) {
e.preventDefault(); this._commitPath(false);
} else if ((e.key === "Backspace" || e.key === "Delete") && this._points.length > 0) {
e.preventDefault(); this._points.pop(); this._renderPreview();
}
}
_commitPath(closed) {
if (this._points.length < 2) return;
if (this.onBeforeCommit) this.onBeforeCommit();
const ctx = this._ctx;
ctx.save();
if (this.mode === "erase") {
ctx.globalCompositeOperation = "destination-out";
ctx.fillStyle = "rgba(0,0,0,1)";
} else {
ctx.globalCompositeOperation = "source-over";
ctx.fillStyle = "white";
}
ctx.beginPath();
this._buildSpline(ctx, this._points, closed);
ctx.fill();
ctx.restore();
this.reset();
if (this._onChange) this._onChange();
}
_buildSpline(ctx, pts, closed) {
const n = pts.length;
if (n === 0) return;
if (n === 1) { ctx.moveTo(pts[0].x, pts[0].y); return; }
if (n === 2) {
ctx.moveTo(pts[0].x, pts[0].y); ctx.lineTo(pts[1].x, pts[1].y);
if (closed) ctx.closePath(); return;
}
let ext;
if (closed) {
ext = [pts[n - 1], ...pts, pts[0], pts[1]];
} else {
ext = [
{ x: 2 * pts[0].x - pts[1].x, y: 2 * pts[0].y - pts[1].y },
...pts,
{ x: 2 * pts[n-1].x - pts[n-2].x, y: 2 * pts[n-1].y - pts[n-2].y },
];
}
ctx.moveTo(ext[1].x, ext[1].y);
const count = closed ? n : n - 1;
for (let i = 0; i < count; i++) {
const [p0, p1, p2, p3] = [ext[i], ext[i+1], ext[i+2], ext[i+3]];
ctx.bezierCurveTo(
p1.x + (p2.x - p0.x) / 6, p1.y + (p2.y - p0.y) / 6,
p2.x - (p3.x - p1.x) / 6, p2.y - (p3.y - p1.y) / 6,
p2.x, p2.y,
);
}
if (closed) ctx.closePath();
}
_renderPreview() {
if (!this._previewCanvas) return;
const pctx = this._previewCanvas.getContext("2d");
const w = this._previewCanvas.width, h = this._previewCanvas.height;
pctx.clearRect(0, 0, w, h);
const pts = this._points, hx = this._hoverX, hy = this._hoverY;
if (pts.length === 0 && hx === null) return;
if (pts.length >= 2) {
pctx.save();
pctx.strokeStyle = "rgba(255,210,40,0.9)"; pctx.lineWidth = 1.5; pctx.setLineDash([]);
pctx.beginPath(); this._buildSpline(pctx, pts, false); pctx.stroke();
pctx.restore();
}
if (pts.length >= 1 && hx !== null) {
const canClose = pts.length >= 3 && Math.hypot(hx - pts[0].x, hy - pts[0].y) <= VECTOR_CLOSE_R;
pctx.save();
if (canClose) {
pctx.strokeStyle = "rgba(255,100,100,0.55)"; pctx.lineWidth = 1.5; pctx.setLineDash([4, 3]);
pctx.beginPath(); this._buildSpline(pctx, pts, true); pctx.stroke();
} else {
pctx.strokeStyle = "rgba(255,210,40,0.5)"; pctx.lineWidth = 1; pctx.setLineDash([4, 3]);
pctx.beginPath();
pctx.moveTo(pts[pts.length - 1].x, pts[pts.length - 1].y);
pctx.lineTo(hx, hy); pctx.stroke();
}
pctx.restore();
}
for (let i = 0; i < pts.length; i++) {
const p = pts[i], isFirst = i === 0;
const closeable = isFirst && pts.length >= 3 && hx !== null && Math.hypot(hx - p.x, hy - p.y) <= VECTOR_CLOSE_R;
pctx.beginPath();
pctx.arc(p.x, p.y, closeable ? 7 : (isFirst ? 5 : 4), 0, Math.PI * 2);
pctx.fillStyle = closeable ? "rgba(255,80,80,0.95)" : (isFirst ? "rgba(255,210,40,0.95)" : "rgba(255,210,40,0.8)");
pctx.strokeStyle = "rgba(0,0,0,0.6)"; pctx.lineWidth = 1;
pctx.fill(); pctx.stroke();
}
if (hx !== null) {
const onFirst = pts.length >= 3 && Math.hypot(hx - pts[0].x, hy - pts[0].y) <= VECTOR_CLOSE_R;
if (!onFirst) {
pctx.beginPath(); pctx.arc(hx, hy, 3, 0, Math.PI * 2);
pctx.fillStyle = "rgba(255,255,255,0.6)"; pctx.strokeStyle = "rgba(200,200,200,0.5)"; pctx.lineWidth = 1;
pctx.fill(); pctx.stroke();
}
}
}
_clearPreview() {
if (!this._previewCanvas) return;
const c = this._previewCanvas;
c.getContext("2d").clearRect(0, 0, c.width, c.height);
}
}
// ── Shape Tool ───────────────────────────────────────────────────────────────
// ドラッグで矩形または楕円をマスクとして描画する(Shift = 正方形/正円)。
export class MaskShapeTool {
constructor() {
this.mode = "add";
this.shape = "rect"; // "rect" | "ellipse"
this._canvas = null;
this._ctx = null;
this._previewCanvas = null;
this._pCtx = null;
this._startX = 0;
this._startY = 0;
this._curX = 0;
this._curY = 0;
this._curShift = false;
this._drawing = false;
this._onChange = null;
}
setCanvas(canvas) { this._canvas = canvas; this._ctx = canvas.getContext("2d"); }
setPreviewCanvas(canvas) { this._previewCanvas = canvas; this._pCtx = canvas.getContext("2d"); }
onChange(fn) { this._onChange = fn; }
activate() { if (this._canvas) this._canvas.style.cursor = "crosshair"; }
deactivate() { this._drawing = false; this._clearPreview(); if (this._canvas) this._canvas.style.cursor = ""; }
onMouseDown(x, y) {
this._startX = x; this._startY = y;
this._curX = x; this._curY = y; this._curShift = false;
this._drawing = true;
this._drawPreview(x, y, false);
}
onMouseMove(x, y, e) {
if (!this._drawing) return;
this._curX = x; this._curY = y; this._curShift = e?.shiftKey ?? false;
this._drawPreview(x, y, this._curShift);
}
// x/y を省略した場合は最後に記録した座標を使用(mouseupイベント非経由での呼び出し対応)
onMouseUp(x, y, e) {
if (!this._drawing) return;
const cx = x ?? this._curX;
const cy = y ?? this._curY;
const shift = e?.shiftKey ?? this._curShift;
this._drawing = false;
this._clearPreview();
this._commit(cx, cy, shift);
if (this._onChange) this._onChange();
}
onMouseLeave() {}
_getRect(x, y, shift) {
const sx = this._startX, sy = this._startY;
if (shift) {
const half = Math.max(Math.abs(x - sx), Math.abs(y - sy));
return { x: sx - half, y: sy - half, w: half * 2, h: half * 2 };
}
return { x: Math.min(sx, x), y: Math.min(sy, y), w: Math.abs(x - sx), h: Math.abs(y - sy) };
}
_drawPreview(x, y, shift) {
if (!this._pCtx) return;
const pc = this._previewCanvas;
this._pCtx.clearRect(0, 0, pc.width, pc.height);
const { x: rx, y: ry, w, h } = this._getRect(x, y, shift);
if (w < 1 || h < 1) return;
this._pCtx.save();
this._pCtx.strokeStyle = "rgba(0,180,255,0.9)"; this._pCtx.lineWidth = 1.5; this._pCtx.setLineDash([5, 3]);
this._pCtx.beginPath();
if (this.shape === "rect") this._pCtx.rect(rx, ry, w, h);
else this._pCtx.ellipse(rx + w / 2, ry + h / 2, w / 2, h / 2, 0, 0, Math.PI * 2);
this._pCtx.stroke(); this._pCtx.restore();
}
_clearPreview() {
if (!this._pCtx) return;
this._pCtx.clearRect(0, 0, this._previewCanvas.width, this._previewCanvas.height);
}
_commit(x, y, shift) {
const { x: rx, y: ry, w, h } = this._getRect(x, y, shift);
if (w < 1 || h < 1) return;
const ctx = this._ctx;
ctx.save();
ctx.globalCompositeOperation = this.mode === "erase" ? "destination-out" : "source-over";
ctx.fillStyle = "white";
ctx.beginPath();
if (this.shape === "rect") ctx.rect(rx, ry, w, h);
else ctx.ellipse(rx + w / 2, ry + h / 2, w / 2, h / 2, 0, 0, Math.PI * 2);
ctx.fill(); ctx.restore();
}
}
+203 -3
View File
@@ -3,6 +3,9 @@
* White-paint / erase brush for mask layers.
* paint mode: draws white (opaque) = mask present
* erase mode: destination-out (transparent) = mask absent
*
* Supports circular soft brush (built-in) and image brushes loaded
* from Mask Editor One's ABR brush library (optional).
*/
export class MaskTool {
@@ -11,34 +14,69 @@ export class MaskTool {
this.ctx = canvas?.getContext("2d");
this.brushSize = 30;
this.hardness = 0.85;
this.spacing = 0.25; // stamp interval as fraction of brushSize (image brush only)
this.mode = "paint"; // "paint" | "erase"
// Image brush from ABR library (null = default circle brush)
this.brushImage = null;
this.brushName = "Circle";
this.angle = 0; // degrees [0, 359]
this.sizeJitter = false;
this.sizeJitterAmount = 0.5; // 0–1: fraction of brushSize that can be removed
this.rotationJitter = false;
this._drawing = false;
this._lastX = 0;
this._lastY = 0;
// Cached circle stamp
this._stamp = null;
this._stampSize = 0;
this._stampHard = 0;
this._stampMode = null;
// Cached image stamp
this._imgStamp = null;
this._imgStampSize = 0;
this._imgStampImg = null;
// Stroke buffer: prevents intra-stroke opacity accumulation (image brush only)
this._baseCanvas = null;
this._strokeCanvas = null;
this._strokeCtx = null;
this._onChange = null;
}
setCanvas(canvas) {
this.canvas = canvas;
this.ctx = canvas.getContext("2d");
this._stamp = null;
this._stamp = null;
this._imgStamp = null;
}
onChange(fn) { this._onChange = fn; }
setImageBrush(img, name) {
this.brushImage = img;
this.brushName = name;
this._imgStamp = null;
}
clearImageBrush() {
this.brushImage = null;
this.brushName = "Circle";
this._stamp = null;
this._imgStamp = null;
}
activate() {
if (this.canvas) this.canvas.style.cursor = "none";
}
deactivate() {
this._drawing = false;
this._clearStrokeBuffer();
if (this.canvas) this.canvas.style.cursor = "";
}
@@ -46,12 +84,23 @@ export class MaskTool {
this._drawing = true;
this._lastX = x;
this._lastY = y;
this._paint(x, y);
if (this.brushImage) {
this._initStrokeBuffer();
this._paintToStroke(x, y);
this._mergeStroke();
} else {
this._paint(x, y);
}
}
onMouseMove(x, y) {
if (!this._drawing) return;
this._paintLine(this._lastX, this._lastY, x, y);
if (this.brushImage) {
this._paintLineToStroke(this._lastX, this._lastY, x, y);
this._mergeStroke();
} else {
this._paintLine(this._lastX, this._lastY, x, y);
}
this._lastX = x;
this._lastY = y;
}
@@ -59,6 +108,7 @@ export class MaskTool {
onMouseUp() {
if (this._drawing) {
this._drawing = false;
this._clearStrokeBuffer();
if (this._onChange) this._onChange();
}
}
@@ -67,6 +117,77 @@ export class MaskTool {
if (this._drawing) this.onMouseUp();
}
// ── Stroke buffer (image brush only) ─────────────────────────────
_initStrokeBuffer() {
const w = this.canvas.width;
const h = this.canvas.height;
this._baseCanvas = document.createElement("canvas");
this._baseCanvas.width = w;
this._baseCanvas.height = h;
this._baseCanvas.getContext("2d").drawImage(this.canvas, 0, 0);
this._strokeCanvas = document.createElement("canvas");
this._strokeCanvas.width = w;
this._strokeCanvas.height = h;
this._strokeCtx = this._strokeCanvas.getContext("2d");
}
_clearStrokeBuffer() {
this._baseCanvas = null;
this._strokeCanvas = null;
this._strokeCtx = null;
}
_mergeStroke() {
const ctx = this.ctx;
const w = this.canvas.width;
const h = this.canvas.height;
ctx.clearRect(0, 0, w, h);
ctx.drawImage(this._baseCanvas, 0, 0);
ctx.globalCompositeOperation = this.mode === "erase" ? "destination-out" : "lighten";
ctx.drawImage(this._strokeCanvas, 0, 0);
ctx.globalCompositeOperation = "source-over";
}
_paintToStroke(x, y) {
const saved = this.ctx;
this.ctx = this._strokeCtx;
if (this.sizeJitter || this.rotationJitter) {
const savedSize = this.brushSize;
const savedAngle = this.angle;
const savedStamp = this._imgStamp;
const savedStampSize = this._imgStampSize;
if (this.sizeJitter) {
this.brushSize = Math.max(1, savedSize * (1 - Math.random() * this.sizeJitterAmount));
}
if (this.rotationJitter) {
this.angle = Math.random() * 360;
}
this._paintImageBrush(x, y);
this.brushSize = savedSize;
this.angle = savedAngle;
this._imgStamp = savedStamp;
this._imgStampSize = savedStampSize;
} else {
this._paintImageBrush(x, y);
}
this.ctx = saved;
}
_paintLineToStroke(x0, y0, x1, y1) {
const dist = Math.hypot(x1 - x0, y1 - y0);
const step = Math.max(1, this.brushSize * this.spacing);
const steps = Math.ceil(dist / step);
for (let i = 1; i <= steps; i++) {
const t = i / steps;
this._paintToStroke(x0 + (x1 - x0) * t, y0 + (y1 - y0) * t);
}
}
// ── Circle brush ─────────────────────────────────────────────────
_getStamp() {
if (
this._stamp &&
@@ -121,4 +242,83 @@ export class MaskTool {
this._paint(x0 + (x1 - x0) * t, y0 + (y1 - y0) * t);
}
}
// ── Image brush ──────────────────────────────────────────────────
_getImageStamp(size) {
size = Math.max(1, size);
if (
this._imgStamp &&
this._imgStampSize === size &&
this._imgStampImg === this.brushImage
) return this._imgStamp;
const img = this.brushImage;
const srcW = img.naturalWidth || img.width;
const srcH = img.naturalHeight || img.height;
const aspect = (srcW > 0 && srcH > 0) ? srcW / srcH : 1;
const stampH = size;
const stampW = Math.max(1, Math.round(size * aspect));
const sc = document.createElement("canvas");
sc.width = stampW;
sc.height = stampH;
const stx = sc.getContext("2d");
stx.drawImage(img, 0, 0, stampW, stampH);
const imgData = stx.getImageData(0, 0, stampW, stampH);
const d = imgData.data;
// Detect alpha channel (ABR-exported PNGs carry alpha = brush density)
let hasAlpha = false;
for (let i = 3; i < d.length; i += 4) {
if (d[i] < 250) { hasAlpha = true; break; }
}
let invertLum = false;
if (!hasAlpha) {
const corners = [0, stampW - 1, stampW * (stampH - 1), stampW * stampH - 1];
let bgLum = 0;
for (const ci of corners) {
const ii = ci * 4;
bgLum += (d[ii] * 0.299 + d[ii + 1] * 0.587 + d[ii + 2] * 0.114) / 255;
}
invertLum = (bgLum / corners.length) > 0.5;
}
// Convert to white pixels; alpha = brush density
for (let i = 0; i < d.length; i += 4) {
let alpha;
if (hasAlpha) {
alpha = d[i + 3] / 255;
} else {
const lum = (d[i] * 0.299 + d[i + 1] * 0.587 + d[i + 2] * 0.114) / 255;
alpha = invertLum ? 1 - lum : lum;
}
d[i] = d[i + 1] = d[i + 2] = 255;
d[i + 3] = Math.round(alpha * 255);
}
stx.putImageData(imgData, 0, 0);
this._imgStamp = sc;
this._imgStampSize = size;
this._imgStampImg = this.brushImage;
return sc;
}
_paintImageBrush(x, y) {
const stamp = this._getImageStamp(Math.round(this.brushSize));
this.ctx.globalCompositeOperation = "source-over";
if (this.angle) {
this.ctx.save();
this.ctx.translate(Math.round(x), Math.round(y));
this.ctx.rotate((this.angle * Math.PI) / 180);
this.ctx.drawImage(stamp, -stamp.width / 2, -stamp.height / 2);
this.ctx.restore();
} else {
this.ctx.drawImage(stamp, Math.round(x - stamp.width / 2), Math.round(y - stamp.height / 2));
}
this.ctx.globalCompositeOperation = "source-over";
}
}
+957
View File
@@ -0,0 +1,957 @@
/**
* Lab Tab - Experimental I2I batch generation.
*
* Runs the currently loaded workflow N times, letting Checkpoint / VAE / Prompt /
* KSampler each be overridden independently starting at a chosen iteration
* ("keyframe"). Never mutates comfyUI.currentWorkflow — everything is applied to a
* fresh deep clone per iteration so it can't interfere with the Input/Model/Settings/
* Batch subtabs.
*/
import { comfyUI } from "./comfyui-client.js";
import { comfyEditor } from "./comfyui-editor.js";
import { showToast, openModal, closeModal } from "./app.js";
import { t } from "./i18n.js";
import { escapeHtml, getEagleSettings, saveToEagle, setupSearchClearBtn } from "./util.js";
import { extractAllMetadata } from "./metadata-tab.js";
import { syncJsonHighlight } from "./json-highlight.js";
const COLUMN_KEYS = ["checkpoint", "vae", "prompt", "ksampler"];
const MAX_RESULTS = 9;
const RESULTS_GRID_COLS = 3;
function _defaultValueFor(col) {
if (col === "prompt") return { positive: "", negative: "" };
if (col === "ksampler") return { steps: null, cfg: null, sampler_name: "", scheduler: "", denoise: null, seed: null };
return "";
}
function _emptyColumns() {
return {
checkpoint: [{ atIteration: 1, value: "", revertToBase: false }],
vae: [{ atIteration: 1, value: "", revertToBase: false }],
prompt: [{ atIteration: 1, value: _defaultValueFor("prompt"), revertToBase: false }],
ksampler: [{ atIteration: 1, value: _defaultValueFor("ksampler"), revertToBase: false }],
};
}
function _emptyLabState() {
return {
planFilename: null,
note: "",
batchCount: 4,
chainImage: false,
sourceImageFilename: null,
columns: _emptyColumns(),
results: { images: [] },
};
}
let _lab = _emptyLabState();
let _paused = false;
let _aborted = false;
let _resumeResolve = null;
let _lastGeneratedImageRef = null; // ComfyUI "name [type]" annotated ref of the previous iteration's first output
// ============================================
// Init
// ============================================
export function initLabTab() {
_initDropZone();
_initPlanDropZone();
_initSubtabToggle();
_initColumnButtons();
_initRunControls();
_initPlanButtons();
_initPlanJsonTab();
_renderAllColumns();
_renderResultsGrid();
}
function _initDropZone() {
const dropZone = document.getElementById("wfm-lab-drop-zone");
const fileInput = document.getElementById("wfm-lab-file-input");
const previewWrap = document.getElementById("wfm-lab-preview-wrap");
const previewImg = document.getElementById("wfm-lab-preview-img");
const applyFile = async (file) => {
if (!file || !file.type.startsWith("image/")) return;
const url = URL.createObjectURL(file);
if (previewImg) previewImg.src = url;
if (previewWrap) previewWrap.style.display = "";
try {
const result = await comfyUI.uploadImage(file, file.name);
if (!result.name) throw new Error("Upload returned no filename");
_lab.sourceImageFilename = result.name;
_updateResultsSourceImage();
showToast(t("labImageUploaded", result.name), "success");
} catch (err) {
showToast(`${t("labUploadFailed")}: ${err.message}`, "error");
}
};
fileInput?.addEventListener("change", () => {
if (fileInput.files.length > 0) applyFile(fileInput.files[0]);
});
if (dropZone) {
dropZone.addEventListener("dragover", (e) => { e.preventDefault(); dropZone.classList.add("drag-over"); });
dropZone.addEventListener("dragleave", () => dropZone.classList.remove("drag-over"));
dropZone.addEventListener("drop", (e) => {
e.preventDefault();
dropZone.classList.remove("drag-over");
if (e.dataTransfer.files.length > 0) applyFile(e.dataTransfer.files[0]);
});
}
}
// Plan Load — same drag&drop + click-to-browse UX as the Image drop zone.
// Accepts a .json plan file (read directly) or a .png index-image thumbnail
// (same basename as its .json on the server, fetched by filename).
function _initPlanDropZone() {
const dropZone = document.getElementById("wfm-lab-plan-drop-zone");
const fileInput = document.getElementById("wfm-lab-plan-file-input");
const applyFile = (file) => {
if (!file) return;
const name = file.name.toLowerCase();
if (name.endsWith(".json")) {
_loadPlanFromFile(file);
} else if (name.endsWith(".png") || file.type.startsWith("image/")) {
_loadPlanFromIndexImage(file);
} else {
showToast(t("labPlanInvalidFile"), "error");
}
};
fileInput?.addEventListener("change", () => {
if (fileInput.files.length > 0) applyFile(fileInput.files[0]);
fileInput.value = ""; // allow re-selecting the same file next time
});
if (dropZone) {
dropZone.addEventListener("dragover", (e) => { e.preventDefault(); dropZone.classList.add("drag-over"); });
dropZone.addEventListener("dragleave", () => dropZone.classList.remove("drag-over"));
dropZone.addEventListener("drop", (e) => {
e.preventDefault();
dropZone.classList.remove("drag-over");
if (e.dataTransfer.files.length > 0) applyFile(e.dataTransfer.files[0]);
});
}
}
function _initSubtabToggle() {
document.querySelectorAll(".wfm-lab-subtab-btn").forEach((btn) => {
btn.addEventListener("click", () => {
const target = btn.dataset.labSubtab;
document.querySelectorAll(".wfm-lab-subtab-btn").forEach((b) => b.classList.remove("active"));
btn.classList.add("active");
document.getElementById("wfm-lab-panel-setting")?.classList.toggle("active", target === "setting");
document.getElementById("wfm-lab-panel-results")?.classList.toggle("active", target === "results");
document.getElementById("wfm-lab-panel-planjson")?.classList.toggle("active", target === "planjson");
if (target === "results") _updateResultsSourceImage();
if (target === "planjson") _syncLabJsonView();
});
});
}
function _initPlanJsonTab() {
document.getElementById("wfm-lab-planjson-refresh")?.addEventListener("click", () => {
_syncLabJsonView();
showToast(t("labPlanJsonRefreshed"), "success");
});
document.getElementById("wfm-lab-planjson-apply")?.addEventListener("click", () => {
const editor = document.getElementById("wfm-lab-planjson-editor");
let data;
try {
data = JSON.parse(editor?.value || "{}");
} catch (err) {
showToast(`${t("labPlanJsonInvalid")}: ${err.message}`, "error");
return;
}
_applyPlanData(_lab.planFilename, data);
_syncLabJsonView();
showToast(t("labPlanJsonApplied"), "success");
});
}
// Serializes the live Setting-tab state into the same shape saved to disk by
// _savePlan(), for display/editing in the Plan JSON panel.
function _buildPlanData(name) {
return {
name,
note: _lab.note,
batch_count: _lab.batchCount,
chain_image: _lab.chainImage,
source_image: _lab.sourceImageFilename,
columns: _lab.columns,
results: { images: _lab.results.images },
};
}
function _syncLabJsonView() {
const editor = document.getElementById("wfm-lab-planjson-editor");
const highlight = document.getElementById("wfm-lab-planjson-highlight");
if (!editor) return;
const name = _lab.planFilename ? _lab.planFilename.replace(/\.json$/i, "") : "";
const json = JSON.stringify(_buildPlanData(name), null, 2);
editor.value = json;
syncJsonHighlight(highlight, json);
}
function _initRunControls() {
document.getElementById("wfm-lab-batch-count")?.addEventListener("change", (e) => {
const v = parseInt(e.target.value, 10);
_lab.batchCount = (isNaN(v) || v < 1) ? 1 : v;
e.target.value = _lab.batchCount;
});
document.getElementById("wfm-lab-note")?.addEventListener("input", (e) => { _lab.note = e.target.value; });
document.getElementById("wfm-lab-chain-image")?.addEventListener("change", (e) => { _lab.chainImage = e.target.checked; });
document.getElementById("wfm-lab-run-btn")?.addEventListener("click", () => _runLabBatch());
document.getElementById("wfm-lab-cancel-btn")?.addEventListener("click", async () => {
_aborted = true;
_paused = false;
if (_resumeResolve) { _resumeResolve(); _resumeResolve = null; }
await comfyUI.interrupt();
showToast(t("interrupted"), "info");
});
document.getElementById("wfm-lab-pause-btn")?.addEventListener("click", (e) => {
_paused = !_paused;
e.target.textContent = _paused ? t("labResume") : t("labPause");
if (!_paused && _resumeResolve) { _resumeResolve(); _resumeResolve = null; }
});
}
function _initPlanButtons() {
document.getElementById("wfm-lab-plan-save-btn")?.addEventListener("click", () => _savePlan());
document.getElementById("wfm-lab-plan-saveas-btn")?.addEventListener("click", () => _savePlan(null, true));
document.getElementById("wfm-lab-plan-clear-btn")?.addEventListener("click", () => _clearPlan());
}
// ============================================
// Column keyframes: render / add / remove / edit
// ============================================
function _initColumnButtons() {
document.querySelectorAll(".wfm-lab-col-add").forEach((btn) => {
btn.addEventListener("click", () => {
const col = btn.dataset.col;
const kfs = _lab.columns[col];
const lastIter = kfs[kfs.length - 1].atIteration;
if (lastIter >= _lab.batchCount) {
showToast(t("labBatchCountTooSmall"), "error");
return;
}
kfs.push({ atIteration: lastIter + 1, value: _defaultValueFor(col), revertToBase: false });
_renderColumn(col);
_openCellModal(col, kfs.length - 1);
});
});
document.querySelectorAll(".wfm-lab-col-remove").forEach((btn) => {
btn.addEventListener("click", () => {
const col = btn.dataset.col;
const kfs = _lab.columns[col];
if (kfs.length <= 1) return; // Row 1 (baseline) cannot be removed
kfs.pop();
_renderColumn(col);
});
});
}
function _renderAllColumns() {
COLUMN_KEYS.forEach(_renderColumn);
}
function _renderColumn(col) {
const container = document.getElementById(`wfm-lab-col-cells-${col}`);
if (!container) return;
const keyframes = _lab.columns[col];
container.innerHTML = keyframes.map((kf, idx) => _cellHtml(col, kf, idx)).join("");
container.querySelectorAll(".wfm-lab-cell").forEach((el) => {
el.addEventListener("click", () => _openCellModal(col, parseInt(el.dataset.idx, 10)));
});
}
function _cellHtml(col, kf, idx) {
const revertClass = kf.revertToBase ? " wfm-lab-cell-revert" : "";
if (idx === 0) {
return `<div class="wfm-lab-cell${revertClass}" data-idx="${idx}">
<span class="wfm-lab-cell-index">${kf.atIteration}:</span>
<span class="wfm-lab-cell-value">${_cellLabel(col, kf)}</span>
</div>`;
}
// Iteration #2 and beyond: value on its own line, applied-at iteration below it
return `<div class="wfm-lab-cell${revertClass}" data-idx="${idx}">
<div class="wfm-lab-cell-value">${_cellLabel(col, kf)}</div>
<div class="wfm-lab-cell-applied">${t("labAppliedAt", kf.atIteration)}</div>
</div>`;
}
function _cellLabel(col, kf) {
if (kf.revertToBase) return t("labRevertToBase");
if (col === "checkpoint" || col === "vae") {
return kf.value ? escapeHtml(kf.value) : t("labUseWorkflowDefault");
}
if (col === "prompt") {
const p = kf.value?.positive || "";
const n = kf.value?.negative || "";
if (!p && !n) return t("labUseWorkflowDefault");
return `<span class="wfm-lab-cell-prompt-line">P: ${escapeHtml(p)}</span><span class="wfm-lab-cell-prompt-line">N: ${escapeHtml(n)}</span>`;
}
if (col === "ksampler") {
const v = kf.value || {};
if (v.steps == null && v.cfg == null && v.denoise == null) return t("labUseWorkflowDefault");
const parts = [];
if (v.steps != null) parts.push(`Step${v.steps}`);
if (v.cfg != null) parts.push(`CFG${v.cfg}`);
if (v.denoise != null) parts.push(`Denoise${v.denoise}`);
return escapeHtml(parts.join(" / "));
}
return "";
}
function _isEmptyValue(col, value) {
if (col === "checkpoint" || col === "vae") return !value;
if (col === "prompt") return !value || (!value.positive && !value.negative);
if (col === "ksampler") {
return !value || (value.steps == null && value.cfg == null && value.denoise == null &&
!value.sampler_name && !value.scheduler && value.seed == null);
}
return true;
}
function _openCellModal(col, idx) {
const kf = _lab.columns[col][idx];
const isFirst = idx === 0;
const isLast = idx === _lab.columns[col].length - 1;
let valueFieldsHtml = "";
if (col === "checkpoint" || col === "vae") {
const options = comfyEditor.models[col === "checkpoint" ? "checkpoints" : "vaes"] || [];
valueFieldsHtml = `
<div class="wfm-lab-modal-row">
<label>${col === "checkpoint" ? "Checkpoint" : "VAE"}</label>
<div class="wfm-search-wrap" style="margin-bottom:4px;width:100%;">
<input type="text" id="wfm-lab-modal-value-filter" class="wfm-input wfm-search-input" placeholder="Filter...">
<button type="button" class="wfm-search-clear-btn" id="wfm-lab-modal-value-filter-clear" title="Clear search">✕</button>
</div>
<select id="wfm-lab-modal-value" class="wfm-select">
<option value="">${t("labUseWorkflowDefault")}</option>
${options.map((m) => `<option value="${escapeHtml(m)}" ${m === kf.value ? "selected" : ""}>${escapeHtml(m)}</option>`).join("")}
</select>
</div>`;
} else if (col === "prompt") {
const v = kf.value || {};
valueFieldsHtml = `
<div class="wfm-lab-modal-btnrow">
<button type="button" id="wfm-lab-modal-get-genui" class="wfm-btn wfm-btn-sm">${t("labGetFromGenUI")}</button>
<button type="button" id="wfm-lab-modal-get-image" class="wfm-btn wfm-btn-sm">${t("labGetFromImage")}</button>
</div>
<div class="wfm-lab-modal-row">
<label>Positive</label>
<textarea id="wfm-lab-modal-positive" class="wfm-input" rows="3">${escapeHtml(v.positive || "")}</textarea>
</div>
<div class="wfm-lab-modal-row">
<label>Negative</label>
<textarea id="wfm-lab-modal-negative" class="wfm-input" rows="3">${escapeHtml(v.negative || "")}</textarea>
</div>
<div class="wfm-lab-modal-row">
<label>${t("labStyle")}</label>
<button type="button" id="wfm-lab-modal-style-apply" class="wfm-btn wfm-btn-sm">${t("labApply")}</button>
</div>`;
} else if (col === "ksampler") {
const v = kf.value || {};
const samplers = comfyEditor.models.samplers || [];
const schedulers = comfyEditor.models.schedulers || [];
valueFieldsHtml = `
<div class="wfm-lab-modal-inline">
<div><label>Steps</label><input type="number" id="wfm-lab-modal-steps" class="wfm-input" value="${v.steps ?? ""}"></div>
<div><label>CFG</label><input type="number" step="0.1" id="wfm-lab-modal-cfg" class="wfm-input" value="${v.cfg ?? ""}"></div>
<div><label>Denoise</label><input type="number" step="0.01" min="0" max="1" id="wfm-lab-modal-denoise" class="wfm-input" value="${v.denoise ?? ""}"></div>
</div>
<div class="wfm-lab-modal-inline">
<div><label>Sampler</label>
<select id="wfm-lab-modal-sampler" class="wfm-select">
<option value="">${t("labUseWorkflowDefault")}</option>
${samplers.map((s) => `<option value="${escapeHtml(s)}" ${s === v.sampler_name ? "selected" : ""}>${escapeHtml(s)}</option>`).join("")}
</select>
</div>
<div><label>Scheduler</label>
<select id="wfm-lab-modal-scheduler" class="wfm-select">
<option value="">${t("labUseWorkflowDefault")}</option>
${schedulers.map((s) => `<option value="${escapeHtml(s)}" ${s === v.scheduler ? "selected" : ""}>${escapeHtml(s)}</option>`).join("")}
</select>
</div>
</div>
<div class="wfm-lab-modal-row">
<label>${t("labSeedEmptyRandom")}</label>
<input type="number" id="wfm-lab-modal-seed" class="wfm-input" value="${v.seed ?? ""}">
</div>`;
}
const atIterRow = isFirst ? "" : `
<div class="wfm-lab-modal-row">
<label>${t("labApplyFromIteration")}</label>
<input type="number" id="wfm-lab-modal-iter" class="wfm-input" value="${kf.atIteration}" min="2" max="${_lab.batchCount}">
</div>`;
const revertRow = isFirst ? "" : `
<div class="wfm-lab-modal-checkbox">
<input type="checkbox" id="wfm-lab-modal-revert" ${kf.revertToBase ? "checked" : ""}>
<label for="wfm-lab-modal-revert">${t("labRevertCheckboxLabel")}</label>
</div>`;
const deleteBtn = (!isFirst && isLast)
? `<button id="wfm-lab-modal-delete" class="wfm-btn wfm-btn-danger">${t("delete")}</button>` : "";
const html = `
<div id="wfm-lab-modal-fields">${valueFieldsHtml}</div>
${atIterRow}
${revertRow}
<div style="display:flex;gap:8px;margin-top:12px;justify-content:flex-end;">
${deleteBtn}
<button id="wfm-lab-modal-save" class="wfm-btn wfm-btn-primary">${t("save")}</button>
</div>`;
openModal(`${col} #${idx + 1}`, html);
if (col === "prompt") _wireLabPromptModalExtras();
if (col === "checkpoint" || col === "vae") _wireLabValueFilter(col);
const revertCb = document.getElementById("wfm-lab-modal-revert");
const fieldsWrap = document.getElementById("wfm-lab-modal-fields");
const syncDisabled = () => {
const disabled = !!revertCb?.checked;
if (fieldsWrap) fieldsWrap.style.opacity = disabled ? "0.4" : "1";
fieldsWrap?.querySelectorAll("input,select,textarea").forEach((el) => { el.disabled = disabled; });
};
revertCb?.addEventListener("change", syncDisabled);
syncDisabled();
document.getElementById("wfm-lab-modal-delete")?.addEventListener("click", () => {
_lab.columns[col].splice(idx, 1);
_renderColumn(col);
closeModal();
});
document.getElementById("wfm-lab-modal-save")?.addEventListener("click", () => {
const revert = !!document.getElementById("wfm-lab-modal-revert")?.checked;
let atIteration = kf.atIteration;
if (!isFirst) {
const parsed = parseInt(document.getElementById("wfm-lab-modal-iter")?.value, 10);
if (!isNaN(parsed)) atIteration = Math.min(Math.max(parsed, 2), _lab.batchCount);
}
let value = kf.value;
if (!revert) {
if (col === "checkpoint" || col === "vae") {
value = document.getElementById("wfm-lab-modal-value")?.value || "";
} else if (col === "prompt") {
value = {
positive: document.getElementById("wfm-lab-modal-positive")?.value || "",
negative: document.getElementById("wfm-lab-modal-negative")?.value || "",
};
} else if (col === "ksampler") {
const numOrNull = (id) => {
const raw = document.getElementById(id)?.value;
return (raw === "" || raw == null) ? null : Number(raw);
};
value = {
steps: numOrNull("wfm-lab-modal-steps"),
cfg: numOrNull("wfm-lab-modal-cfg"),
denoise: numOrNull("wfm-lab-modal-denoise"),
sampler_name: document.getElementById("wfm-lab-modal-sampler")?.value || "",
scheduler: document.getElementById("wfm-lab-modal-scheduler")?.value || "",
seed: numOrNull("wfm-lab-modal-seed"),
};
}
}
_lab.columns[col][idx] = { atIteration, value, revertToBase: revert };
_lab.columns[col].sort((a, b) => a.atIteration - b.atIteration);
_renderColumn(col);
closeModal();
});
}
// Merges a style ({prompt, negative_prompt}, from Workflow-Studio/style/*.json) into
// plain positive/negative text. Unlike generate-tab.js's _applyNamedStyle() (which
// substitutes a {prompt} placeholder into the style template for the main Generate
// flow), Lab always appends: existing text is never cleared or reordered, the style's
// text is just added after a comma (or used as-is if the field was empty).
function _applyStyleToText(positive, negative, style) {
const append = (existing, addition) => {
if (!addition) return existing;
return existing ? `${existing}, ${addition}` : addition;
};
return {
positive: append(positive, style.prompt),
negative: append(negative, style.negative_prompt),
};
}
// Filter box above the Checkpoint/VAE modal's <select>, same behavior as the
// Model tab's filter inputs (comfyui-editor.js renderModelTab): rebuild the
// option list on every keystroke, always keeping the "workflow default" option.
// The overlay ✕ clear button reuses the same setupSearchClearBtn() helper as the
// Models/Nodes/Workflow/Gallery tab search boxes and the Raw JSON search bar.
function _wireLabValueFilter(col) {
const filterInput = document.getElementById("wfm-lab-modal-value-filter");
const select = document.getElementById("wfm-lab-modal-value");
if (!filterInput || !select) return;
const options = comfyEditor.models[col === "checkpoint" ? "checkpoints" : "vaes"] || [];
const applyFilter = () => {
const filter = filterInput.value.toLowerCase();
select.innerHTML = `<option value="">${t("labUseWorkflowDefault")}</option>` +
options.filter((m) => m.toLowerCase().includes(filter))
.map((m) => `<option value="${escapeHtml(m)}">${escapeHtml(m)}</option>`).join("");
};
filterInput.addEventListener("input", applyFilter);
setupSearchClearBtn("wfm-lab-modal-value-filter", "wfm-lab-modal-value-filter-clear", applyFilter);
}
// Wires the Prompt-column modal's extra actions: fetch the live GenerateUI prompt,
// extract a prompt from a dropped image/workflow file, and apply a saved Style.
function _wireLabPromptModalExtras() {
// Reuses the Style checkbox/dropdown already at the top of the GenerateUI toolbar
// (populated by generate-tab.js's _loadStyles()) instead of duplicating a second
// style picker inside this modal.
const styleApplyBtn = document.getElementById("wfm-lab-modal-style-apply");
const topStyleName = document.getElementById("wfm-style-select")?.value;
const topStyleEnabled = !!document.getElementById("wfm-style-enabled")?.checked;
if (styleApplyBtn) {
styleApplyBtn.textContent = (topStyleEnabled && topStyleName) ? `${t("labApply")}: ${topStyleName}` : t("labApply");
}
styleApplyBtn?.addEventListener("click", async () => {
const enabled = !!document.getElementById("wfm-style-enabled")?.checked;
const styleName = document.getElementById("wfm-style-select")?.value;
if (!enabled || !styleName) {
showToast(t("labEnableStyleFirst"), "error");
return;
}
let styles = [];
try {
const res = await fetch("/api/wfm/styles");
styles = res.ok ? await res.json() : [];
} catch { styles = []; }
const style = styles.find((s) => s.name === styleName);
if (!style) { showToast(t("labNoStyles"), "error"); return; }
const posEl = document.getElementById("wfm-lab-modal-positive");
const negEl = document.getElementById("wfm-lab-modal-negative");
const merged = _applyStyleToText(posEl?.value || "", negEl?.value || "", style);
if (posEl) posEl.value = merged.positive;
if (negEl) negEl.value = merged.negative;
showToast(t("labStyleApplied"), "success");
});
document.getElementById("wfm-lab-modal-get-genui")?.addEventListener("click", () => {
const analysis = comfyUI.currentAnalysis;
if (!analysis) { showToast(t("labNoWorkflowLoaded"), "error"); return; }
const posNode = analysis.prompt_nodes?.find((n) => n.role === "positive");
const negNode = analysis.prompt_nodes?.find((n) => n.role === "negative");
const posEl = document.getElementById("wfm-lab-modal-positive");
const negEl = document.getElementById("wfm-lab-modal-negative");
if (posEl) posEl.value = posNode?.text ?? "";
if (negEl) negEl.value = negNode?.text ?? "";
showToast(t("labPromptFetched"), "success");
});
// Reads metadata from the image already loaded in Lab's own Image drop zone
// (_lab.sourceImageFilename, already uploaded to ComfyUI's input folder) rather
// than asking the user to pick a separate file.
document.getElementById("wfm-lab-modal-get-image")?.addEventListener("click", async () => {
if (!_lab.sourceImageFilename) {
showToast(t("labNoSourceImage"), "error");
return;
}
try {
const res = await fetch(`/view?filename=${encodeURIComponent(_lab.sourceImageFilename)}&type=input`);
if (!res.ok) throw new Error(`HTTP ${res.status}`);
const blob = await res.blob();
const file = new File([blob], _lab.sourceImageFilename, { type: blob.type || "image/png" });
const meta = await extractAllMetadata(file);
if (!meta || (!meta.positives?.length && !meta.negatives?.length)) {
showToast(t("labNoPromptInImage"), "error");
return;
}
const posEl = document.getElementById("wfm-lab-modal-positive");
const negEl = document.getElementById("wfm-lab-modal-negative");
if (posEl && meta.positives?.[0]) posEl.value = meta.positives[0];
if (negEl && meta.negatives?.[0]) negEl.value = meta.negatives[0];
showToast(t("labPromptFetched"), "success");
} catch (err) {
showToast(`${t("labMetadataExtractFailed")}: ${err.message}`, "error");
}
});
}
// ============================================
// Effective-value resolution & workflow build
// ============================================
function _resolveKeyframe(col, iteration) {
const kfs = _lab.columns[col];
let applicable = null;
for (const kf of kfs) {
if (kf.atIteration <= iteration) applicable = kf;
else break;
}
if (!applicable) return null;
if (applicable.revertToBase) {
const row1 = kfs.find((k) => k.atIteration === 1);
return (row1 && !_isEmptyValue(col, row1.value)) ? row1.value : null;
}
return _isEmptyValue(col, applicable.value) ? null : applicable.value;
}
function _buildWorkflowForIteration(iteration, chainImageRef) {
const wf = JSON.parse(JSON.stringify(comfyUI.currentWorkflow || {}));
const analysis = comfyUI.currentAnalysis;
if (!analysis) return { workflow: wf, seed: null };
const write = (nodeId, key, val) => {
if (nodeId != null && wf[nodeId]) wf[nodeId].inputs[key] = val;
};
const ckpt = _resolveKeyframe("checkpoint", iteration);
if (ckpt && analysis.checkpoint_nodes?.[0]) {
write(analysis.checkpoint_nodes[0].id, "ckpt_name", ckpt);
}
const vae = _resolveKeyframe("vae", iteration);
if (vae && analysis.vae_nodes?.[0]) {
write(analysis.vae_nodes[0].id, "vae_name", vae);
}
const prompt = _resolveKeyframe("prompt", iteration);
if (prompt) {
const posNode = analysis.prompt_nodes?.find((n) => n.role === "positive");
const negNode = analysis.prompt_nodes?.find((n) => n.role === "negative");
if (posNode && prompt.positive) write(posNode.id, posNode.textKey || "text", prompt.positive);
if (negNode && prompt.negative) write(negNode.id, negNode.textKey || "text", prompt.negative);
}
let seed = null;
const ks = _resolveKeyframe("ksampler", iteration);
const sampler = analysis.sampler_nodes?.[0];
if (ks && sampler) {
if (ks.steps != null) write(sampler.stepsNodeId ?? sampler.id, "steps", ks.steps);
if (ks.cfg != null) write(sampler.cfgNodeId ?? sampler.id, "cfg", ks.cfg);
if (ks.sampler_name) write(sampler.samplerNodeId ?? sampler.id, "sampler_name", ks.sampler_name);
if (ks.scheduler && sampler.schedulerNodeId) write(sampler.schedulerNodeId, "scheduler", ks.scheduler);
if (ks.denoise != null && sampler.denoiseNodeId) write(sampler.denoiseNodeId, "denoise", ks.denoise);
if (ks.seed != null) seed = ks.seed;
}
const imageRef = chainImageRef || _lab.sourceImageFilename;
if (imageRef && analysis.load_image_nodes?.[0]) {
write(analysis.load_image_nodes[0].id, "image", imageRef);
}
return { workflow: wf, seed };
}
// ComfyUI's LoadImage accepts "name [type]" (optionally "subfolder/name [type]") to
// reference a previously generated output/temp image without re-uploading it.
function _annotatedImageRef(img) {
const rel = img.subfolder ? `${img.subfolder}/${img.filename}` : img.filename;
return `${rel} [${img.type || "output"}]`;
}
// ============================================
// Batch execution
// ============================================
function _waitIfPaused() {
if (!_paused) return Promise.resolve();
return new Promise((resolve) => { _resumeResolve = resolve; });
}
function _setRunUiState(running) {
const runBtn = document.getElementById("wfm-lab-run-btn");
const cancelBtn = document.getElementById("wfm-lab-cancel-btn");
const pauseBtn = document.getElementById("wfm-lab-pause-btn");
if (runBtn) runBtn.style.display = running ? "none" : "";
if (cancelBtn) cancelBtn.style.display = running ? "" : "none";
if (pauseBtn) {
pauseBtn.disabled = !running;
pauseBtn.textContent = t("labPause");
}
}
async function _runLabBatch() {
if (!comfyUI.currentWorkflow || !comfyUI.currentAnalysis) {
showToast(t("labNoWorkflowLoaded"), "error");
return;
}
if (!_lab.sourceImageFilename) {
showToast(t("labNoSourceImage"), "error");
return;
}
_paused = false;
_aborted = false;
_lastGeneratedImageRef = null;
_lab.results.images = [];
_renderResultsGrid();
_setRunUiState(true);
const progressBar = document.getElementById("wfm-lab-progress-bar");
const progressText = document.getElementById("wfm-lab-progress-text");
const eagleAutoSave = getEagleSettings().autoSave;
let completed = 0, failed = 0;
try {
for (let i = 1; i <= _lab.batchCount; i++) {
if (_aborted) break;
await _waitIfPaused();
if (_aborted) break;
if (progressText) progressText.textContent = `[${i}/${_lab.batchCount}] ...`;
const chainRef = (_lab.chainImage && i > 1) ? _lastGeneratedImageRef : null;
const { workflow, seed } = _buildWorkflowForIteration(i, chainRef);
try {
const { images } = await comfyUI.generate(workflow, {
seedMode: seed != null ? "fixed" : "random",
seedValue: seed ?? -1,
onProgress: (pct) => {
if (progressBar) progressBar.style.width = `${(pct * 100).toFixed(1)}%`;
if (progressText) progressText.textContent = `[${i}/${_lab.batchCount}] ${(pct * 100).toFixed(0)}%`;
},
});
const outputImages = images.filter((img) => img.type !== "temp");
if (outputImages.length > 0) {
_lastGeneratedImageRef = _annotatedImageRef(outputImages[0]);
}
for (const img of outputImages) {
if (_lab.results.images.length < MAX_RESULTS) {
_lab.results.images.push({ ...img, iteration: i });
}
if (eagleAutoSave) {
const viewUrl = `/view?filename=${encodeURIComponent(img.filename)}&subfolder=${encodeURIComponent(img.subfolder || "")}&type=${encodeURIComponent(img.type || "output")}`;
saveToEagle(viewUrl, img.filename, [], img);
}
}
_renderResultsGrid();
completed++;
} catch (err) {
if (_aborted) break;
failed++;
showToast(t("batchItemFailed", i, _lab.batchCount, err.message), "error");
}
}
} finally {
_paused = false;
if (_resumeResolve) { _resumeResolve(); _resumeResolve = null; }
_setRunUiState(false);
}
if (progressBar) progressBar.style.width = "100%";
if (_aborted) {
showToast(t("batchStopped", completed, failed), "info");
} else {
showToast(t("batchComplete", completed, _lab.batchCount, failed), failed > 0 ? "error" : "success");
}
}
// ============================================
// Results grid
// ============================================
function _resultImageUrl(img) {
return `/view?filename=${encodeURIComponent(img.filename)}&subfolder=${encodeURIComponent(img.subfolder || "")}&type=${encodeURIComponent(img.type || "output")}`;
}
function _renderResultsGrid() {
const grid = document.getElementById("wfm-lab-results-grid");
if (!grid) return;
if (_lab.results.images.length === 0) {
grid.innerHTML = `<p class="wfm-placeholder">${t("labNoResultsYet")}</p>`;
return;
}
grid.innerHTML = _lab.results.images.map((img, i) => `
<div class="wfm-lab-result-item">
<span class="wfm-lab-result-index">${img.iteration}</span>
<img class="wfm-lab-result-thumb" data-idx="${i}" src="${_resultImageUrl(img)}">
</div>`).join("");
grid.querySelectorAll(".wfm-lab-result-thumb").forEach((el) => {
el.addEventListener("click", () => {
openModal(t("labResultPreview"), `<img src="${el.src}" style="max-width:100%;max-height:80vh;display:block;margin:0 auto;">`);
});
});
}
function _updateResultsSourceImage() {
const img = document.getElementById("wfm-lab-results-source-img");
if (!img) return;
if (_lab.sourceImageFilename) {
img.src = `/view?filename=${encodeURIComponent(_lab.sourceImageFilename)}&type=input`;
img.style.display = "";
} else {
img.style.display = "none";
}
}
// ============================================
// Index (contact-sheet) thumbnail generation
// ============================================
function _loadImageEl(src) {
return new Promise((resolve) => {
const im = new Image();
im.onload = () => resolve(im);
im.onerror = () => resolve(null);
im.src = src;
});
}
async function _buildIndexImageDataUrl() {
const imgs = _lab.results.images.slice(0, MAX_RESULTS);
if (imgs.length === 0) return null;
const cols = Math.min(RESULTS_GRID_COLS, imgs.length);
const rows = Math.ceil(imgs.length / cols);
const cellSize = 128;
const canvas = document.createElement("canvas");
canvas.width = cols * cellSize;
canvas.height = rows * cellSize;
const ctx = canvas.getContext("2d");
ctx.fillStyle = "#000";
ctx.fillRect(0, 0, canvas.width, canvas.height);
for (let i = 0; i < imgs.length; i++) {
const im = await _loadImageEl(_resultImageUrl(imgs[i]));
if (!im) continue;
const col = i % cols, row = Math.floor(i / cols);
const scale = Math.max(cellSize / im.width, cellSize / im.height);
const w = im.width * scale, h = im.height * scale;
ctx.drawImage(im, col * cellSize - (w - cellSize) / 2, row * cellSize - (h - cellSize) / 2, w, h);
}
return canvas.toDataURL("image/png");
}
// ============================================
// Plan save / load / clear
// ============================================
async function _savePlan(filenameOverride, forceNewName = false) {
let filename = filenameOverride;
if (!filename) {
if (forceNewName || !_lab.planFilename) {
filename = window.prompt(t("labEnterPlanName"), forceNewName ? "" : (_lab.planFilename || ""));
if (!filename) return;
} else {
filename = _lab.planFilename;
}
}
const data = _buildPlanData(filename.replace(/\.json$/i, ""));
let indexImageBase64 = null;
try {
indexImageBase64 = await _buildIndexImageDataUrl();
} catch { /* thumbnail generation is best-effort */ }
try {
const res = await fetch("/api/wfm/lab/plans/save", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ filename, data, index_image_base64: indexImageBase64 }),
});
const json = await res.json();
if (!res.ok) throw new Error(json.error || `HTTP ${res.status}`);
_lab.planFilename = json.filename;
showToast(t("labPlanSaved"), "success");
} catch (err) {
showToast(`${t("labPlanSaveFailed")}: ${err.message}`, "error");
}
}
function _applyPlanData(filename, data) {
_lab.planFilename = filename;
_lab.note = data.note || "";
_lab.batchCount = data.batch_count || 1;
_lab.chainImage = !!data.chain_image;
_lab.sourceImageFilename = data.source_image || null;
_lab.columns = data.columns || _emptyColumns();
_lab.results = { images: (data.results?.images || []).slice(0, MAX_RESULTS) };
const noteEl = document.getElementById("wfm-lab-note");
const batchEl = document.getElementById("wfm-lab-batch-count");
const chainEl = document.getElementById("wfm-lab-chain-image");
if (noteEl) noteEl.value = _lab.note;
if (batchEl) batchEl.value = _lab.batchCount;
if (chainEl) chainEl.checked = _lab.chainImage;
const previewWrap = document.getElementById("wfm-lab-preview-wrap");
const previewImg = document.getElementById("wfm-lab-preview-img");
if (_lab.sourceImageFilename && previewImg && previewWrap) {
previewImg.src = `/view?filename=${encodeURIComponent(_lab.sourceImageFilename)}&type=input`;
previewWrap.style.display = "";
} else if (previewWrap) {
previewWrap.style.display = "none";
}
_renderAllColumns();
_renderResultsGrid();
_updateResultsSourceImage();
}
// Plan Load reads a dropped/picked .json plan file directly in the browser (no
// server round-trip needed — the browser's native file picker can't be preset to
// open in .../Workflow-Studio/lab_plan, but most browsers remember the folder
// after the user browses there once).
async function _loadPlanFromFile(file) {
try {
const text = await file.text();
const data = JSON.parse(text);
const filename = file.name.toLowerCase().endsWith(".json") ? file.name : `${file.name}.json`;
_applyPlanData(filename, data);
showToast(t("labPlanLoaded"), "success");
} catch (err) {
showToast(`${t("labPlanLoadFailed")}: ${err.message}`, "error");
}
}
// Dropping the index-image thumbnail (same basename as its .json, saved
// alongside it on the server) fetches the actual plan JSON by that filename.
async function _loadPlanFromIndexImage(file) {
const stem = file.name.replace(/\.[^.]+$/, "");
await _loadPlanFromServer(`${stem}.json`);
}
async function _loadPlanFromServer(filename) {
try {
const res = await fetch(`/api/wfm/lab/plans/content?filename=${encodeURIComponent(filename)}`);
const json = await res.json();
if (!res.ok) throw new Error(json.error || `HTTP ${res.status}`);
_applyPlanData(filename, json.data || {});
showToast(t("labPlanLoaded"), "success");
} catch (err) {
showToast(`${t("labPlanLoadFailed")}: ${err.message}`, "error");
}
}
function _clearPlan() {
if (!window.confirm(t("labConfirmClear"))) return;
_lab = _emptyLabState();
const noteEl = document.getElementById("wfm-lab-note");
const batchEl = document.getElementById("wfm-lab-batch-count");
const chainEl = document.getElementById("wfm-lab-chain-image");
if (noteEl) noteEl.value = "";
if (batchEl) batchEl.value = _lab.batchCount;
if (chainEl) chainEl.checked = false;
const previewWrap = document.getElementById("wfm-lab-preview-wrap");
if (previewWrap) previewWrap.style.display = "none";
_renderAllColumns();
_renderResultsGrid();
_updateResultsSourceImage();
}
+156 -34
View File
@@ -6,6 +6,7 @@
import { t } from "./i18n.js";
import { escapeHtml } from "./util.js";
import { comfyWorkflow } from "./comfyui-workflow.js";
// ── File size limit ───────────────────────────────────────────
const MAX_FILE_SIZE = 50 * 1024 * 1024;
@@ -192,6 +193,45 @@ function extractPrompts(wf) {
return Array.isArray(wf.nodes) ? extractPromptsLiteGraph(wf) : extractPromptsAPI(wf);
}
// LiteGraph形式: リンクを辿ってテキストを解決(ComfySwitchNode等の中継ノードにも対応)
function resolveLinkedTextInNodeSet(nodeMap, linkOrigin, linkSlot, srcId, slot, depth = 0) {
if (depth > 6) return null;
const srcNode = nodeMap.get(srcId);
if (!srcNode) return null;
const srcType = srcNode.type ?? "";
if (isPromptStylerNode(srcType)) {
const v = srcNode.widgets_values?.[slot];
return (v && typeof v === "string") ? v : null;
}
// ComfySwitchNode ("If/Else Switch") — 片方(TextGenerateなどLLMノード)は静的解決不能なため
// on_false/on_true の両方を試し、リテラルへ解決できた方を採用する。
if (srcType === "ComfySwitchNode" && Array.isArray(srcNode.inputs)) {
for (const name of ["on_false", "on_true"]) {
const inp = srcNode.inputs.find(i => i.name === name);
if (inp?.link == null) continue;
const originId = linkOrigin.get(inp.link);
const originSlot = linkSlot.get(inp.link) ?? 0;
if (originId == null) continue;
const text = resolveLinkedTextInNodeSet(nodeMap, linkOrigin, linkSlot, originId, originSlot, depth + 1);
if (text) return text;
}
return null;
}
// WFS_PromptText, PrimitiveStringMultiline 等、任意の STRING 出力ノード
const v = srcNode.widgets_values?.[slot] ?? srcNode.widgets_values?.[0];
if (v && typeof v === "string") return v;
// さらにリンクされている場合(StringReplace等の中継ノード)は追跡する
if (Array.isArray(srcNode.inputs)) {
const nextInput = srcNode.inputs.find(i => ["text", "value", "prompt", "string"].includes(i.name));
if (nextInput?.link != null) {
const originId = linkOrigin.get(nextInput.link);
const originSlot = linkSlot.get(nextInput.link) ?? 0;
if (originId != null) return resolveLinkedTextInNodeSet(nodeMap, linkOrigin, linkSlot, originId, originSlot, depth + 1);
}
}
return null;
}
// CLIPTextEncode + KSampler でプロンプト抽出(トップレベル・サブグラフ共用)
// サンプラーが見つかりテキストが取れた場合のみ非null を返す
function extractPromptsFromNodeSet(nodes, links) {
@@ -220,18 +260,8 @@ function extractPromptsFromNodeSet(nodes, links) {
if (textInput?.link != null) {
const originId = linkOrigin.get(textInput.link);
const originSlot = linkSlot.get(textInput.link) ?? 0;
const srcNode = originId != null ? nodeMap.get(originId) : null;
if (srcNode) {
const srcType = srcNode.type ?? "";
if (isPromptStylerNode(srcType)) {
const v = srcNode.widgets_values?.[originSlot];
if (v && typeof v === "string") textMap.set(n.id, v);
} else {
// WFS_PromptText, PrimitiveStringMultiline, ComfySwitchNode 等、任意の STRING 出力ノード
const v = srcNode.widgets_values?.[originSlot] ?? srcNode.widgets_values?.[0];
if (v && typeof v === "string") textMap.set(n.id, v);
}
}
const text2 = resolveLinkedTextInNodeSet(nodeMap, linkOrigin, linkSlot, originId, originSlot);
if (text2) textMap.set(n.id, text2);
}
}
}
@@ -240,15 +270,48 @@ function extractPromptsFromNodeSet(nodes, links) {
for (const n of nodes) {
if (!isSamplerNode(n.type ?? "") || !Array.isArray(n.inputs)) continue;
foundSampler = true;
for (const inp of n.inputs) {
// SamplerCustomAdvanced doesn't hold positive/negative directly — it drives a separate
// Guider node (CFGGuider/DualCFGGuider/BasicGuider) via its "guider" input. Scan that
// node's inputs instead so the loop below can find the positive/negative-role slots.
let inputsToScan = n.inputs;
const guiderInput = n.inputs.find(inp => inp.name === "guider");
if (guiderInput?.link != null) {
const guiderId = linkOrigin.get(guiderInput.link);
const guiderNode = guiderId != null ? nodeMap.get(guiderId) : null;
if (Array.isArray(guiderNode?.inputs)) inputsToScan = guiderNode.inputs;
}
for (const inp of inputsToScan) {
if (!inp || inp.link == null) continue;
const originId = linkOrigin.get(inp.link);
if (originId == null) continue;
const text = textMap.get(originId);
if (!text) continue;
const name = inp.name ?? "";
if (name === "positive" || name.startsWith("positive")) pos.add(text);
else if (name === "negative" || name.startsWith("negative")) neg.add(text);
// DualCFGGuider (HiDream E1): cond1 carries the positive-derived conditioning.
const isPos = name === "positive" || name === "cond1" || name.startsWith("positive");
const isNeg = name === "negative" || name.startsWith("negative");
if (!isPos && !isNeg) continue;
// TextEncodeMageFlowEdit / TextEncodeBooguEdit — one node carries both prompt &
// negative_prompt directly, so textMap (single text per node) can't represent both
// roles.
const srcNode = nodeMap.get(originId);
if (srcNode?.type === "TextEncodeMageFlowEdit" || srcNode?.type === "TextEncodeBooguEdit") {
const widgetIdx = isPos ? 0 : 1; // widgets_values: [prompt, negative_prompt, ...]
const text = srcNode.widgets_values?.[widgetIdx];
if (text && typeof text === "string") { if (isPos) pos.add(text); else neg.add(text); }
continue;
}
// InstructPixToPixConditioning (HiDream E1): forwards the actual text-encoder
// conditioning through its own positive/negative inputs — follow one more hop.
let resolvedOriginId = originId;
if (srcNode?.type === "InstructPixToPixConditioning" && Array.isArray(srcNode.inputs)) {
const innerInput = srcNode.inputs.find(i => i.name === (isPos ? "positive" : "negative"));
if (innerInput?.link != null) {
const innerId = linkOrigin.get(innerInput.link);
if (innerId != null) resolvedOriginId = innerId;
}
}
const text = textMap.get(resolvedOriginId);
if (!text) continue;
if (isPos) pos.add(text); else neg.add(text);
}
}
if (!foundSampler) return null;
@@ -300,7 +363,8 @@ function extractMarkdownNoteModels(wf) {
}
// API形式: リンク参照 [srcNodeId, slot] からテキストを解決
function resolveLinkedText(wf, srcId, slot) {
function resolveLinkedText(wf, srcId, slot, depth = 0) {
if (depth > 6) return null;
const src = wf[String(srcId)];
if (!src || typeof src !== "object") return null;
const ct = src.class_type ?? "";
@@ -309,13 +373,32 @@ function resolveLinkedText(wf, srcId, slot) {
const v = slot === 0 ? src.inputs?.text_positive : src.inputs?.text_negative;
return (v && typeof v === "string") ? v : null;
}
// 汎用テキストキー
// ComfySwitchNode ("If/Else Switch", on_false/on_true/switch) — Ernie Imageのプロンプト強化
// トグルなどで使われる。片方(TextGenerateなどLLMノード)は静的解決不能なため両方試し、
// リテラルへ解決できた方を採用する。
if (ct === "ComfySwitchNode") {
for (const key of ["on_false", "on_true"]) {
const v = src.inputs?.[key];
if (Array.isArray(v)) {
const text = resolveLinkedText(wf, v[0], v[1] ?? 0, depth + 1);
if (text) return text;
} else if (typeof v === "string" && v) {
return v;
}
}
return null;
}
// 汎用テキストキー("value" は PrimitiveString/PrimitiveStringMultiline)
const keys = slot === 0
? ["text_positive", "text", "text_g", "prompt"]
? ["text_positive", "text", "text_g", "prompt", "value"]
: ["text_negative", "text_l"];
for (const k of keys) {
const v = src.inputs?.[k];
if (v && typeof v === "string") return v;
if (typeof v === "string" && v) return v;
if (Array.isArray(v)) {
const text = resolveLinkedText(wf, v[0], v[1] ?? 0, depth + 1);
if (text) return text;
}
}
return null;
}
@@ -330,7 +413,9 @@ function extractPromptsAPI(wf) {
const textMap = new Map();
for (const [id, n] of Object.entries(wf)) {
if (!n || !isTextEncoderNode(n.class_type ?? "")) continue;
const raw = n.inputs?.text ?? n.inputs?.text_g ?? null;
// "prompt" — TextEncodeQwenImageEdit(Plus)/TextEncodeBooguEdit and similar Image Edit
// model text encoders use this key instead of "text"/"text_g".
const raw = n.inputs?.text ?? n.inputs?.text_g ?? n.inputs?.prompt ?? null;
if (raw && typeof raw === "string") {
textMap.set(id, raw);
} else if (Array.isArray(raw)) {
@@ -344,12 +429,37 @@ function extractPromptsAPI(wf) {
for (const n of Object.values(wf)) {
if (!n || !isSamplerNode(n.class_type ?? "")) continue;
foundSampler = true;
for (const [key, val] of Object.entries(n.inputs ?? {})) {
// SamplerCustomAdvanced doesn't hold positive/negative directly — it drives a separate
// Guider node (CFGGuider/DualCFGGuider/BasicGuider) via its "guider" input. Scan that
// node's inputs instead so the loop below can find the positive/negative-role keys.
let inputsToScan = n.inputs ?? {};
if (Array.isArray(n.inputs?.guider)) {
const guiderNode = wf[String(n.inputs.guider[0])];
if (guiderNode?.inputs) inputsToScan = guiderNode.inputs;
}
for (const [key, val] of Object.entries(inputsToScan)) {
if (!Array.isArray(val)) continue;
const text = textMap.get(String(val[0]));
// DualCFGGuider (HiDream E1): cond1 carries the positive-derived conditioning.
const isPos = key === "positive" || key === "cond1" || key.startsWith("positive");
const isNeg = key === "negative" || key.startsWith("negative");
if (!isPos && !isNeg) continue;
// TextEncodeMageFlowEdit / TextEncodeBooguEdit — one node carries both prompt &
// negative_prompt directly, so textMap (single text per node) can't represent both
// roles.
const srcNode = wf[String(val[0])];
if (srcNode?.class_type === "TextEncodeMageFlowEdit" || srcNode?.class_type === "TextEncodeBooguEdit") {
const text = isPos ? srcNode.inputs?.prompt : srcNode.inputs?.negative_prompt;
if (text && typeof text === "string") { if (isPos) pos.add(text); else neg.add(text); }
continue;
}
// InstructPixToPixConditioning (HiDream E1): forwards the actual text-encoder
// conditioning through its own positive/negative inputs — follow one more hop.
const resolvedId = srcNode?.class_type === "InstructPixToPixConditioning" && Array.isArray(srcNode.inputs?.[isPos ? "positive" : "negative"])
? String(srcNode.inputs[isPos ? "positive" : "negative"][0])
: String(val[0]);
const text = textMap.get(resolvedId);
if (!text) continue;
if (key === "positive" || key.startsWith("positive")) pos.add(text);
else if (key === "negative" || key.startsWith("negative")) neg.add(text);
if (isPos) pos.add(text); else neg.add(text);
}
}
if (!foundSampler || (pos.size === 0 && neg.size === 0)) { const all = [...textMap.values()].filter(t => t && t.trim()); return { positives: [], negatives: [], texts: all }; }
@@ -446,15 +556,27 @@ function parseFooocusMetadata(raw) {
}
// ── Master extractAllMetadata ─────────────────────────────────
async function extractAllMetadata(file) {
export async function extractAllMetadata(file) {
const name = file.name.toLowerCase();
const isJSON = file.type === "application/json" || name.endsWith(".json");
const isWebP = file.type === "image/webp" || name.endsWith(".webp");
function fromWorkflow(wf, source) {
async function fromWorkflow(originalWf, source) {
let wf = originalWf;
// サブグラフを持つワークフローは、外側のサブグラフノードに実際に設定された値
// (ユーザーが見ている値)が内部ノードのwidgets_valuesへ反映されていないことがある
// (テンプレートの古いデフォルト値のまま)。convertUiToApi() はこの注入も含めて
// 正しく解決するため、そちらを経由してから抽出する。通常のワークフローには影響しない。
if (Array.isArray(wf?.nodes) && wf.definitions?.subgraphs?.length > 0) {
try {
const apiWf = await comfyWorkflow.convertUiToApi(wf);
if (apiWf && Object.keys(apiWf).length > 0) wf = apiWf;
} catch { /* 変換失敗時は元のUI形式のまま抽出(既存ロジックにフォールバック) */ }
}
const base = { source, checkpoints: extractCheckpoints(wf), vaes: extractVAEs(wf), diffusionModels: extractDiffusionModels(wf), textEncoders: extractTextEncoders(wf), loras: extractLoRAs(wf), ...extractPrompts(wf) };
// MarkdownNote からモデル情報を補完(subgraph形式の flux/qwen/z-image など)
const mdm = extractMarkdownNoteModels(wf);
// MarkdownNote からモデル情報を補完(subgraph形式の flux/qwen/z-image など)。
// API変換後は nodes 情報が失われるため、常に元のUI形式ワークフローから抽出する。
const mdm = extractMarkdownNoteModels(originalWf);
if (mdm) {
if (!base.checkpoints.length) base.checkpoints = mdm.checkpoints;
if (!base.vaes.length) base.vaes = mdm.vaes;
@@ -467,20 +589,20 @@ async function extractAllMetadata(file) {
if (isJSON) {
let wf; try { wf = JSON.parse(sanitizeJSON(await file.text())); } catch { return null; }
return wf ? fromWorkflow(wf, "comfyui") : null;
return wf ? await fromWorkflow(wf, "comfyui") : null;
}
if (isWebP) {
const exif = await readWebPEXIFChunk(file);
if (!exif) return null;
const wf = extractWorkflowFromEXIF(exif);
return wf ? fromWorkflow(wf, "comfyui") : null;
return wf ? await fromWorkflow(wf, "comfyui") : null;
}
// PNG
const chunks = await readAllPNGTextChunks(file);
if (!chunks) return null;
if (chunks.prompt) { let wf; try { wf = JSON.parse(sanitizeJSON(chunks.prompt)); } catch { return null; } return wf ? fromWorkflow(wf, "comfyui") : null; }
if (chunks.workflow) { let wf; try { wf = JSON.parse(sanitizeJSON(chunks.workflow)); } catch { return null; } return wf ? fromWorkflow(wf, "comfyui") : null; }
if (chunks.prompt) { let wf; try { wf = JSON.parse(sanitizeJSON(chunks.prompt)); } catch { return null; } return wf ? await fromWorkflow(wf, "comfyui") : null; }
if (chunks.workflow) { let wf; try { wf = JSON.parse(sanitizeJSON(chunks.workflow)); } catch { return null; } return wf ? await fromWorkflow(wf, "comfyui") : null; }
if (chunks.fooocus_scheme === "fooocus" && chunks.parameters) {
const f = parseFooocusMetadata(chunks.parameters);
+7 -1
View File
@@ -130,7 +130,7 @@ function applyToGenUI(modelName, modelType) {
};
comfyUI.currentWorkflow[nodeId].inputs.text = `<lora:${stem}:1:1>`;
} else {
comfyUI.currentWorkflow[nodeId].inputs.lora_name = modelName;
comfyUI.currentWorkflow[nodeId].inputs.lora_name = comfyEditor.resolveLoraName(modelName);
}
// Disable all Stack models and switch to Single tab
@@ -1386,6 +1386,7 @@ function openDetailModal(modelName) {
? `<button class="wfm-btn wfm-btn-sm" id="wfm-modal-genui-model" title="${t("modelsGenUITitle")}">${t("modelsGenUIBtn")}</button>`
: "")}
<button class="wfm-btn wfm-btn-sm wfm-btn-danger" id="wfm-modal-model-delete" style="margin-left:auto;">${t("modelsDelete")}</button>
<button class="wfm-btn wfm-btn-sm" id="wfm-modal-model-close">${t("close")}</button>
</div>
</div>
</div>`;
@@ -1446,6 +1447,11 @@ function openDetailModal(modelName) {
applyEmbeddingToPrompt(modelName, "negative");
});
// Close button (連続作業時にXボタンまでマウス移動しなくて済むように)
document.getElementById("wfm-modal-model-close")?.addEventListener("click", () => {
closeModal();
});
// Delete model button
document.getElementById("wfm-modal-model-delete")?.addEventListener("click", async () => {
const confirmMsg = t("modelBulkDeleteConfirm").replace("{count}", "1");
+3 -3
View File
@@ -4,7 +4,7 @@
import { showToast } from "./app.js";
import { t } from "./i18n.js";
import { readJsonStorage } from "./util.js";
import { readJsonStorage, getAiBackendDefaultUrl } from "./util.js";
// ============================================
// State
@@ -390,7 +390,7 @@ let _promptAiBackendForModels = null;
function getPromptAiConfig() {
const s = loadPromptAiSettings();
const backend = s.backend || "ollama";
const url = (s.backendUrl || (backend === "ollama" ? "http://localhost:11434" : "http://localhost:1234")).replace(/\/$/, "");
const url = (s.backendUrl || getAiBackendDefaultUrl(backend)).replace(/\/$/, "");
return { backend, url };
}
@@ -418,7 +418,7 @@ async function chatWithAi(model, messages) {
if (!res.ok) throw new Error(`HTTP ${res.status}`);
return (await res.json()).message?.content || "";
} else {
// LM Studio: convert Ollama-style messages (with .images) to OpenAI content arrays
// LM Studio / Lemonade (OpenAI-compatible): convert Ollama-style messages (with .images) to OpenAI content arrays
const openAiMessages = messages.map(msg => {
if (msg.images?.length) {
return {
+62 -6
View File
@@ -6,7 +6,7 @@ import { showToast } from "./app.js";
import { comfyUI } from "./comfyui-client.js";
import { t, getLang, getSummaryLang, setLang, setSummaryLang, getLanguageOptions, getSummaryLanguageOptions } from "./i18n.js";
import { getSettings, readJsonStorage } from "./util.js";
import { getSettings, readJsonStorage, getAiBackendDefaultUrl } from "./util.js";
const SETTINGS_KEY = "wfm_settings";
@@ -637,6 +637,30 @@ export async function initSettingsTab() {
<div id="wfm-settings-url-status" style="font-size:12px;margin-top:4px;"></div>
</details>
<!-- Default Checkpoint -->
<details class="wfm-settings-section">
<summary class="wfm-settings-summary">${t("defaultCheckpointSettings")}</summary>
<div class="wfm-form-group">
<label style="display:flex;align-items:center;gap:6px;cursor:pointer;">
<input type="checkbox" id="wfm-settings-default-ckpt-enabled" ${serverSettings.default_checkpoint_enabled ? "checked" : ""}>
<span id="wfm-settings-default-ckpt-enable-label">${t("defaultCheckpointEnable")}</span>
</label>
</div>
<div class="wfm-form-group">
<label id="wfm-settings-default-ckpt-model-label">${t("defaultCheckpointModel")}</label>
<div style="display:flex;gap:8px;">
<select class="wfm-select" id="wfm-settings-default-ckpt-select" style="flex:1;">
<option value="">${t("selectModel")}</option>
</select>
<button class="wfm-btn wfm-btn-sm" id="wfm-settings-default-ckpt-refresh">${t("refresh")}</button>
</div>
<small id="wfm-settings-default-ckpt-hint" style="color:var(--wfm-text-secondary);font-size:11px;display:block;margin-top:4px;">
${t("defaultCheckpointHint")}
</small>
</div>
<button class="wfm-btn wfm-btn-primary wfm-btn-sm" id="wfm-settings-default-ckpt-save">${t("save")}</button>
</details>
<!-- AI Assistant Settings (Prompt Tab) -->
<details class="wfm-settings-section">
<summary class="wfm-settings-summary">${t("ollamaSettings")}</summary>
@@ -649,6 +673,9 @@ export async function initSettingsTab() {
<label class="wfm-ai-radio-label">
<input type="radio" name="wfm-prompt-ai-backend" value="lmstudio"> LM Studio
</label>
<label class="wfm-ai-radio-label">
<input type="radio" name="wfm-prompt-ai-backend" value="lemonade"> Lemonade
</label>
</div>
</div>
<div class="wfm-form-group">
@@ -1101,14 +1128,14 @@ export async function initSettingsTab() {
const promptAiUrlEl = document.getElementById("wfm-settings-prompt-ai-url");
if (promptAiUrlEl) {
promptAiUrlEl.value = promptAiSaved.backendUrl || "";
promptAiUrlEl.placeholder = promptAiBackendSaved === "ollama" ? "http://localhost:11434" : "http://localhost:1234";
promptAiUrlEl.placeholder = getAiBackendDefaultUrl(promptAiBackendSaved);
}
// Backend change → update URL placeholder
// Backend change → switch URL to the new backend's default
document.querySelectorAll('input[name="wfm-prompt-ai-backend"]').forEach(r => {
r.addEventListener("change", () => {
const backend = document.querySelector('input[name="wfm-prompt-ai-backend"]:checked')?.value || "ollama";
if (promptAiUrlEl) promptAiUrlEl.placeholder = backend === "ollama" ? "http://localhost:11434" : "http://localhost:1234";
if (promptAiUrlEl) promptAiUrlEl.value = getAiBackendDefaultUrl(backend);
});
});
@@ -1117,7 +1144,7 @@ export async function initSettingsTab() {
const select = document.getElementById("wfm-settings-prompt-ai-model");
if (!select) return;
const backend = document.querySelector('input[name="wfm-prompt-ai-backend"]:checked')?.value || "ollama";
const url = (promptAiUrlEl?.value.trim() || (backend === "ollama" ? "http://localhost:11434" : "http://localhost:1234")).replace(/\/$/, "");
const url = (promptAiUrlEl?.value.trim() || getAiBackendDefaultUrl(backend)).replace(/\/$/, "");
try {
let models = [];
if (backend === "ollama") {
@@ -1142,7 +1169,7 @@ export async function initSettingsTab() {
document.getElementById("wfm-settings-prompt-ai-test")?.addEventListener("click", async () => {
const statusEl = document.getElementById("wfm-settings-prompt-ai-status");
const backend = document.querySelector('input[name="wfm-prompt-ai-backend"]:checked')?.value || "ollama";
const url = (promptAiUrlEl?.value.trim() || (backend === "ollama" ? "http://localhost:11434" : "http://localhost:1234")).replace(/\/$/, "");
const url = (promptAiUrlEl?.value.trim() || getAiBackendDefaultUrl(backend)).replace(/\/$/, "");
if (statusEl) { statusEl.textContent = t("aiStatusConnecting"); statusEl.style.color = "var(--wfm-text-secondary)"; }
try {
let count = 0;
@@ -1210,6 +1237,35 @@ export async function initSettingsTab() {
statusEl.style.color = ok ? "var(--wfm-success)" : "var(--wfm-danger)";
});
// Default Checkpoint
const defaultCkptSelect = document.getElementById("wfm-settings-default-ckpt-select");
async function loadDefaultCkptOptions() {
if (!defaultCkptSelect) return;
try {
const list = await comfyUI.fetchCheckpoints();
const saved = serverSettings.default_checkpoint_name || "";
defaultCkptSelect.innerHTML = `<option value="">${t("selectModel")}</option>` +
(list || []).map((m) => `<option value="${m}" ${m === saved ? "selected" : ""}>${m}</option>`).join("");
} catch { /* ignore */ }
}
loadDefaultCkptOptions();
document.getElementById("wfm-settings-default-ckpt-refresh")?.addEventListener("click", loadDefaultCkptOptions);
document.getElementById("wfm-settings-default-ckpt-save")?.addEventListener("click", async () => {
const enabled = !!document.getElementById("wfm-settings-default-ckpt-enabled")?.checked;
const ckptName = defaultCkptSelect?.value || "";
try {
await saveServerSettings({ default_checkpoint_enabled: enabled, default_checkpoint_name: ckptName });
serverSettings.default_checkpoint_enabled = enabled;
serverSettings.default_checkpoint_name = ckptName;
showToast(t("aiToastSettingsSaved"), "success");
} catch (err) {
showToast(`${t("saveError")}: ${err.message}`, "error");
}
});
// Test Eagle URL (via server proxy to avoid CORS)
document.getElementById("wfm-settings-test-eagle")?.addEventListener("click", async () => {
const urlInput = document.getElementById("wfm-settings-eagle-url");
+54
View File
@@ -27,6 +27,60 @@ export function getSettings() {
return readJsonStorage("wfm_settings");
}
// AIバックエンド(Ollama/LM Studio/Lemonade)ごとのデフォルトURL
export const AI_BACKEND_DEFAULT_URLS = {
ollama: "http://localhost:11434",
lmstudio: "http://localhost:1234",
lemonade: "http://localhost:13305",
};
export function getAiBackendDefaultUrl(backend) {
return AI_BACKEND_DEFAULT_URLS[backend] || AI_BACKEND_DEFAULT_URLS.ollama;
}
// ============================================
// Eagle Auto-Save
// ============================================
export function getEagleSettings() {
const s = getSettings();
return {
url: s.eagleUrl || "http://localhost:41595",
autoSave: !!s.eagleAutoSave,
};
}
export async function saveToEagle(imageUrl, name, tags = [], fileInfo = null) {
const eagle = getEagleSettings();
if (!eagle.autoSave) return;
try {
const res = await fetch("/api/wfm/eagle/add", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({
eagleUrl: eagle.url,
url: imageUrl,
name,
tags: ["wfm-comfyui", ...tags],
// SVG はサーバー側でローカルパス解決(addFromPath)するために必要
filename: fileInfo?.filename || "",
subfolder: fileInfo?.subfolder || "",
type: fileInfo?.type || "output",
// comfyui-tosvg の Save SVG String など、絶対パスが既知の場合に渡す
localPath: fileInfo?.localPath || "",
}),
});
const data = await res.json();
if (data.status === "success") {
console.log("[Eagle] Saved:", name);
} else {
console.warn("[Eagle] Save failed:", data.message);
}
} catch (err) {
console.warn("[Eagle] Save error:", err.message);
}
}
/**
* 検索inputにオーバーレイXボタンを設定する。
* @param {string} inputId - 検索inputのID
+91 -3
View File
@@ -51,7 +51,7 @@ function sendToCanvas(workflowData) {
// window.opener経由でComfyUIキャンバスに直接ロード(推奨)
if (window.opener && typeof window.opener.wfmReceiveWorkflow === "function") {
window.opener.wfmReceiveWorkflow(workflowData);
showToast(t("workflowSentToCanvas"), "success");
showToast(t("workflowSentToCanvasDirect"), "success");
return;
}
// フォールバック: localStorage + タイトルドラッグ(UI形式のみ)
@@ -270,6 +270,85 @@ async function getRawWorkflow(filename) {
return await res.json();
}
// ============================================
// AI Summary — structured extraction (not raw JSON dump)
// ============================================
// analyzeWorkflow() の結果をコンパクトなテキストに整形する。
// 生JSONをそのままLLMに渡すと、MarkdownNoteの長文やUI座標情報などのノイズで
// 文字数制限に達し、肝心のノード構成情報(サブグラフ内含む)が切り捨てられやすい。
function _buildStructuredSummaryText(analysis) {
const lines = [];
if (analysis.checkpoint_nodes.length) {
lines.push(`Checkpoint: ${analysis.checkpoint_nodes.map((n) => n.ckpt_name).filter(Boolean).join(", ")}`);
}
if (analysis.diffusion_model_nodes.length) {
lines.push(`Diffusion Model (UNET): ${analysis.diffusion_model_nodes.map((n) => n.unet_name).filter(Boolean).join(", ")}`);
}
if (analysis.text_encoder_nodes.length) {
lines.push(`Text Encoder (CLIP): ${analysis.text_encoder_nodes.map((n) => [n.clip_name1, n.clip_name2].filter(Boolean).join("+")).join(", ")}`);
}
if (analysis.vae_nodes.length) {
lines.push(`VAE: ${analysis.vae_nodes.map((n) => n.vae_name).filter(Boolean).join(", ")}`);
}
if (analysis.lora_nodes.length) {
lines.push(`LoRA: ${analysis.lora_nodes.map((n) => {
if (n.is_lora_manager) return "(LoraManager)";
const strengths = n.strength_clip !== undefined
? `model:${n.strength_model}, clip:${n.strength_clip}`
: `model:${n.strength_model}`;
return `${n.lora_name} (${strengths})`;
}).join(", ")}`);
}
if (analysis.controlnet_nodes.length) {
lines.push(`ControlNet: ${analysis.controlnet_nodes.map((n) => n.control_net_name).filter(Boolean).join(", ")}`);
}
if (analysis.hypernetwork_nodes.length) {
lines.push(`Hypernetwork: ${analysis.hypernetwork_nodes.map((n) => n.hypernetwork_name).filter(Boolean).join(", ")}`);
}
const positives = analysis.prompt_nodes.filter((n) => n.role === "positive").map((n) => n.text).filter(Boolean);
const negatives = analysis.prompt_nodes.filter((n) => n.role === "negative").map((n) => n.text).filter(Boolean);
if (positives.length) lines.push(`Positive Prompt: ${positives.join(" / ")}`);
if (negatives.length) lines.push(`Negative Prompt: ${negatives.join(" / ")}`);
if (analysis.sampler_nodes.length) {
const s = analysis.sampler_nodes[0];
lines.push(`Sampler: steps=${s.steps}, cfg=${s.cfg}, sampler=${s.sampler_name}, scheduler=${s.scheduler}, denoise=${s.denoise}`);
}
if (analysis.latent_nodes.length) {
const l = analysis.latent_nodes[0];
lines.push(`Latent size: ${l.width ?? "?"}x${l.height ?? "?"}, batch=${l.batch_size ?? "?"}`);
}
if (analysis.all_nodes.length) {
const nodeTypes = [...new Set(analysis.all_nodes.map((n) => n.type))];
lines.push(`Node types used (${analysis.all_nodes.length} nodes total): ${nodeTypes.join(", ")}`);
}
return lines.join("\n");
}
// ワークフロー(UI/API/サブグラフ入りいずれの形式でも)から要約用テキストを組み立てる。
// 変換・解析に失敗した場合は、従来通り生JSON先頭部分にフォールバックする。
async function _buildSummarySourceText(wfJson, filename) {
try {
const fmt = comfyWorkflow.detectFormat(wfJson, filename);
let apiWf = wfJson;
if (fmt === "ui") {
apiWf = await comfyWorkflow.convertUiToApi(wfJson);
} else if (fmt !== "api") {
return JSON.stringify(wfJson).substring(0, 4000);
}
const analysis = comfyWorkflow.analyzeWorkflow(apiWf);
const text = _buildStructuredSummaryText(analysis);
return text || JSON.stringify(wfJson).substring(0, 4000);
} catch {
return JSON.stringify(wfJson).substring(0, 4000);
}
}
// ============================================
// Rendering Helpers
// ============================================
@@ -1128,11 +1207,20 @@ function openDetailModal(wf) {
btn.textContent = t("summarizing");
try {
const wfJson = await getRawWorkflow(wf.filename);
const promptText = getSummaryPrompt() + JSON.stringify(wfJson).substring(0, 4000);
const sourceText = await _buildSummarySourceText(wfJson, wf.filename);
const promptText = getSummaryPrompt() + sourceText;
const aiCfg = readJsonStorage("wfm_prompt_ai_settings", {});
if (aiCfg.backend && aiCfg.backend !== "ollama") {
throw new Error(t("summarizeOllamaOnly"));
}
const chatRes = await fetch("/api/wfm/ollama/chat", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ messages: [{ role: "user", content: promptText }] }),
body: JSON.stringify({
url: aiCfg.backendUrl || undefined,
model: aiCfg.model || undefined,
messages: [{ role: "user", content: promptText }],
}),
});
const chatData = await chatRes.json();
if (chatData.error) throw new Error(chatData.error);
+599 -64
View File
@@ -9,6 +9,7 @@
<link rel="stylesheet" href="/wfm_static/css/gallery-tab.css">
<link rel="stylesheet" href="/wfm_static/css/tagger-tab.css">
<link rel="stylesheet" href="/wfm_static/css/image-edit-tab.css">
<link rel="stylesheet" href="/wfm_static/css/lab-tab.css">
</head>
<body>
<!-- Header -->
@@ -310,6 +311,7 @@
<button class="wfm-gen-subtab-btn" data-subtab="settings">Settings</button>
<button class="wfm-gen-subtab-btn" data-subtab="feeder">Feeder</button>
<button class="wfm-gen-subtab-btn" data-subtab="batch">Batch</button>
<button class="wfm-gen-subtab-btn" data-subtab="lab">Lab</button>
<button id="wfm-gen-save-btn" class="wfm-btn wfm-btn-sm wfm-btn-primary" style="margin-left:auto;" title="Save current workflow to Workflow tab">Save</button>
</div>
@@ -501,6 +503,150 @@
</div>
</div>
<!-- Tab: Lab — experimental I2I batch generation with per-column keyframes -->
<div id="wfm-gen-subtab-lab" class="wfm-gen-subtab-content">
<div class="wfm-lab-subtab-nav">
<button class="wfm-lab-subtab-btn active" data-lab-subtab="setting">Setting</button>
<button class="wfm-lab-subtab-btn" data-lab-subtab="results">Results</button>
<button class="wfm-lab-subtab-btn" data-lab-subtab="planjson">Plan JSON</button>
</div>
<!-- Setting panel -->
<div id="wfm-lab-panel-setting" class="wfm-lab-panel active">
<div class="wfm-lab-setting-layout">
<!-- Left: source image + plan load/clear -->
<div class="wfm-lab-pane wfm-lab-left">
<div class="wfm-lab-pane-header">Image</div>
<div class="wfm-i2i-preview-wrap" id="wfm-lab-preview-wrap" style="display:none;">
<img class="wfm-i2i-preview-img" id="wfm-lab-preview-img" alt="">
</div>
<div class="wfm-i2i-drop-zone" id="wfm-lab-drop-zone">
<label class="wfm-i2i-drop-label">
<input type="file" id="wfm-lab-file-input" accept="image/*" style="display:none;">
Drop image here or click to select
</label>
</div>
<label class="wfm-lab-checkbox-label">
<input type="checkbox" id="wfm-lab-chain-image">
Use generated image for next
</label>
<div class="wfm-lab-pane-header" style="margin-top:10px;">Plan</div>
<div class="wfm-i2i-drop-zone" id="wfm-lab-plan-drop-zone">
<label class="wfm-i2i-drop-label">
<input type="file" id="wfm-lab-plan-file-input" accept="application/json,.json,image/png,.png" style="display:none;">
Drop plan (.json/.png) here or click to select
</label>
</div>
<div class="wfm-lab-side-btns">
<button id="wfm-lab-plan-clear-btn" class="wfm-btn">Plan Clear</button>
</div>
</div>
<!-- Center: 4 keyframe columns -->
<div class="wfm-lab-pane wfm-lab-center">
<div class="wfm-lab-columns">
<div class="wfm-lab-column" data-col="checkpoint">
<div class="wfm-lab-col-header">
<span>checkpoint</span>
<div class="wfm-lab-col-btns">
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-add" data-col="checkpoint" title="Add keyframe">+</button>
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-remove" data-col="checkpoint" title="Remove last keyframe">-</button>
</div>
</div>
<div class="wfm-lab-col-cells" id="wfm-lab-col-cells-checkpoint"></div>
</div>
<div class="wfm-lab-column" data-col="vae">
<div class="wfm-lab-col-header">
<span>vae</span>
<div class="wfm-lab-col-btns">
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-add" data-col="vae" title="Add keyframe">+</button>
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-remove" data-col="vae" title="Remove last keyframe">-</button>
</div>
</div>
<div class="wfm-lab-col-cells" id="wfm-lab-col-cells-vae"></div>
</div>
<div class="wfm-lab-column" data-col="prompt">
<div class="wfm-lab-col-header">
<span>プロンプト</span>
<div class="wfm-lab-col-btns">
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-add" data-col="prompt" title="Add keyframe">+</button>
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-remove" data-col="prompt" title="Remove last keyframe">-</button>
</div>
</div>
<div class="wfm-lab-col-cells" id="wfm-lab-col-cells-prompt"></div>
</div>
<div class="wfm-lab-column" data-col="ksampler">
<div class="wfm-lab-col-header">
<span>Ksampler</span>
<div class="wfm-lab-col-btns">
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-add" data-col="ksampler" title="Add keyframe">+</button>
<button type="button" class="wfm-btn wfm-btn-xs wfm-lab-col-remove" data-col="ksampler" title="Remove last keyframe">-</button>
</div>
</div>
<div class="wfm-lab-col-cells" id="wfm-lab-col-cells-ksampler"></div>
</div>
</div>
</div>
<!-- Right: run controls -->
<div class="wfm-lab-pane wfm-lab-right">
<div style="display:flex;gap:6px;">
<button id="wfm-lab-run-btn" class="wfm-btn wfm-btn-primary" style="flex:1;">Run</button>
<button id="wfm-lab-cancel-btn" class="wfm-btn wfm-btn-danger" style="display:none;">Cancel</button>
</div>
<button id="wfm-lab-pause-btn" class="wfm-btn" style="width:100%;margin-top:6px;" disabled>Pause</button>
<div class="wfm-gen-progress-container" style="margin-top:8px;">
<div class="wfm-gen-progress-track">
<div id="wfm-lab-progress-bar" class="wfm-gen-progress-bar"></div>
</div>
<span id="wfm-lab-progress-text" class="wfm-gen-progress-text">Ready</span>
</div>
<div class="wfm-lab-field-row">
<label>Batch:</label>
<input type="number" id="wfm-lab-batch-count" class="wfm-input" value="4" min="1" max="50">
</div>
<div class="wfm-lab-pane-header" style="margin-top:12px;">Note</div>
<textarea id="wfm-lab-note" class="wfm-input wfm-lab-note" rows="6"></textarea>
<button id="wfm-lab-plan-save-btn" class="wfm-btn wfm-btn-primary" style="width:100%;margin-top:8px;">Plan Save</button>
<button id="wfm-lab-plan-saveas-btn" class="wfm-btn" style="width:100%;margin-top:6px;">Save As</button>
</div>
</div>
</div>
<!-- Results panel -->
<div id="wfm-lab-panel-results" class="wfm-lab-panel">
<div class="wfm-lab-results-layout">
<div class="wfm-lab-pane wfm-lab-results-left">
<div class="wfm-lab-pane-header">Image</div>
<img id="wfm-lab-results-source-img" class="wfm-i2i-preview-img" style="display:none;" alt="">
</div>
<div class="wfm-lab-pane wfm-lab-results-center">
<div class="wfm-lab-pane-header">Results</div>
<div id="wfm-lab-results-grid" class="wfm-lab-results-grid">
<p class="wfm-placeholder">No results yet</p>
</div>
</div>
</div>
</div>
<!-- Plan JSON panel -->
<div id="wfm-lab-panel-planjson" class="wfm-lab-panel">
<div class="wfm-lab-planjson-toolbar">
<button type="button" id="wfm-lab-planjson-refresh" class="wfm-btn wfm-btn-sm">Refresh</button>
<button type="button" id="wfm-lab-planjson-apply" class="wfm-btn wfm-btn-primary wfm-btn-sm">Apply to Setting</button>
</div>
<div class="wfm-json-container">
<pre id="wfm-lab-planjson-highlight" class="wfm-json-highlight"></pre>
<textarea id="wfm-lab-planjson-editor" class="wfm-json-editor" spellcheck="false"></textarea>
</div>
</div>
</div>
<!-- Tab: Feeder — full-width: settings(left) + library(center) -->
<div id="wfm-gen-subtab-feeder" class="wfm-gen-subtab-content">
<div class="wfm-feeder-layout">
@@ -751,6 +897,7 @@
<span class="wfm-gen-rawjson-label">Raw JSON</span>
<button id="wfm-gen-apply-raw-btn" class="wfm-btn wfm-btn-sm">Apply</button>
</div>
<div id="wfm-gen-rawjson-bypass-note" class="wfm-gen-rawjson-bypass-note" style="display:none;"></div>
<div class="wfm-rawjson-search">
<input type="text" id="wfm-gen-raw-search" class="wfm-rawjson-search-input" placeholder="Search...">
<span id="wfm-gen-raw-search-count" class="wfm-rawjson-search-count"></span>
@@ -1035,6 +1182,7 @@
<button class="wfm-help-nav-item" data-help-page="workflow">Workflow Tab</button>
<button class="wfm-help-nav-item" data-help-page="generate">GenerateUI Tab</button>
<button class="wfm-help-nav-item" data-help-page="feeder">Feeder subtab</button>
<button class="wfm-help-nav-item" data-help-page="lab">Lab subtab</button>
<button class="wfm-help-nav-item" data-help-page="prompt">Prompt Tab</button>
<button class="wfm-help-nav-item" data-help-page="metadata">Metadata Tab</button>
<button class="wfm-help-nav-item" data-help-page="settings">Settings Tab</button>
@@ -1056,8 +1204,11 @@
<div class="wfm-help-content">
<div class="wfm-help-page active" id="wfm-help-page-about">
<div class="wfm-help-article-header">
<h2 id="wfm-help-about-title">About</h2>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-about-title">About</h3>
<h3 id="wfm-help-about-card-getting-started-title">Getting Started</h3>
<p id="wfm-help-about-desc">A centralized control UI for managing ComfyUI workflow JSON files, generating images via API, assisting with prompt creation, and browsing/organizing nodes.</p>
<ul>
<li id="wfm-help-about-1">Install via ComfyUI Manager or git clone to custom_nodes</li>
@@ -1067,51 +1218,94 @@
</div>
<div class="wfm-help-page" id="wfm-help-page-workflow">
<div class="wfm-help-article-header">
<h2 id="wfm-help-wf-title">Workflow Tab</h2>
<button type="button" class="wfm-btn wfm-btn-sm wfm-help-jump-btn" data-jump-tab="workflow">Open tab &rarr;</button>
</div>
<div class="wfm-help-card">
<h3>Workflow Tab</h3>
<h3 id="wfm-help-wf-card-browse-title">Browsing &amp; Filtering</h3>
<ul>
<li id="wfm-help-wf-1">Switch between Thumbnail, Card, and Table view modes</li>
<li id="wfm-help-wf-2">Search, category filter, favorites filter, and group filter</li>
<li id="wfm-help-wf-3">Create, rename, delete groups and assign/remove workflows</li>
<li id="wfm-help-wf-4">Import JSON/PNG files via button or drag &amp; drop</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-wf-card-groups-title">Groups &amp; Badges</h3>
<ul>
<li id="wfm-help-wf-3">Create, rename, delete groups and assign/remove workflows</li>
<li id="wfm-help-wf-7">Badge management: add, rename, delete badges with custom colors shared with the Models tab (⚙ Badge button)</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-wf-card-panel-title">Side Panel &amp; Detail Modal</h3>
<ul>
<li id="wfm-help-wf-5">Side panel: thumbnail, JSON viewer (format badge: UI/API/App), clipboard copy, group management</li>
<li id="wfm-help-wf-6">Detail modal: rename, favorite, thumbnail change, badge assignment, tags, memo, AI summary, send to canvas, load in GenerateUI, set as default, delete</li>
<li id="wfm-help-wf-7">Badge management: add, rename, delete badges with custom colors shared with the Models tab (⚙ Badge button)</li>
</ul>
</div>
</div>
<div class="wfm-help-page" id="wfm-help-page-generate">
<div class="wfm-help-article-header">
<h2 id="wfm-help-gen-title">GenerateUI Tab</h2>
<button type="button" class="wfm-btn wfm-btn-sm wfm-help-jump-btn" data-jump-tab="generate">Open tab &rarr;</button>
</div>
<div class="wfm-help-card">
<h3>GenerateUI Tab</h3>
<h3 id="wfm-help-gen-card-connect-title">Connecting &amp; Loading Workflows</h3>
<ul>
<li id="wfm-help-gen-1">Connect/disconnect ComfyUI and check connection status</li>
<li id="wfm-help-gen-2">Load workflows from Workflow tab (App format .app.json not supported); Reset Workflow button re-reads the current workflow file from disk and reloads the editor; <b>Save</b> button (right end of the tab bar) saves the current workflow — including any edits made in the editor — as a new .json file to the Workflow tab; a filename dialog appears with the current workflow name as the default; <b>Style</b> checkbox and dropdown (next to Reset Workflow): enable to apply a Fooocus-style JSON style to the positive and negative prompts at generation time — style files are loaded from <code>user/default/Workflow-Studio/style/*.json</code>; the style's <code>{prompt}</code> placeholder is replaced with the original prompt, or the style text is appended if no placeholder exists</li>
<li id="wfm-help-gen-2">Load workflows from Workflow tab (subgraph-containing workflows are supported, e.g. Flux.2 / Qwen-Image / Z-Image / Mage-Flow templates; only ComfyUI's simplified App format [.app.json / Linear Mode] is not); Reset Workflow button re-reads the current workflow file from disk and reloads the editor; <b>Save</b> button (right end of the tab bar) saves the current workflow — including any edits made in the editor — as a new .json file to the Workflow tab; a filename dialog appears with the current workflow name as the default; <b>Style</b> checkbox and dropdown (next to Reset Workflow): enable to apply a Fooocus-style JSON style to the positive and negative prompts at generation time — style files are loaded from <code>user/default/Workflow-Studio/style/*.json</code>; the style's <code>{prompt}</code> placeholder is replaced with the original prompt, or the style text is appended if no placeholder exists</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-gen-card-tabs-title">Tab Layout</h3>
<ul>
<li id="wfm-help-gen-3">5-tab layout — Input (Prompt + Image), Model, Settings, Feeder, Batch — Input/Model/Settings each include a Raw JSON column for instant preview and direct editing</li>
<li id="wfm-help-gen-4">Input tab: inner tabs — <b>Prompt</b> and <b>Image</b> (drag-and-drop upload); Prompt tab has Positive Prompt, Negative Prompt, and an <b>Embeddings</b> selector at the bottom — select a model, set Weight (default 1.0), then click <b>Paste</b> to insert <code>(embedding:Name:weight)</code> at the cursor position of the last focused textarea (defaults to Positive if neither is focused)</li>
<li id="wfm-help-gen-4">Input tab: inner tabs — <b>Prompt</b> and <b>Image</b> (drag-and-drop upload); Prompt tab has Positive Prompt, Negative Prompt, and an <b>Embeddings</b> selector at the bottom — select a model, set Weight (default 1.0), then click <b>Paste</b> to insert <code>(embedding:Name:weight)</code> at the cursor position of the last focused textarea (defaults to Positive if neither is focused); a <b>↺</b> button next to each Apply button reverts the textarea to the node's currently applied value; select text (or just place the cursor on a word/parenthesis block) and press <b>Ctrl+↑/↓</b> to adjust its emphasis weight in <code>(text:weight)</code> syntax by ±0.05 — the parentheses are removed automatically when the weight returns to 1.0</li>
<li id="wfm-help-gen-5">Model tab: Checkpoint, VAE, LoRA (Single/Stack tabs), ControlNet, Diffusion Model (UNETLoader / UnetLoaderGGUF / LoaderGGUF), Text Encoder (CLIPLoader / DualCLIPLoader / ClipLoaderGGUF / DualClipLoaderGGUF — type and device selectors; DualCLIP shows two clip selectors), Hypernetwork (with Strength field) selectors with filter; LoRA Stack — Apply writes all active LoRAs to the target node and simultaneously inserts LoRA syntax and CivitAI trigger words into the Positive prompt; re-applying updates the prompt by removing inactive LoRAs and re-adding active ones</li>
<li id="wfm-help-gen-6">Settings tab: KSampler and Latent Image side by side, each at 50% width</li>
<li id="wfm-help-gen-7">Raw JSON always visible in the right column of each tab — edit directly and Apply to reload the workflow</li>
<li id="wfm-help-gen-7">Raw JSON always visible in the right column of each tab — edit directly and Apply to reload the workflow; if the loaded workflow has Bypass or Mute nodes, a note listing them appears above the search bar (Bypass nodes are excluded with their wires reconnected around them; Mute nodes are excluded with no reconnection, matching ComfyUI itself)</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-gen-card-seed-title">Seed &amp; Generation</h3>
<ul>
<li id="wfm-help-gen-8">Seed control: random, fixed, increment, decrement — seed input and mode selector stacked vertically for readability</li>
<li id="wfm-help-gen-9">Generate, progress display, stop, and view results</li>
<li id="wfm-help-gen-10">Eagle integration: auto-save generated images to Eagle</li>
<li id="wfm-help-gen-10">Eagle integration: auto-save generated images to Eagle (SVG output supported too — both the standard SaveSVGNode and comfyui-tosvg's Save SVG String node)</li>
<li id="wfm-help-gen-18">Alt+Click any Apply button (Positive Prompt / Checkpoint / KSampler) to Apply &amp; Generate in one step — applies the parameter to the workflow then immediately queues a generation; only fires when the target node exists in the loaded workflow</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-gen-card-batchsetup-title">Batch Tab — Setup</h3>
<ul>
<li id="wfm-help-gen-11">Batch tab — enable one batch type at a time by checking the checkbox in the Batch Queue column header; Generate then runs through all queued items sequentially with Pause/Resume and Stop controls</li>
<li id="wfm-help-gen-12">Batch tab — Left pane has 4 tabs: <b>Checkpoints</b> (folder tree with Filter/All/None; (root) header checkbox selects all), <b>Sampler</b> (KSampler sampler_name list with (root) checkbox), <b>Scheduler</b> (KSampler scheduler list with (root) checkbox), <b>Style</b> (flat list of all styles loaded from <code>Workflow-Studio/style/</code> with All/None buttons); All/None toolbar buttons available for each tab</li>
<li id="wfm-help-gen-13">Batch tab — Center pane: group-based selection with inner tabs (Checkpoint | Lora | Prompt | Workflow); Checkpoint tab shows groups defined in the Models tab — check a group header to select all its members, or expand ▶ to check individual models; group membership always reflects the current Models tab state</li>
<li id="wfm-help-gen-14">Batch tab — Right pane (Batch Queue): 7 columns — Checkpoint, Lora, Prompt, Workflow, Sampler, Scheduler, <b>Style</b>; each column has an enable checkbox; only one type active at a time; count shown per column</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-gen-card-batchtypes-title">Batch Tab — Batch Types</h3>
<ul>
<li id="wfm-help-gen-15">Sampler/Scheduler batch: select one or more samplers or schedulers from the left pane, enable the column in Batch Queue, then Generate to run each value through the KSampler node sequentially; sampler/scheduler lists are fetched from ComfyUI (requires connection)</li>
<li id="wfm-help-gen-17">Style batch: select styles in the left pane Style tab, enable the Style column in Batch Queue, then Generate — each selected style is applied in sequence to the positive and negative prompts; styles are applied to workflow copies so the loaded workflow is not modified; style files are re-read each time the page loads from <code>user/default/Workflow-Studio/style/*.json</code></li>
<li id="wfm-help-gen-19">Lora batch: for each LoRA, its syntax (&lt;lora:name:strength_model:strength_clip&gt;) and CivitAI trained words are automatically appended to the Positive prompt — rebuilt from the original prompt each time, not accumulated; the prompt is automatically restored to its pre-batch state when the batch completes or is stopped; if a selected LoRA is not yet recognized by ComfyUI's model list, a warning toast is shown (Refresh or restart ComfyUI)</li>
<li id="wfm-help-gen-16">SPA-side wildcard expansion (A1111-style): when prompt text in non-ImpactWildcard nodes (e.g. CLIPTextEncode) contains __name__ syntax, the SPA expands it at generation time by randomly picking a line from the matching file in the WFS wildcard folder; nested wildcards are re-expanded up to 5 passes; unresolved wildcards are passed through unchanged; ImpactWildcardEncode/Processor nodes are skipped (handled server-side by Impact Pack); works in both single and batch generation</li>
</ul>
</div>
</div>
<div class="wfm-help-page" id="wfm-help-page-feeder">
<div class="wfm-help-card">
<h3 id="wfm-help-feeder-title">GenerateUI Tab — Feeder subtab</h3>
<p id="wfm-help-feeder-desc">Two modes switchable via the [Image Loop] / [Gallery] toggle at the top of the left pane.</p>
<div class="wfm-help-article-header">
<h2 id="wfm-help-feeder-title">GenerateUI Tab — Feeder subtab</h2>
<button type="button" class="wfm-btn wfm-btn-sm wfm-help-jump-btn" data-jump-tab="generate">Open tab &rarr;</button>
</div>
<p id="wfm-help-feeder-desc" style="margin-bottom:12px;">Two modes switchable via the [Image Loop] / [Gallery] toggle at the top of the left pane.</p>
<h4 id="wfm-help-feeder-imgloop-title" style="margin:10px 0 4px;color:var(--wfm-accent)">Image Loop mode</h4>
<div class="wfm-help-card">
<h3 id="wfm-help-feeder-imgloop-title">Image Loop mode</h3>
<p id="wfm-help-feeder-imgloop-desc">Requires the comfyui-image-feeder custom node. Controls ImageFeeder nodes and runs continuous generation loops over an image library stored in user/default/image-loop-data/.</p>
<ul>
<li id="wfm-help-feeder-1">Left pane — Node settings: select the target ImageFeeder node from the dropdown; edit all node parameters (Directory, Sort Mode, Index, Start/End Index, Batch Size, Seed, Use Selection); click Apply to write changes to the loaded workflow</li>
@@ -1124,8 +1318,10 @@
<li id="wfm-help-feeder-8">Seed during Run: uses the right-pane seed setting (Random / Fixed / Increment / Decrement) — the ImageFeeder's own Seed field controls random sort order only</li>
<li id="wfm-help-feeder-9">Index sync: after each generation the node returns the next index via WebSocket; the Index field updates automatically so the display stays in sync</li>
</ul>
</div>
<h4 id="wfm-help-feeder-gal-title" style="margin:14px 0 4px;color:var(--wfm-accent)">Gallery mode</h4>
<div class="wfm-help-card">
<h3 id="wfm-help-feeder-gal-title">Gallery mode</h3>
<p id="wfm-help-feeder-gal-desc">Uses the built-in WFS_GalleryFeeder node (no external plugin required). Feeds images from a Gallery group into a continuous generation loop.</p>
<ul>
<li id="wfm-help-feeder-gal-1">Left pane — Node: select a WFS_GalleryFeeder node from the dropdown and click Apply to link it to the workflow; select the source group (defaults to <b>__Feeder__</b>), Sort Mode, Index (current image position), and Seed</li>
@@ -1138,17 +1334,76 @@
</div>
</div>
<div class="wfm-help-page" id="wfm-help-page-prompt">
<div class="wfm-help-page" id="wfm-help-page-lab">
<div class="wfm-help-article-header">
<h2 id="wfm-help-lab-title">GenerateUI Tab — Lab subtab</h2>
<button type="button" class="wfm-btn wfm-btn-sm wfm-help-jump-btn" data-jump-tab="generate">Open tab &rarr;</button>
</div>
<p id="wfm-help-lab-desc" style="margin-bottom:12px;">Experimental I2I batch generation. Runs the workflow currently loaded in GenerateUI N times, letting Checkpoint / VAE / Prompt / KSampler each change independently starting at a chosen iteration. Two subtabs: Setting and Results.</p>
<div class="wfm-help-card">
<h3>Prompt Tab</h3>
<h3 id="wfm-help-lab-card-columns-title">Setting subtab — Image &amp; Columns</h3>
<ul>
<li id="wfm-help-lab-1">Left pane — Image: drop or click to select an I2I source image; it is uploaded to ComfyUI's input folder and used for every iteration unless "Use generated image for next" is checked</li>
<li id="wfm-help-lab-2">Left pane — Use generated image for next: from iteration 2 onward, feeds the previous iteration's first output image back in as the I2I source instead of the original dropped image (iteration 1 always uses the original)</li>
<li id="wfm-help-lab-3">Center pane — 4 independent columns: Checkpoint, VAE, Prompt, KSampler; each column keeps its own list of keyframes rather than sharing a row grid</li>
<li id="wfm-help-lab-4">+ / − per column: + appends a new keyframe at the next free iteration number (up to the Batch count) and opens its edit modal immediately; − removes the last keyframe (iteration #1 can never be removed)</li>
<li id="wfm-help-lab-5">Click a cell to edit it: iteration #1 sets the baseline value (leave it blank to keep the loaded workflow's own setting); iteration #2+ also lets you choose which iteration it starts applying from, plus a "revert to #1's setting" checkbox</li>
<li id="wfm-help-lab-6">Effective value at iteration N: the latest keyframe with iteration ≤ N is used and carries forward until the next keyframe changes it; "revert to #1" reuses iteration #1's value (or the workflow default if #1 is blank) instead of specifying a new one</li>
<li id="wfm-help-lab-7">Lab never edits the workflow shown in Input/Model/Settings — every iteration runs on a fresh clone of the loaded workflow, so keyframes here never affect the other subtabs</li>
<li id="wfm-help-lab-8">Prompt cell editor extras: <b>Get from GenerateUI</b> fills Positive/Negative from the workflow currently loaded in GenerateUI; <b>Get from Image</b> extracts a prompt from the image currently loaded in Lab's own Image drop zone (same detection as the Metadata tab; no separate file picker); <b>Style</b> appends whichever style is currently selected in the Style checkbox/dropdown at the top of the GenerateUI toolbar to the Positive/Negative text below, comma-separated after any existing text (never clears it) — enable that checkbox and pick a style first, Lab doesn't have its own separate style picker</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-lab-card-plan-title">Setting subtab — Run &amp; Plan files</h3>
<ul>
<li id="wfm-help-lab-plan-1">Right pane — Batch: number of iterations to run; Note: free-text memo saved together with the plan</li>
<li id="wfm-help-lab-plan-2">Run / Pause / Cancel: Run starts the batch loop; Pause/Resume freezes it between iterations; Cancel interrupts the current generation and stops the loop</li>
<li id="wfm-help-lab-plan-3">Plan Save vs Save As: Plan Save silently overwrites the currently loaded plan (or asks for a name the first time); Save As always asks for a new name, even while a plan is already loaded</li>
<li id="wfm-help-lab-plan-4">Plan Load: drop a plan's .json file, or its .png index-image thumbnail, onto the PLAN box (or click it to browse) — a dropped .json is read directly; a dropped .png fetches the matching .json (same filename) from the server</li>
<li id="wfm-help-lab-plan-5">Plan Clear resets the Setting tab to an empty plan (asks for confirmation first)</li>
<li id="wfm-help-lab-plan-6">Plan files are stored in <code>user/default/Workflow-Studio/lab_plan/</code> as <code>&lt;name&gt;.json</code> plus a <code>&lt;name&gt;.png</code> index image — a contact sheet of up to 9 result thumbnails (3 per row) generated automatically whenever a plan with results is saved</li>
<li id="wfm-help-lab-plan-7">Eagle auto-save (configured in the Settings tab) applies to every image Lab generates, the same as GenerateUI's own Generate button</li>
<li id="wfm-help-lab-plan-8">Plan JSON subtab: shows the current Setting tab's plan as raw JSON; <b>Refresh</b> re-reads it from the Setting tab (discarding any unapplied text edits), <b>Apply to Setting</b> parses your edits and writes them back into the Setting tab (columns, note, batch count, chain-image, source image, results) — the same effect as loading that JSON as a plan file, without needing to save it first</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-lab-card-results-title">Results subtab</h3>
<ul>
<li id="wfm-help-lab-results-1">Left pane shows the source image used for the run</li>
<li id="wfm-help-lab-results-2">Center pane shows up to 9 generated images in generation order; click a thumbnail to view it enlarged</li>
<li id="wfm-help-lab-results-3">Loading a saved plan restores its Results grid from the image list recorded in the plan file</li>
</ul>
</div>
</div>
<div class="wfm-help-page" id="wfm-help-page-prompt">
<div class="wfm-help-article-header">
<h2 id="wfm-help-prompt-title">Prompt Tab</h2>
<button type="button" class="wfm-btn wfm-btn-sm wfm-help-jump-btn" data-jump-tab="prompt">Open tab &rarr;</button>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-prompt-card-ai-title">AI Assistant &amp; Translation</h3>
<ul>
<li id="wfm-help-prompt-1">AI assistant (Ollama): model selection, chat for prompt consultation, image attachment (vision models)</li>
<li id="wfm-help-prompt-2">Apply AI responses to GenerateUI prompts</li>
<li id="wfm-help-prompt-3">Translation: JA&#8596;EN, ZH&#8596;EN</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-prompt-card-presets-title">Presets</h3>
<ul>
<li id="wfm-help-prompt-4">Preset management: create, edit, positive/negative prompt clipboard copy (PP/NP)</li>
<li id="wfm-help-prompt-5">Preset Manager: browse all presets, favorites, and group-based filtering</li>
<li id="wfm-help-prompt-6">Group management: create groups, assign/remove presets, delete groups</li>
<li id="wfm-help-prompt-7">GenUI Set: apply preset prompts directly to GenerateUI</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-prompt-card-wildcards-title">Wildcards</h3>
<ul>
<li id="wfm-help-prompt-8">Wildcard toolbar: one-click buttons to insert wildcard syntax ({|}, {n$|}, __|__, &lt;lora:&gt;, etc.); wraps selected text</li>
<li id="wfm-help-prompt-9">Wildcard file manager: create/edit/delete .txt/.yaml wildcard files; click filename to insert __filename__ at cursor</li>
</ul>
@@ -1156,71 +1411,140 @@
</div>
<div class="wfm-help-page" id="wfm-help-page-metadata">
<div class="wfm-help-article-header">
<h2 id="wfm-help-metadata-title">Metadata Tab</h2>
<button type="button" class="wfm-btn wfm-btn-sm wfm-help-jump-btn" data-jump-tab="metadata">Open tab &rarr;</button>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-metadata-title">Metadata Tab</h3>
<h3 id="wfm-help-metadata-card-overview-title">Overview</h3>
<p id="wfm-help-metadata-desc">Drop a ComfyUI-generated PNG/WebP or workflow JSON to instantly extract and view the embedded model and prompt information.</p>
<ul>
<li id="wfm-help-metadata-1">Left column: drop zone (image preview for PNG/WebP) and file info; click or drop to load</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-metadata-card-extracted-title">Extracted Information</h3>
<ul>
<li id="wfm-help-metadata-2">Center column: Checkpoint, VAE, Diffusion Model, and Text Encoder lists extracted from the workflow</li>
<li id="wfm-help-metadata-3">Right column: LoRA list (with strength values) and Prompt list (click to view full text below)</li>
<li id="wfm-help-metadata-4">Prompt actions — Copy: copy to clipboard; GenUI:P/N: set GenerateUI positive/negative prompt; Prompt:P/N: set Prompt tab preset positive/negative</li>
<li id="wfm-help-metadata-5">Supported: ComfyUI PNG/WebP/JSON (standard + Flux.2 / Qwen-Image / Z-Image subgraph workflows), SD WebUI, SD Forge, Fooocus. Model extraction covers UNETLoader, UnetLoaderGGUF, UNETLoaderGGUF (e.g. HiDream GGUF), CLIPLoader, DualCLIPLoader, TripleCLIPLoader, and QuadrupleCLIPLoader (e.g. HiDream 4-CLIP).</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-metadata-card-formats-title">Supported Formats</h3>
<ul>
<li id="wfm-help-metadata-5">Supported: ComfyUI PNG/WebP/JSON (standard + Flux.2 / Qwen-Image / Z-Image / Mage-Flow subgraph workflows), SD WebUI, SD Forge, Fooocus. Model extraction covers UNETLoader, UnetLoaderGGUF, UNETLoaderGGUF (e.g. HiDream GGUF), CLIPLoader, DualCLIPLoader, TripleCLIPLoader, and QuadrupleCLIPLoader (e.g. HiDream 4-CLIP).</li>
</ul>
</div>
</div>
<div class="wfm-help-page" id="wfm-help-page-settings">
<div class="wfm-help-article-header">
<h2 id="wfm-help-settings-title">Settings Tab</h2>
<button type="button" class="wfm-btn wfm-btn-sm wfm-help-jump-btn" data-jump-tab="settings">Open tab &rarr;</button>
</div>
<div class="wfm-help-card">
<h3>Settings Tab</h3>
<h3 id="wfm-help-settings-card-general-title">General</h3>
<ul>
<li id="wfm-help-settings-1">UI language and summary language</li>
<li id="wfm-help-settings-2">Theme selection (13 presets) with customization: color overrides, background patterns (stripes, polka dot, checkerboard, SVG tiling), and font selection (16 Google Fonts including Japanese display fonts)</li>
<li id="wfm-help-settings-3">Workflow data folder path</li>
<li id="wfm-help-settings-9">All sections are collapsible accordion panels</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-settings-card-connections-title">Connections</h3>
<ul>
<li id="wfm-help-settings-4">ComfyUI connection URL and test</li>
<li id="wfm-help-settings-5">Ollama URL, default model, and connection test</li>
<li id="wfm-help-settings-6">Default workflow setting</li>
<li id="wfm-help-settings-7">Eagle integration URL and auto-save toggle</li>
<li id="wfm-help-settings-8">Data Management: export all plugin data to JSON / import to restore</li>
<li id="wfm-help-settings-9">All sections are collapsible accordion panels</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-settings-card-workflow-title">Workflow Defaults</h3>
<ul>
<li id="wfm-help-settings-3">Workflow data folder path</li>
<li id="wfm-help-settings-6">Default workflow setting</li>
<li id="wfm-help-settings-10">Wildcard Integration: link WFS wildcard dir to ComfyUI-Impact-Pack wildcards (junction/symlink); existing files migrated automatically</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-settings-card-editor-title">Editor Customization</h3>
<ul>
<li id="wfm-help-settings-11">Text Size: one slider (10–28 px) adjusts font size for all prompt and chat textareas at once — Generate UI positive/negative prompts, AI Assistant chat input, Preset positive/negative, Wildcard prompt and file editor, and Metadata prompt full preview; takes effect immediately and saved with Save Settings</li>
<li id="wfm-help-settings-12">RAW JSON Colors: customize the 6 syntax highlight colors for the Raw JSON editor in Generate UI — Default Text, Name/Scheduler, Title, Width/Height, Prompt/Text, Image/File; changes apply immediately on color pick; Reset Defaults restores the original color scheme</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-settings-card-misc-title">Data &amp; Misc</h3>
<ul>
<li id="wfm-help-settings-8">Data Management: export all plugin data to JSON / import to restore</li>
<li id="wfm-help-settings-13">CivitAI Host: choose between civitai.com (SFW only) and civitai.red (unrestricted) — determines which site opens when clicking a model link in the Models tab CivitAI panel</li>
</ul>
</div>
</div>
<div class="wfm-help-page" id="wfm-help-page-nodes">
<div class="wfm-help-article-header">
<h2 id="wfm-help-nodes-title">Nodes Tab</h2>
<button type="button" class="wfm-btn wfm-btn-sm wfm-help-jump-btn" data-jump-tab="nodes">Open tab &rarr;</button>
</div>
<div class="wfm-help-card">
<h3>Nodes Tab</h3>
<h3 id="wfm-help-nodes-card-browse-title">Browse &amp; Organize</h3>
<ul>
<li id="wfm-help-nodes-1">Node Browser: search by name/description/alias/tag, filter by category, package, tag, group, favorites</li>
<li id="wfm-help-nodes-2">Card and Table view modes with pagination</li>
<li id="wfm-help-nodes-3">Favorite nodes and add custom tags for organization</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-nodes-card-groups-title">Groups &amp; Sets</h3>
<ul>
<li id="wfm-help-nodes-4">Create, rename, delete node groups and assign/remove nodes</li>
<li id="wfm-help-nodes-5">Side panel: Details (class name, package, category, description, flags), I/O Spec (inputs/outputs with types and defaults), Groups management</li>
<li id="wfm-help-nodes-6">Node Sets: create reusable node collections with descriptions, tags, and link definitions between nodes</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-nodes-card-panel-title">Side Panel &amp; Multi-select</h3>
<ul>
<li id="wfm-help-nodes-5">Side panel: Details (class name, package, category, description, flags), I/O Spec (inputs/outputs with types and defaults), Groups management</li>
<li id="wfm-help-nodes-7">Multi-select: Ctrl+click to toggle individual nodes, Shift+click for range selection; bulk action bar appears with add to group / remove from group / create &amp; add group / bulk favorite / unfavorite</li>
</ul>
</div>
</div>
<div class="wfm-help-page" id="wfm-help-page-gallery">
<div class="wfm-help-article-header">
<h2 id="wfm-help-gallery-title">Gallery Tab</h2>
<button type="button" class="wfm-btn wfm-btn-sm wfm-help-jump-btn" data-jump-tab="gallery">Open tab &rarr;</button>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-gallery-title">Gallery Tab</h3>
<h3 id="wfm-help-gallery-card-browse-title">Browsing</h3>
<ul>
<li id="wfm-help-gallery-1">Browse images in the ComfyUI output folder — set the folder path in Settings &gt; Gallery Output Folder</li>
<li id="wfm-help-gallery-2">3-column layout: folder tree (left) | image grid (center) | detail panel (right)</li>
<li id="wfm-help-gallery-3">Thumbnail and Table view modes; double-click any image to open fullscreen lightbox</li>
<li id="wfm-help-gallery-4">Toolbar filters: favorites (★), text search (filename / tag / prompt), tag filter, group filter, sort by date/name</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-gallery-card-folder-title">Folder &amp; Selection</h3>
<ul>
<li id="wfm-help-gallery-5">Folder tree: click to load images, expand with ▶; "+ New" creates a subfolder inside the selected folder, "Del" deletes it with all contents</li>
<li id="wfm-help-gallery-6">Multi-select with Ctrl+click — bulk bar: select group → 'Add to Group' / 'Remove from Group'; 'Favorite All' / 'Unfavorite All'; 'Compare' (2–4 images); 'Move To...'; '<b>Export</b>' (downloads all selected images as a ZIP file); 'Delete File'</li>
<li id="wfm-help-gallery-15"><b>F button</b> (cyan overlay, top-left of each thumbnail): toggle the image in/out of the <b>__Feeder__</b> group with a single click; active state stays visible (cyan) when the image is already in the group; use this to quickly queue images for the Feeder tab Gallery mode</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-gallery-card-detail-title">Detail Panel</h3>
<ul>
<li id="wfm-help-gallery-7">Detail panel — Info tab: filename, size, date, tags (add/remove), memo; <b>download icon</b> (on image hover) to download the single image; "Move To..." moves the image to another folder, "Delete File" removes it permanently</li>
<li id="wfm-help-gallery-8">Detail panel — JSON tab: displays workflow JSON from PNG embedded data (prompt / workflow keys) or from metadata saved by the Generate UI tab; 'Copy &amp; Send Canvas' button copies to clipboard and stores the workflow for title-drag to canvas</li>
<li id="wfm-help-gallery-9">Detail panel — Groups tab: create, assign, remove, rename, and delete groups per image; the <b>__Feeder__</b> group is reserved (shown with 🔒) and cannot be renamed or deleted — rename and delete buttons are disabled when it is selected</li>
<li id="wfm-help-gallery-15"><b>F button</b> (cyan overlay, top-left of each thumbnail): toggle the image in/out of the <b>__Feeder__</b> group with a single click; active state stays visible (cyan) when the image is already in the group; use this to quickly queue images for the Feeder tab Gallery mode</li>
<li id="wfm-help-gallery-10">Workflow auto-save: images generated in the Generate UI tab automatically have their workflow saved to gallery metadata and shown in the JSON tab</li>
<li id="wfm-help-gallery-11">Supports PNG (tEXt/iTXt), JPEG, WebP, GIF; workflow extraction reads ComfyUI prompt and workflow keys embedded in PNG metadata</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-gallery-card-actions-title">Actions Toolbar</h3>
<ul>
<li id="wfm-help-gallery-12"><b>Metadata</b> button (green, in the detail panel tab bar): opens the selected image in the Metadata tab for full embedded-data inspection; Alt+click on any image thumbnail has the same effect</li>
<li id="wfm-help-gallery-13"><b>Load GenUI</b> button (blue, in the detail panel tab bar): loads the embedded ComfyUI workflow from the selected image directly into the GenerateUI tab and switches to it; shows a warning toast if no workflow is embedded or the format is not supported</li>
<li id="wfm-help-gallery-14"><b>Tagger</b> button (purple, in the detail panel action row): opens the selected image directly in the Tagger tab's Single mode for instant tagging</li>
@@ -1228,21 +1552,52 @@
<li id="wfm-help-gallery-17"><b>Send GenUI Image</b> button (toolbar, next to Image Edit): uploads the selected image to ComfyUI and sets it as the input for the first LoadImage node in the GenerateUI tab; automatically switches to GenerateUI → Input → Image; requires a workflow with at least one LoadImage node to be loaded first</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-gallery-card-formats-title">Formats &amp; Auto-save</h3>
<ul>
<li id="wfm-help-gallery-10">Workflow auto-save: images generated in the Generate UI tab automatically have their workflow saved to gallery metadata and shown in the JSON tab</li>
<li id="wfm-help-gallery-11">Supports PNG (tEXt/iTXt), JPEG, WebP, GIF; workflow extraction reads ComfyUI prompt and workflow keys embedded in PNG metadata</li>
</ul>
</div>
</div>
<div class="wfm-help-page" id="wfm-help-page-models">
<div class="wfm-help-article-header">
<h2 id="wfm-help-models-title">Models Tab</h2>
<button type="button" class="wfm-btn wfm-btn-sm wfm-help-jump-btn" data-jump-tab="models">Open tab &rarr;</button>
</div>
<div class="wfm-help-card">
<h3>Models Tab</h3>
<h3 id="wfm-help-models-card-browse-title">Browsing</h3>
<ul>
<li id="wfm-help-models-1">Browse installed models: Checkpoint, LoRA, VAE, ControlNet, UNET, TextEncoder, Hypernetwork, Embedding with sub-tab switching</li>
<li id="wfm-help-models-2">Thumbnail and Table view modes with pagination; Table view shows Type and Base Model columns sourced from CivitAI data alongside filename, subdirectory, and extension; <b>column headers are clickable to sort</b> — click once for ascending (▲), again for descending (▼), a third time to clear the sort; the <b>E/D</b> column sorts by enable/disable status</li>
<li id="wfm-help-models-3">Search, tag filter, group filter, favorites filter, and status filter (All / Enabled only / Disabled only)</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-models-card-civitai-title">Side Panel &amp; CivitAI</h3>
<ul>
<li id="wfm-help-models-4">Side panel: opens to CivitAI tab by default when a model is selected; Info (file path, tags, memo), Groups management, CivitAI integration</li>
<li id="wfm-help-models-5">CivitAI integration: fetch model info by SHA256 hash, batch fetch per model type</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-models-card-apply-title">Apply &amp; Detail</h3>
<ul>
<li id="wfm-help-models-6">Detail modal: preview image, CivitAI info (base model, trained words, tags), thumbnail change — upload any image format to replace the preview; changes take effect immediately without restarting ComfyUI; broken/empty preview files are automatically skipped; Delete button permanently removes the model file and all associated sidecar files</li>
<li id="wfm-help-models-7">Group management: create, rename, delete groups and assign/remove models; Checkpoint and LoRA tabs support B (Batch) and S (Stack) quick-assign buttons per model in both card and table views</li>
<li id="wfm-help-models-8">GenUI Model button: apply the selected model to the corresponding node in GenerateUI's current workflow (Checkpoint / LoRA / VAE / ControlNet / UNET / TextEncoder / Hypernetwork); <b>Embedding</b> tab shows <b>GenUI PP</b> / <b>GenUI NP</b> buttons instead — appends <code>(embedding:Name:1.0)</code> to the Positive or Negative prompt of the loaded workflow</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-models-card-groups-title">Groups &amp; Badges</h3>
<ul>
<li id="wfm-help-models-7">Group management: create, rename, delete groups and assign/remove models; Checkpoint and LoRA tabs support B (Batch) and S (Stack) quick-assign buttons per model in both card and table views</li>
<li id="wfm-help-models-9">User-defined badges: assign free-label badges with custom colors shared with the Workflow tab</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-models-card-bulk-title">Enable/Disable &amp; Bulk Operations</h3>
<ul>
<li id="wfm-help-models-10">Enable/Disable models: toggle visibility in ComfyUI by renaming file extension (.disabled suffix). Disable per model (⏸ button on each card) or per group (Enable All / Disable All in Group panel). Changes take effect after ComfyUI refresh.</li>
<li id="wfm-help-models-11">Multi-select &amp; bulk operations: click Select (green) to enter selection mode, then check multiple models; the bulk action bar is organized into three rows — <b>Group row:</b> select an existing group and Add/Remove, or type a new name and Create &amp; Add; <b>Badge row:</b> select a badge and +Badge / −Badge to apply or remove; <b>File row:</b> select a destination subfolder (or type a new folder name) and Move to relocate model files with all sidecar files (.preview.png, .json, .civitai.info, etc.), Delete Files to permanently remove selected models; header row provides Deselect All and ★/☆ Favorite toggles</li>
<li id="wfm-help-models-12">After moving or deleting models, ComfyUI may fail to load them because it caches the old file paths. Perform a Hard Reset from the ComfyUI menu (Queue → Hard Reset) or restart ComfyUI to refresh the model cache.</li>
@@ -1251,80 +1606,152 @@
</div>
<div class="wfm-help-page" id="wfm-help-page-sidepanel">
<div class="wfm-help-article-header">
<h2 id="wfm-help-sidepanel-title">Workflow Studio Library (ComfyUI Side Panel)</h2>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-sidepanel-title">Workflow Studio Library (ComfyUI Side Panel)</h3>
<h3 id="wfm-help-sidepanel-card-tabs-title">Tabs Overview</h3>
<ul>
<li id="wfm-help-sidepanel-1">Open from the Workflow Studio Library button in the ComfyUI toolbar</li>
<li id="wfm-help-sidepanel-2">Workflows tab: All / ★ Favorites / Groups sub-tabs; ★ shown for favorites in All view</li>
<li id="wfm-help-sidepanel-3">Nodes tab: All / ★ Favorites / Groups / Sets / 📂 Category / 🧩 Package sub-tabs; Category and Package show a dropdown to filter nodes</li>
<li id="wfm-help-sidepanel-11">Models tab: All / ★ Favorites / Groups / By Type sub-tabs</li>
<li id="wfm-help-sidepanel-4">Prompts tab: browse prompt presets with All/Favorites/Categories sub-tabs</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-sidepanel-card-dnd-title">Drag &amp; Drop / Interaction</h3>
<ul>
<li id="wfm-help-sidepanel-5">Drag &amp; drop workflows onto the canvas to load them</li>
<li id="wfm-help-sidepanel-6">Drag &amp; drop nodes/node sets onto the canvas to place them</li>
<li id="wfm-help-sidepanel-7">Drag &amp; drop prompt presets to create WFS_PromptText nodes with positive/negative prompts</li>
<li id="wfm-help-sidepanel-8">Copy individual positive (P) or negative (N) prompts from sidebar items</li>
<li id="wfm-help-sidepanel-9">Double-click items to load/place without dragging</li>
<li id="wfm-help-sidepanel-10">Search within each sub-tab to quickly find items</li>
<li id="wfm-help-sidepanel-12">⚙ Theme button (header): customize panel background, text, border colors — saved to localStorage</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-sidepanel-card-info-title">Information (I) tab</h3>
<ul>
<li id="wfm-help-sidepanel-13">I tab (Information): drop a ComfyUI PNG/WebP/JSON to inspect model, LoRA, and prompt metadata in the side panel — sub-tabs: model / lora / Prompts; supports UnetLoaderGGUF and QuadrupleCLIPLoader node types</li>
<li id="wfm-help-sidepanel-14">Information tab — drag items to canvas: model sub-tab places the loader node (Checkpoint → CheckpointLoaderSimple, VAE → VAELoader, Diffusion Model → UNETLoader, Text Encoder → CLIPLoader); double-click also places at canvas center</li>
<li id="wfm-help-sidepanel-15">Information tab — LoRA sub-tab: drag individual LoRA to place LoraLoader; "Multiple LORA" section at bottom places all LoRAs in a single Lora Loader (LoraManager) node; Prompts sub-tab: drag a prompt to place CLIPTextEncode node with text pre-filled; click prompt to view full text and copy</li>
<li id="wfm-help-sidepanel-16">AI TOOL tab: Translation, Chat, TOOLS, and Settings sub-tabs powered by Ollama or LM Studio; Chat supports multi-turn conversations; TOOLS includes VLM image analysis and wildcard generation; settings shared with the SPA AI TOOL tab via localStorage</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-sidepanel-card-ai-title">AI TOOL tab</h3>
<ul>
<li id="wfm-help-sidepanel-16">AI TOOL tab: Translation, Chat, TOOLS, and Settings sub-tabs powered by Ollama, LM Studio, or Lemonade; Chat supports multi-turn conversations; TOOLS includes VLM image analysis and wildcard generation; settings shared with the SPA AI TOOL tab via localStorage</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-sidepanel-card-nav-title">Customization &amp; Navigation</h3>
<ul>
<li id="wfm-help-sidepanel-12">⚙ Theme button (header): customize panel background, text, border colors — saved to localStorage</li>
<li id="wfm-help-sidepanel-17">Title drag (Send to Canvas): after clicking 'Send to Canvas' (Workflow tab) or 'Copy &amp; Send Canvas' (Gallery tab), the 'Workflow Studio Library' title turns blue with a green ● — drag it onto the canvas to load the workflow; title resets automatically after loading</li>
</ul>
</div>
</div>
<div class="wfm-help-page" id="wfm-help-page-aitool">
<div class="wfm-help-article-header">
<h2 id="wfm-help-ai-title">AI TOOL Tab</h2>
<button type="button" class="wfm-btn wfm-btn-sm wfm-help-jump-btn" data-jump-tab="ai">Open tab &rarr;</button>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-ai-title">AI TOOL Tab</h3>
<ul>
<li id="wfm-help-ai-1">4-pane layout — Translation | Chat | TOOLS | Settings — all panes are always visible simultaneously</li>
<li id="wfm-help-ai-2">Translation pane: translate text between Japanese, English, Chinese, or a custom Free language using Ollama or LM Studio; ⇄ swap button swaps both language selectors and text content; selections are saved automatically</li>
<li id="wfm-help-ai-3">Chat pane: multi-turn conversation with the LLM; Enter to send a message, Shift+Enter for a newline; Clear button resets the conversation history</li>
<li id="wfm-help-ai-4">TOOLS pane — VLM: drop an image (PNG/JPG/WebP) and select a task (Describe Image, Create Prompt, Create Tags), then click Run to analyze with a vision model; result shown with Copy button</li>
<li id="wfm-help-ai-5">TOOLS pane — Wildcards: select "Create wildcards" from the dropdown, enter a category name and count, click Run to generate plain-text wildcard entries one per line</li>
<li id="wfm-help-ai-6">Settings pane: choose backend (Ollama / LM Studio), set API URL, test connection, select model, configure Free language names; settings are shared with the Library panel's A tab via localStorage</li>
</ul>
<h3 id="wfm-help-ai-card-layout-title">Layout</h3>
<p id="wfm-help-ai-1">4-pane layout — Translation | Chat | TOOLS | Settings — all panes are always visible simultaneously</p>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-ai-card-translate-title">Translation pane</h3>
<p id="wfm-help-ai-2">Translation pane: translate text between Japanese, English, Chinese, or a custom Free language using Ollama, LM Studio, or Lemonade; ⇄ swap button swaps both language selectors and text content; selections are saved automatically</p>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-ai-card-chat-title">Chat pane</h3>
<p id="wfm-help-ai-3">Chat pane: multi-turn conversation with the LLM; Enter to send a message, Shift+Enter for a newline; Clear button resets the conversation history; if the model supports tool calling and asks for an image ("generate a cat picture", etc.) it will run generation on the workflow currently loaded in GenerateUI and show the result inline; the "Allow image generation" checkbox in the pane header toggles this on/off; if an image is attached (dropped in the TOOLS pane) it is sent to the LLM as vision input and, when generate_image is called, used as the base for image-to-image generation instead of text-to-image; models verified to work well for tool calling and vision: Gemma 4:e4b, Qwen 3.5:9b, Ministral 3:3b (Ollama)</p>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-ai-card-svg-title">Chat pane — SVG generation</h3>
<p id="wfm-help-ai-7">Chat pane — SVG: the LLM can also produce SVG graphics directly as text, with no ComfyUI workflow involved; ask it to draw something in SVG and, if the reply contains SVG code, it is rendered inline as a preview with a "Save to Gallery" button that writes it as a .svg file to the Gallery tab's output folder; this does not use tool calling, so it works with any model regardless of tool-calling support</p>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-ai-card-skills-title">Chat pane — Skills</h3>
<p id="wfm-help-ai-8">Chat pane — Skills: pick a skill from the dropdown above the message list to prepend its instructions to the conversation as a system prompt (not shown in the visible chat log); use the pencil button to open the skill manager and create, edit, or delete .md skill files, stored in user/default/Workflow-Studio/ai_skills/; a file's first line block between --- markers can define name/description shown in the dropdown; two starter skills are included by default: "SVG Icon Generator" (decomposes the subject into parts before drawing, for more recognizable SVG output) and "Skill Creator" (interviews you conversationally and drafts a new skill file, ready to save); when a reply contains a ```skill code block, a "Save as new skill" button appears below it that opens the manager with the draft pre-filled</p>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-ai-card-skilltips-title">Writing your own skills</h3>
<p id="wfm-help-ai-9">Tips for writing your own skills: give a clear frontmatter name/description so it reads well in the dropdown and tooltip; state the exact output format you want and, if there is a deliverable to extract later (like SVG or another skill file), wrap it in a distinctive fenced code block; write concrete, imperative instructions rather than vague ones - smaller local models follow explicit rules and a short worked example far better than general guidance; state hard constraints (forbidden content, security, length limits) explicitly rather than assuming they are implied; when in doubt, select the "Skill Creator" skill in the dropdown and describe what you want - it will interview you and draft the file for you</p>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-ai-card-tools-title">TOOLS pane</h3>
<p id="wfm-help-ai-4">TOOLS pane — VLM: drop an image (PNG/JPG/WebP) and select a task (Describe Image, Create Prompt, Create Tags), click Run; or select "Create wildcards", enter a category name and count to generate plain-text entries one per line; the dropped image is also shared with the Chat pane as its attachment (shown there and used for image-to-image generation) until cleared with the ✕ button</p>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-ai-card-settings-title">Settings pane</h3>
<p id="wfm-help-ai-6">Settings pane: choose backend (Ollama / LM Studio / Lemonade), set API URL, test connection, select model, configure Free language names; Chat Image Generation section lets you enable a dedicated workflow for Chat-triggered text-to-image generation instead of the one currently loaded in GenerateUI; Chat I2I Generation section is the same but for image-to-image generation when an image is attached; settings are shared with the Library panel's A tab via localStorage</p>
</div>
</div>
<div class="wfm-help-page" id="wfm-help-page-tagger">
<div class="wfm-help-article-header">
<h2 id="wfm-help-tagger-title">Tagger Tab</h2>
<button type="button" class="wfm-btn wfm-btn-sm wfm-help-jump-btn" data-jump-tab="tagger">Open tab &rarr;</button>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-tagger-title">Tagger Tab</h3>
<h3 id="wfm-help-tagger-card-overview-title">Overview &amp; Setup</h3>
<ul>
<li id="wfm-help-tagger-1"></li>
<li id="wfm-help-tagger-2"></li>
<li id="wfm-help-tagger-3"></li>
<li id="wfm-help-tagger-4"></li>
<li id="wfm-help-tagger-5"></li>
<li id="wfm-help-tagger-6"></li>
<li id="wfm-help-tagger-7"></li>
<li id="wfm-help-tagger-8"></li>
<li id="wfm-help-tagger-9"></li>
<li id="wfm-help-tagger-1">Automatic image tagging using WD Tagger (ONNX), SwinV2, DeepDanbooru (.h5), and Ollama VLM — 3 sub-tabs: Single / Batch / DB</li>
<li id="wfm-help-tagger-2">Model placement: put each model in its own subfolder under ComfyUI/models/tagger/&lt;model-name&gt;/; the folder must contain a .onnx file + selected_tags.csv (or .h5 + label file for DeepDanbooru)</li>
<li id="wfm-help-tagger-9">Install dependencies into ComfyUI's embedded Python: python_embeded\python.exe -m pip install -r requirements.txt; for GPU ONNX inference install onnxruntime-gpu instead of onnxruntime; TensorFlow (for DeepDanbooru) is commented out by default due to size</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-tagger-card-single-title">Single Tab</h3>
<ul>
<li id="wfm-help-tagger-3">Single tab: drag &amp; drop an image onto the preview area, or click Upload to pick a file; the Tagger button in the Gallery detail panel opens the selected image directly here</li>
<li id="wfm-help-tagger-4">Threshold slider: minimum confidence score for general tags (default 0.35); Character Threshold: separate threshold for character: prefix tags (default 0.85)</li>
<li id="wfm-help-tagger-5">Ollama VLM: enable the checkbox to run a vision model alongside WD Tagger; set API URL, select model (click ↻ to refresh), and customize the prompt; results from both models are merged</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-tagger-card-sending-title">Sending Results</h3>
<ul>
<li id="wfm-help-tagger-6">Result tags can be sent to: (1) GenUI:P — appended to the GenerateUI tab's positive prompt textarea and applied to the loaded workflow immediately; (2) Send to Prompt — appended to the Prompt tab's positive textarea; (3) Save to Gallery — saved to Gallery image metadata (requires image opened from Gallery); (4) Write to File — embedded into JPEG EXIF (ImageDescription) or PNG tEXt (Tags key); (5) Save to DB — stored in the internal SQLite database</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-tagger-card-batch-title">Batch &amp; DB Tabs</h3>
<ul>
<li id="wfm-help-tagger-7">Batch tab: enter a folder path, configure WD Tagger and Ollama settings; output options: Save to DB (default on), Write to File (EXIF/PNG metadata), Write .txt (creates &lt;filename&gt;.txt alongside each image); click Start Batch to process all images in the folder; progress bar and log are updated in real time; Stop cancels after the current image</li>
<li id="wfm-help-tagger-8">DB tab: searchable database of all tagged images; click a row to open the edit panel and modify WD Tags / VLM Tags; Save updates the record, Delete removes it; Export CSV downloads all records as a CSV file</li>
</ul>
</div>
</div>
<div class="wfm-help-page" id="wfm-help-page-imageedit">
<div class="wfm-help-article-header">
<h2 id="wfm-help-imageedit-title">Image Edit Tab</h2>
<button type="button" class="wfm-btn wfm-btn-sm wfm-help-jump-btn" data-jump-tab="image-edit">Open tab &rarr;</button>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-imageedit-title">Image Edit Tab</h3>
<h3 id="wfm-help-imageedit-card-overview-title">Overview</h3>
<ul>
<li id="wfm-help-imageedit-1">Layer-based image editor — compose images with multiple layers (Image, Text, Draw, Mask types) and export the composite</li>
<li id="wfm-help-imageedit-2">Loading images: drag &amp; drop onto the canvas, Upload button, or send from the Gallery tab via the Image Edit button in the Gallery toolbar; the first image becomes Layer 1 (auto-locked); subsequent images are added as new layers scaled to fit the canvas</li>
<li id="wfm-help-imageedit-3">New button: create a blank canvas — prompts for WxH size (e.g. 512x768); clears all existing layers</li>
<li id="wfm-help-imageedit-3">New button: create a blank canvas — prompts for WxH size (e.g. 512x768); clears all existing layers and automatically adds an empty Layer 1</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-imageedit-tools-title">Tools</h3>
<ul>
<li id="wfm-help-imageedit-4">Select (V): click to select a layer; drag to move; drag corner handles to resize; drag the circle above the top edge to rotate; double-click a text layer to re-edit its content; Tool Options bar shows Flip H / Flip V / Rotate field</li>
<li id="wfm-help-imageedit-5">Draw (B): freehand brush drawing onto the active draw layer; Tool Options: color, brush size, blend mode</li>
<li id="wfm-help-imageedit-5">Draw (B): freehand brush drawing onto the active draw layer; Tool Options: color, brush size, blend mode; Properties pane includes a MASK EDITOR ONE (COLOR) section for ABR image brushes — always visible, header text is green when brushes are available, gray when none are imported yet; Select is disabled until at least one brush exists</li>
<li id="wfm-help-imageedit-6">Text (T): click on the canvas to place a text input overlay; configure font family, size, bold/italic, align, color in the Tool Options bar; click OK to place the text as an exact-size Text layer; double-click an existing text layer with the Select tool to re-edit</li>
<li id="wfm-help-imageedit-7">Shape (S): draw geometric shapes onto the canvas; each committed shape becomes an independent draw layer; Tool Options: Shape type (Rect / Ellipse / Line / FreeLine), Rounded checkbox (Rect / Ellipse only), Fill color + None toggle (hidden for Line / FreeLine), Stroke color + width + None toggle (None hidden for Line / FreeLine where stroke is always active), Opacity slider, ↩ Undo button; drag to draw — a blue dashed outline previews the shape; release to commit</li>
<li id="wfm-help-imageedit-7b">Blur (≈): apply Gaussian blur or mosaic to the active layer — whole-layer or region-based (drag a rectangle); see the Blur Tool card below for details</li>
<li id="wfm-help-imageedit-7c">BG Remove (⬚): remove the background from the active layer using Lightweight (@imgly, runs in browser) or BiRefNet (Python backend, coming soon); see the BG Remove Tool card below for details</li>
<li id="wfm-help-imageedit-7d">Mask (🎭): paint a white mask on the canvas; click "M" in the Layers header to add a mask layer — the Mask tool activates automatically; the mask is shown as a colored semi-transparent overlay; the Properties pane (left of the Layers panel) shows Paint controls; see the Mask Tool card below for details</li>
<li id="wfm-help-imageedit-7c">BG Remove (⬚): remove the background from the active layer using Lightweight (@imgly, runs in browser) or BiRefNet (requires Mask Editor One + birefnet.safetensors in ComfyUI/models/background_removal/); see the BG Remove Tool card below for details</li>
<li id="wfm-help-imageedit-7d">Mask (🎭): paint masks on a mask layer using 6 sub-tools — Paint (freehand), Color (flood-select by similar color), Alpha (extract from image transparency), Text (stamp text), Vector (Catmull-Rom spline polygon), Shape (rect / ellipse); SAM3 text-prompt segmentation is also available when Mask Editor One is installed; click "M" in the Layers header to add a mask layer; see the Mask Tool card below for details</li>
<li id="wfm-help-imageedit-7e">Inpaint (🩹): composites the visible layers plus a Mask layer into one RGBA image (mask baked into the alpha channel) and applies it to the first inpaint-capable LoadImage node in the workflow currently loaded in GenerateUI (a node whose MASK output feeds something like VAEEncodeForInpaint); enter Positive/Negative prompts, Grow Mask By (applied to the VAE Encode (for Inpainting) node), and Denoise (applied to KSampler) in the properties panel, then click Run to upload and generate without leaving the Image Edit tab — the result is shown back in the properties panel when done; requires a Mask layer to be painted first and an inpaint-capable workflow loaded in GenerateUI; also works with workflows built around the Mask Editor One custom node (comfyui-mask-editor-one) instead of LoadImage — image/mask are pushed to it via its node_id-keyed server cache and layer_data widget; "Use dedicated workflow" checkbox: when off, the workflow currently loaded in GenerateUI is used (unchanged); when on, pick a saved workflow from the dropdown — it is loaded, edited, and generated entirely in the background without disturbing the workflow shown in GenerateUI</li>
</ul>
</div>
<div class="wfm-help-card">
@@ -1354,7 +1781,7 @@
<h3 id="wfm-help-imageedit-bgremove-title">BG Remove Tool (⬚)</h3>
<ul>
<li id="wfm-help-imageedit-bgremove-1">Model — Lightweight (@imgly): runs entirely in the browser using the @imgly/background-removal library loaded from CDN; no server required; first use downloads the model (~40 MB) and caches it for the session</li>
<li id="wfm-help-imageedit-bgremove-2">Model — BiRefNet: high-quality background removal using the BiRefNet model via the Workflow Studio Python backend; requires birefnet.safetensors placed in ComfyUI/models/background_removal/ (coming soon)</li>
<li id="wfm-help-imageedit-bgremove-2">Model — BiRefNet: high-quality background removal using the BiRefNet model; requires Mask Editor One to be installed and birefnet.safetensors placed in ComfyUI/models/background_removal/</li>
<li id="wfm-help-imageedit-bgremove-3">New Layer (checked by default): the result is added as a new layer above the active layer at the same position and display size — the original layer is preserved</li>
<li id="wfm-help-imageedit-bgremove-4">When New Layer is unchecked, the active layer's canvas is replaced in-place with the background-removed result</li>
<li id="wfm-help-imageedit-bgremove-5">Click Remove BG to start processing; status text shows Loading model → Processing → Done; supports Undo (Ctrl+Z)</li>
@@ -1365,9 +1792,17 @@
<ul>
<li id="wfm-help-imageedit-mask-1">Add a mask layer: click the "M" button in the Layers panel header; the new mask layer is inserted above the active layer and the Mask tool activates automatically</li>
<li id="wfm-help-imageedit-mask-2">Clicking a mask layer in the layer list automatically switches to the Mask tool</li>
<li id="wfm-help-imageedit-mask-3">Tool Options bar (Paint / Invert / Overlay / Blur): Paint button toggles the Paint sub-tool; Invert checkbox inverts the overlay preview (shows color where mask is absent); Overlay color picker changes the preview color (default red); Blur slider (0–50 px) softens the overlay edge</li>
<li id="wfm-help-imageedit-mask-4">Properties pane (left of the Layers panel, visible when Mask tool is active): Size (1–200 px), Hardness (0–100%), Mode — Add button draws white (mask present) / Erase button removes to transparent (mask absent); the active mode is highlighted in blue</li>
<li id="wfm-help-imageedit-mask-3">Tool Options bar — sub-tools: Paint / Color / Alpha / Text / Vector / Shape (all work without Mask Editor One) / SAM3 (requires Mask Editor One, disabled if not installed); Invert checkbox inverts the overlay preview; Overlay color picker changes the preview color (default red); Blur slider (0–50 px) softens the overlay edge; the overlay is only shown for the currently active mask layer — inactive mask layers stay hidden until selected</li>
<li id="wfm-help-imageedit-mask-4">Properties pane — Paint mode: Mode (Add / Erase), Size (1–200 px), Hardness (0–100%); MASK EDITOR ONE section (always visible — header text is green when ABR brushes are available, gray when none are imported yet): Select button opens the ABR brush library (disabled until at least one brush exists) — choosing a brush replaces the default circle brush; ✕ clears the brush back to Circle; when an image brush is active, Hardness is disabled and additional controls appear: Spacing (stamp interval 5–100%), Angle (rotation 0–359°), Sz Jitter (random size reduction per stamp 0–100%), Rot. Jitter (random rotation per stamp on/off)</li>
<li id="wfm-help-imageedit-mask-5">✂ button on a mask layer row: toggles the layer as a clipping mask — when enabled (blue), the mask clips the layer directly below it so only the painted area is visible; clipping is applied when saving PNG / Gallery / ComfyUI</li>
<li id="wfm-help-imageedit-mask-6">SAM3 (Mask Editor One required): text-prompt segmentation powered by the SAM3 model; enter a description of the object to segment (e.g. "cat", "person"), set Max (maximum mask candidates: 3/6/9/12), then click Segment</li>
<li id="wfm-help-imageedit-mask-7">SAM3 workflow: after Segment, candidate masks appear as thumbnails in the Properties pane — click to select (blue border + ✓); multiple masks can be selected; click Apply Selected (N) to apply them all; Mode (Add / Erase) controls how masks are merged into the current mask layer; a new mask layer is created automatically if the active layer is not a mask</li>
<li id="wfm-help-imageedit-mask-8">ABR Brush Library (Mask Editor One required, Paint mode only): click Select in the MASK EDITOR ONE section to open the brush picker — browse folders on the left, click a thumbnail to apply; "Round Brush (default)" restores the circle brush; brushes are shared with Mask Editor One and stored in its brushes/ folder</li>
<li id="wfm-help-imageedit-mask-9">Color sub-tool: click anywhere on the canvas to flood-select pixels similar in color to the clicked point — Properties pane: Mode (Add / Subtract), Tolerance (0–255, color similarity threshold), Feather % (0–100, soft edge falloff within tolerance range)</li>
<li id="wfm-help-imageedit-mask-10">Alpha sub-tool: extract the transparency of the image layers as a mask — Properties pane: Threshold (pixels with alpha ≥ threshold become full mask; 0 = all alpha included), Invert (reverse the extracted result), Extract Alpha button applies the operation; works on a composite of all visible non-mask layers</li>
<li id="wfm-help-imageedit-mask-11">Text sub-tool: click on the canvas to open a text stamp overlay; enter text, configure Font / Size / Bold / Italic / Align, choose Mode (Add = white stamp / Erase = cut mask), then click Stamp or press Ctrl+Enter; multi-line text supported (newline in textarea)</li>
<li id="wfm-help-imageedit-mask-12">Vector sub-tool: click to place control points connected by a Catmull-Rom spline; click the first point again (or press Enter) to close and fill the polygon; Backspace removes the last point; Esc resets all points; Properties pane shows current point count and Mode (Add / Erase)</li>
<li id="wfm-help-imageedit-mask-13">Shape sub-tool: drag to draw a rectangle or ellipse mask; hold Shift for a perfect square or circle; a blue dashed outline previews the shape while dragging; Properties pane: Mode (Add / Erase), Shape (Rect / Ellipse)</li>
</ul>
</div>
<div class="wfm-help-card">
@@ -1422,8 +1857,11 @@
</div>
<div class="wfm-help-page" id="wfm-help-page-shortcuts">
<div class="wfm-help-article-header">
<h2 id="wfm-help-shortcuts-title">Keyboard Shortcuts</h2>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-shortcuts-title">Keyboard Shortcuts</h3>
<h3 id="wfm-help-shortcuts-card-general-title">General</h3>
<ul>
<li id="wfm-help-shortcuts-1">Escape: Close modal/panel</li>
<li id="wfm-help-shortcuts-2">Enter: Confirm rename, send chat</li>
@@ -1447,16 +1885,31 @@
</div>
<div class="wfm-help-page" id="wfm-help-page-trouble">
<div class="wfm-help-article-header">
<h2 id="wfm-help-trouble-title">Troubleshooting</h2>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-trouble-title">Troubleshooting</h3>
<h3 id="wfm-help-trouble-card-connection-title">Connection Issues</h3>
<ul>
<li id="wfm-help-trouble-1">Cannot connect to ComfyUI: Check if ComfyUI can generate images, verify URL in Settings, try refreshing or restarting</li>
<li id="wfm-help-trouble-2">Cannot connect to Ollama: Use connection test button, check if Ollama is running and models are downloaded</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-trouble-card-workflow-title">Workflow &amp; Generation Issues</h3>
<ul>
<li id="wfm-help-trouble-3">Workflows not showing: Click refresh button, check if loadable in ComfyUI, try restarting browser/ComfyUI</li>
<li id="wfm-help-trouble-4">Image generation fails: Check if specified models exist in ComfyUI, verify connection, try restarting</li>
<li id="wfm-help-trouble-5">LoRA Stack fails with "No such file or directory" error: The LoRA may not be recognized by comfyui-lora-manager (known issue). Try a different LoRA or check if the file appears in Lora Manager's own UI</li>
<li id="wfm-help-trouble-6">Model loading error after moving or deleting models: ComfyUI caches file paths and may still reference old locations. Perform a Hard Reset from the ComfyUI menu (Queue → Hard Reset) or restart ComfyUI to clear the cache.</li>
<li id="wfm-help-trouble-7"></li>
<li id="wfm-help-trouble-9">Generate runs a different workflow than the one just loaded: a Batch type checkbox (Checkpoint/LoRA/Prompt/Workflow/Sampler/Scheduler) is left ON in the Batch subtab. While any Batch type is active, the Generate button runs the batch selection instead of the currently loaded workflow. Open the Batch subtab and turn off the active batch type checkbox.</li>
</ul>
</div>
<div class="wfm-help-card">
<h3 id="wfm-help-trouble-card-tagger-title">Tagger &amp; Model Issues</h3>
<ul>
<li id="wfm-help-trouble-7">Tagger tab shows no models: verify the model folder exists at ComfyUI/models/tagger/&lt;model-name&gt;/ and contains a .onnx or .h5 file; if onnxruntime is not installed, run: python_embeded\python.exe -m pip install onnxruntime</li>
<li id="wfm-help-trouble-8">Model tab shows a checkpoint you didn't expect (e.g. always the same model regardless of the loaded workflow): the checkpoint saved in the workflow file is not installed, so it was silently replaced with another available model during loading — an error toast reports the original (missing) model name when this happens. Select the correct checkpoint manually in the Model tab, or enable "Default Checkpoint" in Settings to force a known-good model on every load.</li>
</ul>
</div>
</div>
@@ -1480,6 +1933,20 @@
<div class="wfm-help-link-desc" id="wfm-help-kofi-desc">Buy me a coffee to support development</div>
</div>
</a>
<a href="https://github.com/ketle-man/comfyui-image-feeder" target="_blank" rel="noopener noreferrer" class="wfm-help-link wfm-help-link-github">
<svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor"><path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"/></svg>
<div>
<div class="wfm-help-link-title">ComfyUI Image Feeder</div>
<div class="wfm-help-link-desc">Complementary image input node — works with WFS Gallery Feeder mode</div>
</div>
</a>
<a href="https://github.com/ketle-man/comfyui-mask-editor-one" target="_blank" rel="noopener noreferrer" class="wfm-help-link wfm-help-link-github">
<svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor"><path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"/></svg>
<div>
<div class="wfm-help-link-title">Mask Editor One</div>
<div class="wfm-help-link-desc">Mask editor with ABR brushes, SAM3 segmentation, BiRefNet BG removal and more</div>
</div>
</a>
</div>
<p class="wfm-help-thanks" id="wfm-help-thanks">Thank you for using Workflow Studio!</p>
</div>
@@ -1520,6 +1987,7 @@
<button id="wfm-gallery-refresh-btn" class="wfm-btn wfm-btn-sm">Refresh</button>
<button id="wfm-gallery-send-image-edit-btn" class="wfm-btn wfm-btn-sm" title="Send selected image to Image Edit tab">Image Edit</button>
<button id="wfm-gallery-send-genui-image-btn" class="wfm-btn wfm-btn-sm" title="Send selected image to GenerateUI Image input">Send GenUI Image</button>
<button id="wfm-gallery-send-cc-btn" class="wfm-btn wfm-btn-sm" title="Send selected image to ComfyUI Comic Creator's selected panel" style="display:none;">Send CC</button>
<button id="wfm-gallery-clear-filters-btn" class="wfm-btn wfm-btn-sm" title="Clear all filters"></button>
</div>
<!-- 複数選択時の一括操作バー -->
@@ -1645,6 +2113,7 @@
<button class="ie-tool-btn" data-tool="blur" title="Blur">≈</button>
<button class="ie-tool-btn" data-tool="filter" title="Filter">★</button>
<button class="ie-tool-btn" data-tool="bgremove" title="BG Remove">⬚</button>
<button class="ie-tool-btn" data-tool="inpaint" title="Inpaint">🩹</button>
</div>
<!-- Center -->
@@ -1972,14 +2441,48 @@
<!-- Chat pane -->
<div class="wfm-ai-pane wfm-ai-pane-chat">
<div class="wfm-ai-pane-header">Chat</div>
<div class="wfm-ai-chat-skill-row">
<select id="wfm-ai-chat-skill-select" class="wfm-select wfm-ai-chat-skill-select">
<option value="">-- No skill --</option>
</select>
<button id="wfm-ai-chat-skill-manage-btn" class="wfm-btn wfm-btn-sm" title="Manage skills">&#9998;</button>
</div>
<div id="wfm-ai-skill-panel" class="wfm-ai-skill-panel" style="display:none;">
<div class="wfm-ai-skill-panel-header">
<span class="wfm-ai-skill-panel-title">Skills</span>
<div style="display:flex;gap:4px;">
<button id="wfm-ai-skill-new-btn" class="wfm-btn wfm-btn-sm wfm-btn-primary">+ New</button>
<button id="wfm-ai-skill-close-btn" class="wfm-btn wfm-btn-sm" title="Close">&#10005;</button>
</div>
</div>
<div id="wfm-ai-skill-list" class="wfm-wc-file-list"></div>
<div id="wfm-ai-skill-editor" class="wfm-wc-editor" style="display:none;">
<input type="text" id="wfm-ai-skill-editor-filename" class="wfm-input" placeholder="filename.md">
<textarea id="wfm-ai-skill-editor-content" class="wfm-textarea wfm-wc-editor-ta" rows="10" placeholder="---&#10;name: My Skill&#10;description: What this skill does&#10;---&#10;&#10;System prompt instructions for the LLM..."></textarea>
<div class="wfm-wc-editor-actions">
<button id="wfm-ai-skill-editor-save-btn" class="wfm-btn wfm-btn-sm wfm-btn-primary">Save</button>
<button id="wfm-ai-skill-editor-delete-btn" class="wfm-btn wfm-btn-sm wfm-btn-danger" style="display:none;">Delete</button>
<button id="wfm-ai-skill-editor-cancel-btn" class="wfm-btn wfm-btn-sm" style="margin-left:auto;">Cancel</button>
</div>
</div>
</div>
<div class="wfm-ai-chat-container">
<div class="wfm-ai-chat-messages" id="wfm-ai-chat-messages"></div>
<div class="wfm-ai-chat-input-area">
<div id="wfm-ai-chat-attachment" class="wfm-ai-chat-attachment" style="display:none;">
<img id="wfm-ai-chat-attachment-thumb" class="wfm-ai-chat-attachment-thumb">
<span id="wfm-ai-chat-attachment-label">Image attached</span>
<button id="wfm-ai-chat-attachment-clear" class="wfm-ai-chat-attachment-clear" title="Close">✕</button>
</div>
<textarea id="wfm-ai-chat-input" class="wfm-ai-chat-input" placeholder="Type a message... (Enter to send, Shift+Enter for newline)"></textarea>
<div class="wfm-ai-chat-actions">
<button id="wfm-ai-chat-send-btn" class="wfm-btn wfm-btn-primary">Send</button>
<button id="wfm-ai-chat-clear-btn" class="wfm-btn">Clear</button>
<span id="wfm-ai-chat-status" class="wfm-ai-trans-status"></span>
<label class="wfm-ai-chat-toggle-label" for="wfm-ai-chat-imggen-toggle">
<input type="checkbox" id="wfm-ai-chat-imggen-toggle" checked>
<span id="wfm-ai-chat-imggen-label-text">Allow image generation</span>
</label>
</div>
</div>
</div>
@@ -1993,6 +2496,7 @@
<img id="wfm-ai-vlm-preview" style="display:none;max-width:100%;max-height:100%;object-fit:contain;pointer-events:none;">
<span id="wfm-ai-vlm-label" class="wfm-ai-vlm-label">Drop or click PNG / JPG / WebP</span>
<input type="file" id="wfm-ai-vlm-file" accept="image/png,image/jpeg,image/webp" style="display:none;">
<button id="wfm-ai-vlm-clear" class="wfm-ai-vlm-clear" style="display:none;" title="Close">✕</button>
</div>
<div class="wfm-ai-wc-inputs" id="wfm-ai-wc-inputs" style="display:none">
<div class="wfm-ai-wc-row">
@@ -2032,6 +2536,9 @@
<label class="wfm-ai-radio-label">
<input type="radio" name="wfm-ai-backend" value="lmstudio"> LM Studio
</label>
<label class="wfm-ai-radio-label">
<input type="radio" name="wfm-ai-backend" value="lemonade"> Lemonade
</label>
</div>
</div>
<div class="wfm-ai-settings-section">
@@ -2065,6 +2572,34 @@
<input type="text" id="wfm-ai-free-dst-lang" class="wfm-input" placeholder="e.g. German">
</div>
</div>
<div class="wfm-ai-settings-section">
<div class="wfm-ai-settings-title" id="wfm-ai-settings-chatgen-title">Chat Image Generation</div>
<div class="wfm-ai-settings-row">
<label class="wfm-ai-label" style="display:flex;align-items:center;gap:6px;cursor:pointer;">
<input type="checkbox" id="wfm-ai-chatgen-dedicated-checkbox">
<span id="wfm-ai-chatgen-dedicated-label">Use dedicated workflow</span>
</label>
</div>
<div class="wfm-ai-settings-row" id="wfm-ai-chatgen-dedicated-row" style="display:none;">
<select id="wfm-ai-chatgen-dedicated-select" class="wfm-select">
<option value="">-- select workflow --</option>
</select>
</div>
</div>
<div class="wfm-ai-settings-section">
<div class="wfm-ai-settings-title" id="wfm-ai-settings-chatgen-i2i-title">Chat I2I Generation</div>
<div class="wfm-ai-settings-row">
<label class="wfm-ai-label" style="display:flex;align-items:center;gap:6px;cursor:pointer;">
<input type="checkbox" id="wfm-ai-chatgen-i2i-dedicated-checkbox">
<span id="wfm-ai-chatgen-i2i-dedicated-label">Use dedicated workflow</span>
</label>
</div>
<div class="wfm-ai-settings-row" id="wfm-ai-chatgen-i2i-dedicated-row" style="display:none;">
<select id="wfm-ai-chatgen-i2i-dedicated-select" class="wfm-select">
<option value="">-- select workflow --</option>
</select>
</div>
</div>
<div class="wfm-ai-settings-section">
<button id="wfm-ai-settings-save-btn" class="wfm-btn wfm-btn-primary">Save</button>
</div>
File diff suppressed because it is too large Load Diff
+41 -13
View File
@@ -611,27 +611,55 @@ app.registerExtension({
{ tooltip: NODE_SETS_TOOLTIP, className: "wfm-node-sets-btn", getIcon: getNodeSetsIcon, styles: null },
];
const replaceButtonIcons = () => {
const applyIconToButton = (btn, cfg) => {
// Skip if the SVG icon is already in place
if (btn.querySelector("svg")) return;
btn.classList.add(cfg.className);
btn.innerHTML = cfg.getIcon();
btn.style.borderRadius = "4px";
btn.style.padding = "6px";
if (cfg.styles) Object.assign(btn.style, cfg.styles);
const svg = btn.querySelector("svg");
if (svg) {
svg.style.width = "20px";
svg.style.height = "20px";
}
};
// Initial application — retry until buttons are rendered by Vue
const pollUntilFound = () => {
let foundAny = false;
for (const cfg of buttonConfigs) {
document.querySelectorAll(`button[aria-label="${cfg.tooltip}"]`).forEach((btn) => {
foundAny = true;
btn.classList.add(cfg.className);
btn.innerHTML = cfg.getIcon();
btn.style.borderRadius = "4px";
btn.style.padding = "6px";
if (cfg.styles) Object.assign(btn.style, cfg.styles);
const svg = btn.querySelector("svg");
if (svg) {
svg.style.width = "20px";
svg.style.height = "20px";
}
applyIconToButton(btn, cfg);
});
}
if (!foundAny) {
requestAnimationFrame(replaceButtonIcons);
requestAnimationFrame(pollUntilFound);
}
};
requestAnimationFrame(replaceButtonIcons);
requestAnimationFrame(pollUntilFound);
// MutationObserver: re-apply icons after Vue re-renders the action bar
// (e.g. when the Properties Panel is toggled inside a subgraph)
if (typeof MutationObserver !== "undefined") {
const observer = new MutationObserver(() => {
for (const cfg of buttonConfigs) {
document.querySelectorAll(`button[aria-label="${cfg.tooltip}"]`).forEach((btn) => {
// Only re-apply when Vue has reset innerHTML back to <i>
if (btn.querySelector("i")) {
applyIconToButton(btn, cfg);
}
});
}
});
const watchNode =
document.querySelector("[data-testid='action-bar-buttons']") ||
document.querySelector(".actionbar-container") ||
document.body;
observer.observe(watchNode, { childList: true, subtree: true });
window.__wfmIconObserver = observer;
}
},
});
+665
View File
@@ -0,0 +1,665 @@
{
"id": "6d392e45-b20b-4dee-a422-0b4a18e645cd",
"revision": 0,
"last_node_id": 35,
"last_link_id": 102,
"nodes": [
{
"id": 8,
"type": "VAEDecode",
"pos": [
1351.4570000000006,
197.9979999999999
],
"size": [
210,
46
],
"flags": {},
"order": 6,
"mode": 0,
"inputs": [
{
"localized_name": "samples",
"name": "samples",
"type": "LATENT",
"link": 42
},
{
"localized_name": "vae",
"name": "vae",
"type": "VAE",
"link": 84
}
],
"outputs": [
{
"localized_name": "IMAGE",
"name": "IMAGE",
"type": "IMAGE",
"slot_index": 0,
"links": [
22
]
}
],
"properties": {
"Node name for S&R": "VAEDecode",
"cnr_id": "comfy-core",
"ver": "0.3.18",
"ue_properties": {
"widget_ue_connectable": {},
"version": "7.8",
"input_ue_unconnectable": {}
}
},
"widgets_values": []
},
{
"id": 29,
"type": "CheckpointLoaderSimple",
"pos": [
-35,
161
],
"size": [
315,
98
],
"flags": {},
"order": 0,
"mode": 0,
"inputs": [
{
"localized_name": "ckpt_name",
"name": "ckpt_name",
"type": "COMBO",
"widget": {
"name": "ckpt_name"
},
"link": null
}
],
"outputs": [
{
"localized_name": "MODEL",
"name": "MODEL",
"type": "MODEL",
"slot_index": 0,
"links": [
80
]
},
{
"localized_name": "CLIP",
"name": "CLIP",
"type": "CLIP",
"slot_index": 1,
"links": [
81,
82
]
},
{
"localized_name": "VAE",
"name": "VAE",
"type": "VAE",
"slot_index": 2,
"links": [
84,
90
]
}
],
"properties": {
"Node name for S&R": "CheckpointLoaderSimple",
"cnr_id": "comfy-core",
"ver": "0.3.18",
"ue_properties": {
"widget_ue_connectable": {},
"version": "7.8",
"input_ue_unconnectable": {}
}
},
"widgets_values": [
"anime\\merge\\hayochamixIDXL_v11+_blueberryPlus_v10-amanatsuIllustrious_v11_x0.1_trainDifference.safetensors"
]
},
{
"id": 7,
"type": "CLIPTextEncode",
"pos": [
330,
369
],
"size": [
412.2799987792969,
88
],
"flags": {},
"order": 3,
"mode": 0,
"inputs": [
{
"localized_name": "clip",
"name": "clip",
"type": "CLIP",
"link": 82
},
{
"localized_name": "text",
"name": "text",
"type": "STRING",
"widget": {
"name": "text"
},
"link": null
}
],
"outputs": [
{
"localized_name": "CONDITIONING",
"name": "CONDITIONING",
"type": "CONDITIONING",
"slot_index": 0,
"links": [
6
]
}
],
"properties": {
"Node name for S&R": "CLIPTextEncode",
"cnr_id": "comfy-core",
"ver": "0.3.18",
"ue_properties": {
"widget_ue_connectable": {},
"version": "7.8",
"input_ue_unconnectable": {}
}
},
"widgets_values": [
"w\n"
]
},
{
"id": 32,
"type": "LoadImage",
"pos": [
-20.402179424849777,
348.01722821269084
],
"size": [
282.798828125,
314
],
"flags": {},
"order": 1,
"mode": 0,
"inputs": [
{
"localized_name": "image",
"name": "image",
"type": "COMBO",
"widget": {
"name": "image"
},
"link": null
},
{
"localized_name": "choose file to upload",
"name": "upload",
"type": "IMAGEUPLOAD",
"widget": {
"name": "upload"
},
"link": null
}
],
"outputs": [
{
"localized_name": "IMAGE",
"name": "IMAGE",
"type": "IMAGE",
"links": [
101
]
},
{
"localized_name": "MASK",
"name": "MASK",
"type": "MASK",
"links": [
102
]
}
],
"properties": {
"Node name for S&R": "LoadImage",
"ue_properties": {
"widget_ue_connectable": {},
"input_ue_unconnectable": {},
"version": "7.8"
},
"image": "clipspace/clipspace-painted-masked-1784801792090.png [input]"
},
"widgets_values": [
"clipspace/clipspace-painted-masked-1784801792090.png [input]",
"image"
]
},
{
"id": 3,
"type": "KSampler",
"pos": [
997,
174
],
"size": [
315,
474
],
"flags": {},
"order": 5,
"mode": 0,
"inputs": [
{
"localized_name": "model",
"name": "model",
"type": "MODEL",
"link": 80
},
{
"localized_name": "positive",
"name": "positive",
"type": "CONDITIONING",
"link": 4
},
{
"localized_name": "negative",
"name": "negative",
"type": "CONDITIONING",
"link": 6
},
{
"localized_name": "latent_image",
"name": "latent_image",
"type": "LATENT",
"link": 72
},
{
"localized_name": "seed",
"name": "seed",
"type": "INT",
"widget": {
"name": "seed"
},
"link": null
},
{
"localized_name": "steps",
"name": "steps",
"type": "INT",
"widget": {
"name": "steps"
},
"link": null
},
{
"localized_name": "cfg",
"name": "cfg",
"type": "FLOAT",
"widget": {
"name": "cfg"
},
"link": null
},
{
"localized_name": "sampler_name",
"name": "sampler_name",
"type": "COMBO",
"widget": {
"name": "sampler_name"
},
"link": null
},
{
"localized_name": "scheduler",
"name": "scheduler",
"type": "COMBO",
"widget": {
"name": "scheduler"
},
"link": null
},
{
"localized_name": "denoise",
"name": "denoise",
"type": "FLOAT",
"widget": {
"name": "denoise"
},
"link": null
}
],
"outputs": [
{
"localized_name": "LATENT",
"name": "LATENT",
"type": "LATENT",
"slot_index": 0,
"links": [
42
]
}
],
"properties": {
"Node name for S&R": "KSampler",
"cnr_id": "comfy-core",
"ver": "0.3.18",
"ue_properties": {
"widget_ue_connectable": {},
"version": "7.8",
"input_ue_unconnectable": {}
}
},
"widgets_values": [
1008854893628621,
"randomize",
30,
4,
"ddim",
"simple",
1
]
},
{
"id": 26,
"type": "VAEEncodeForInpaint",
"pos": [
759,
169
],
"size": [
226.8000030517578,
98
],
"flags": {},
"order": 4,
"mode": 0,
"inputs": [
{
"localized_name": "pixels",
"name": "pixels",
"type": "IMAGE",
"link": 101
},
{
"localized_name": "vae",
"name": "vae",
"type": "VAE",
"link": 90
},
{
"localized_name": "mask",
"name": "mask",
"type": "MASK",
"link": 102
},
{
"localized_name": "grow_mask_by",
"name": "grow_mask_by",
"type": "INT",
"widget": {
"name": "grow_mask_by"
},
"link": null
}
],
"outputs": [
{
"localized_name": "LATENT",
"name": "LATENT",
"type": "LATENT",
"slot_index": 0,
"links": [
72
]
}
],
"properties": {
"Node name for S&R": "VAEEncodeForInpaint",
"cnr_id": "comfy-core",
"ver": "0.3.18",
"ue_properties": {
"widget_ue_connectable": {},
"version": "7.8",
"input_ue_unconnectable": {}
}
},
"widgets_values": [
6
]
},
{
"id": 9,
"type": "SaveImage",
"pos": [
1362.0710000000008,
369.32099999999986
],
"size": [
210,
270
],
"flags": {},
"order": 7,
"mode": 0,
"inputs": [
{
"localized_name": "images",
"name": "images",
"type": "IMAGE",
"link": 22
},
{
"localized_name": "filename_prefix",
"name": "filename_prefix",
"type": "STRING",
"widget": {
"name": "filename_prefix"
},
"link": null
}
],
"outputs": [
{
"localized_name": "images",
"name": "images",
"type": "IMAGE",
"links": null
}
],
"properties": {
"Node name for S&R": "SaveImage",
"cnr_id": "comfy-core",
"ver": "0.3.18",
"ue_properties": {
"widget_ue_connectable": {},
"version": "7.8",
"input_ue_unconnectable": {}
}
},
"widgets_values": [
"ComfyUI"
]
},
{
"id": 6,
"type": "CLIPTextEncode",
"pos": [
326.97,
160
],
"size": [
422.8500061035156,
164.30999755859375
],
"flags": {},
"order": 2,
"mode": 0,
"inputs": [
{
"localized_name": "clip",
"name": "clip",
"type": "CLIP",
"link": 81
},
{
"localized_name": "text",
"name": "text",
"type": "STRING",
"widget": {
"name": "text"
},
"link": null
}
],
"outputs": [
{
"localized_name": "CONDITIONING",
"name": "CONDITIONING",
"type": "CONDITIONING",
"slot_index": 0,
"links": [
4
]
}
],
"properties": {
"Node name for S&R": "CLIPTextEncode",
"cnr_id": "comfy-core",
"ver": "0.3.18",
"ue_properties": {
"widget_ue_connectable": {},
"version": "7.8",
"input_ue_unconnectable": {}
}
},
"widgets_values": [
"smile"
]
}
],
"links": [
[
4,
6,
0,
3,
1,
"CONDITIONING"
],
[
6,
7,
0,
3,
2,
"CONDITIONING"
],
[
22,
8,
0,
9,
0,
"IMAGE"
],
[
42,
3,
0,
8,
0,
"LATENT"
],
[
72,
26,
0,
3,
3,
"LATENT"
],
[
80,
29,
0,
3,
0,
"MODEL"
],
[
81,
29,
1,
6,
0,
"CLIP"
],
[
82,
29,
1,
7,
0,
"CLIP"
],
[
84,
29,
2,
8,
1,
"VAE"
],
[
90,
29,
2,
26,
1,
"VAE"
],
[
101,
32,
0,
26,
0,
"IMAGE"
],
[
102,
32,
1,
26,
2,
"MASK"
]
],
"groups": [],
"config": {},
"extra": {
"ds": {
"scale": 0.9229599817706418,
"offset": [
365.6203139679832,
118.10373545614928
]
},
"ue_links": [],
"links_added_by_ue": []
},
"version": 0.4
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 134 KiB

File diff suppressed because one or more lines are too long
Binary file not shown.

After

Width:  |  Height:  |  Size: 250 KiB