Compare commits

...
4 Commits
Author SHA1 Message Date
ketle-manandClaude Sonnet 4.6 5b087713b9 v0.3.4: Checkpoint Batch folder-tree dropdown, Pause/Resume, Settings side-by-side layout
- Checkpoint Batch: replace Include/Exclude text inputs with folder-tree dropdown
  - Folder-level checkboxes with indeterminate state for partial selection
  - Expand/collapse folders with ▶; supports any subfolder depth
  - Filter search, All / None quick-select buttons
- Checkpoint Batch: add Pause / Resume button (suspends between models)
- Checkpoint Batch: Stop while paused now immediately exits the loop
- GenerateUI Settings tab: KSampler and Latent Image side by side (50% each)
- Help tab: update gen-6, add gen-11 (batch), fix gallery-5~11 i18n gap (5-item shift)
- i18n: add helpGen11, helpGallery11; update helpGallery5-10 across EN/JA/ZH

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-29 00:41:57 +09:00
ketle-manandClaude Sonnet 4.6 6a2da8e4e9 docs: update DEVLOG v0.3.3 with subdirectory support and ImpactWildcardEncode fix
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-28 21:43:52 +09:00
ketle-manandClaude Sonnet 4.6 54fc57344a feat: wildcard subdirectory support
- wildcard_service.py: rglob recursive scan; _safe_path allows
  forward-slash separated relative paths (path traversal still blocked);
  save_file auto-creates parent directories; all responses include
  dir and wc_name fields (e.g. wc_name="color/animals").
- prompt-tab.js: file list and file picker group files by directory with
  a collapsible directory header; insert uses __wc_name__ (e.g.
  __color/animals__); editor name input accepts "folder/name" paths;
  save validation checks each path component individually.
- index.html: update editor name input placeholder to "name or folder/name".
- main.css: add .wfm-wc-dir-header, .wfm-wc-file-item--sub,
  .wfm-wc-picker-dir, .wfm-wc-picker-item--sub; add -webkit-user-select
  for Safari compatibility.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-28 21:41:46 +09:00
ketle-manandClaude Sonnet 4.6 1cc0e94724 Fix: ImpactWildcardEncode validation error in GenerateUI
- comfyui-workflow.js: validate COMBO widget values against object_info
  choices; fall back to first valid choice when stored value (e.g.
  "Select Wildcard 🟢 Full Cache") is not in the current options list.
  Prevents "Prompt outputs failed validation" with Impact Pack nodes.
- comfyui-workflow.js: recognize ImpactWildcardEncode/ImpactWildcardProcessor
  as prompt nodes in analyzeWorkflow (role detection via sampler refs);
  use wildcard_text as the editable text field (textKey).
- comfyui-editor.js: use node's textKey (defaulting to "text") when
  applying and syncing prompt fields, so ImpactWildcardEncode edits
  update wildcard_text instead of the non-existent text field.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-28 21:27:53 +09:00
11 changed files with 784 additions and 118 deletions
+102 -1
View File
@@ -1,6 +1,66 @@
# DEVLOG - ComfyUI-Workflow-Studio
## 2026-04-28: v0.3.3 Promptタブ — ワイルドカード支援パネル・Impact Packシンボリックリンク連携
## 2026-04-29: v0.3.4 GenerateUI — Checkpoint Batch 刷新・Settings 横並びレイアウト・ヘルプ i18n 修正
### 概要
- Checkpoint Batch: フォルダツリー型ドロップダウン選択に刷新(テキスト入力の Include/Exclude フォルダ指定を廃止)
- Checkpoint Batch: 第二階層以下のサブフォルダにも対応
- Checkpoint Batch: 一時停止 / 再開(Pause/Resume)ボタンを追加
- GenerateUI Settings タブ: KSampler と Latent Image を横並び(各50%幅)に変更
- Help タブ: 最新機能に合わせて説明を更新し、i18n 対応漏れ(Gallery 5〜11、Gen 11)を修正
### 変更内容
#### `templates/index.html`
- Checkpoint Batch パネルの Include/Exclude テキスト入力を廃止し、チェックボックス付きドロップダウンに置き換え
- フォルダヘッダー行: チェックボックス + ▶ 展開矢印 + フォルダ名 + ファイル数
- ファイル行: インデント + チェックボックス + ファイル名(フルパスを tooltip 表示)
- パネル上部: Filter 検索入力 + All / None ボタン
- バッチ進行エリアのプログレスバー下に Pause ボタンを追加(実行中のみ有効)
- ヘルプ: `wfm-help-gen-6`(横並びレイアウト)・`wfm-help-gen-11`(新バッチ機能)の初期テキストを更新
#### `static/js/generate-tab.js`
- `_parseFolderList()` / `_getModelFolder()` / `_filterCheckpoints()` を削除
- `_ckptState = { mode: "all"|"some"|"none", selected: Set<modelPath> }` で選択状態を管理
- `"all"`: 全選択(selected は空)、`"some"`: 部分選択、`"none"`: 全解除
- `_buildFolderTree(models)` — モデルパスをフォルダ → モデルリストの Map に変換(`lastIndexOf("/")` で第二階層以下にも対応)
- `_getFolderCheckState(folderModels)` — `"checked"` / `"indeterminate"` / `"unchecked"` を返す
- `_toggleSingleModel()` / `_toggleFolderModels()` — 単体・フォルダ一括のトグルロジック(all/none/some の状態遷移を管理)
- `_rebuildCkptList()` — フォルダグループ形式の DOM を動的生成(▶ 展開・折りたたみ、`checkbox.indeterminate` 対応)
- `_getSelectedCheckpoints()` — mode に応じた選択リストを返す
- `_ckptBatch.paused` フラグと `_waitIfPaused()` で一時停止・再開を実装(Promise 待機 + resolve で解除)
- `_setPauseBtnState(paused)` — ボタンのテキスト・スタイルを Pause ↔ Resume で切り替え
- `initCheckpointBatch()` に Pause/Resume ボタンのハンドラを追加
- `_runBatchGenerate()`: ループ先頭で `await _waitIfPaused()`、一時停止時にステータステキストを "Paused" 表示、finally ブロックで状態クリーンアップ
- Interrupt(Stop)ボタン: `_ckptBatch.paused = false` と `_resumeResolve()` を呼んで一時停止待機を即解除
#### `static/js/comfyui-editor.js`
- `renderSettingsTab()`: 外枠を `flex-direction: row` に変更し KSampler(左)と Latent Image(右)を横並び(各 `flex:1; min-width:0`)、間に縦の境界線(`border-right: 1px solid var(--wfm-border)`)
#### `static/css/main.css`
- `.wfm-ckpt-dropdown-wrap` / `.wfm-ckpt-dropdown-trigger` / `.wfm-ckpt-dropdown-arrow` / `.wfm-ckpt-dropdown-panel` — ドロップダウン UI スタイル
- `.wfm-ckpt-folder-group` / `.wfm-ckpt-folder-header` / `.wfm-ckpt-folder-toggle` / `.wfm-ckpt-folder-name` / `.wfm-ckpt-folder-count` / `.wfm-ckpt-folder-files` — フォルダツリー UI スタイル
- `.wfm-ckpt-item--indented` — ファイル行のインデント(`padding-left: 24px`)
#### `static/js/i18n.js`
- EN / JA / ZH: `helpGen6` を横並びレイアウトの説明に更新
- EN / JA / ZH: `helpGen11` を追加(フォルダツリードロップダウン、Pause/Resume、Stop の説明)
- EN / JA / ZH: `helpGallery5`〜`helpGallery10` を現在の HTML 構成に合わせて修正(旧版から5項目ずれていたのを解消)
- EN / JA / ZH: `helpGallery11` を追加(PNG/JPEG/WebP/GIF 対応・メタデータ抽出の説明)
#### `static/js/app.js`
- `helpIdMap` に `"wfm-help-gen-11": "helpGen11"`、`"wfm-help-gallery-11": "helpGallery11"` を追加
---
## 2026-04-28: v0.3.3 Promptタブ — ワイルドカード支援パネル・Impact Packシンボリックリンク連携・サブディレクトリ対応・GenerateUI修正
### 概要
@@ -9,6 +69,8 @@
- 右ペイン(Col3): ワイルドカード支援パネルを新設
- ワイルドカードファイル管理(txt/yaml)の CRUD API を追加
- Settingsタブに Wildcard Integration セクションを追加(Impact Pack ジャンクション/シンボリックリンク連携)
- ワイルドカードフォルダのサブディレクトリファイルに対応(再帰スキャン・ディレクトリグループ表示・`__folder/name__` 形式)
- GenerateUI: `ImpactWildcardEncode` ノードの実行エラーを修正
### 変更内容
@@ -95,6 +157,45 @@
- `.wfm-wc-file-picker-wrap`、`.wfm-wc-file-picker`、`.wfm-wc-picker-item` — ファイルピッカー
- `.wfm-wc-files-section`、`.wfm-wc-file-list`、`.wfm-wc-file-item`、`.wfm-wc-editor` — ファイルマネージャ
### ワイルドカードサブディレクトリ対応
#### `py/services/wildcard_service.py`
- `list_wildcards()` — `iterdir()` → `rglob("*")` に変更して再帰スキャン。レスポンスに `dir`(サブディレクトリパス、ルートは空文字)と `wc_name`(拡張子なし相対パス、例: `color/animals`)を追加
- `_safe_path()` — `/` 区切りの相対パスを受け付けるよう変更。各パスコンポーネントを個別に検証してパストラバーサルをブロック
- `save_file()` — `path.parent.mkdir(parents=True, exist_ok=True)` を追加してサブディレクトリを自動作成。レスポンスに `dir`、`wc_name` を追加
#### `static/js/prompt-tab.js`
- `wcRenderFileList()` — ファイルをディレクトリごとにグループ化して表示(ルートが先、サブディレクトリはヘッダ付き)。サブディレクトリ内ファイルは `wfm-wc-file-item--sub` クラスでインデント。挿入テキストを `__f.name__` → `__f.wc_name__`(例: `__color/animals__`)に変更
- `wcUpdateFilePicker()` — 同様にディレクトリグループ表示。挿入テキストを `wc_name` ベースに変更
- Editor Save ハンドラ — `name` のバリデーションを `folder/name` 形式に対応。`\` を `/` に正規化して各コンポーネントを個別検証。`filename` を `name.ext`(例: `color/animals.txt`)として構築
#### `templates/index.html`
- エディタ名入力の placeholder を `"name or folder/name"` に更新
#### `static/css/main.css`
- `.wfm-wc-dir-header` — ファイル一覧のディレクトリ区切りヘッダ
- `.wfm-wc-file-item--sub` — サブディレクトリファイルの左インデント
- `.wfm-wc-picker-dir` — ファイルピッカーのディレクトリ区切りラベル
- `.wfm-wc-picker-item--sub` — ファイルピッカー内サブディレクトリファイルのインデント
- Safari 向け `-webkit-user-select` を追加
### GenerateUI: ImpactWildcardEncode バリデーションエラー修正
#### `static/js/comfyui-workflow.js`
- `convertUiToApi()` — COMBO 型ウィジェット値を `/object_info` の選択肢リストと照合し、値が存在しない場合は先頭の有効な選択肢にフォールバック。Impact Pack の `ImpactWildcardEncode` ノードが `"Select Wildcard 🟢 Full Cache"` 等の動的プレースホルダー値を持つ場合でも `"Prompt outputs failed validation"` エラーが発生しなくなる
- `analyzeWorkflow()` — `ImpactWildcardEncode` / `ImpactWildcardProcessor` を `prompt_nodes` として認識(KSampler の positive/negative 接続からロールを判定)。テキストフィールドキーを `text` ではなく `wildcard_text` として記録
#### `static/js/comfyui-editor.js`
- `renderPromptTab()` — select の option に `data-text-key` 属性を追加(`CLIPTextEncode` = `"text"`、`ImpactWildcardEncode` = `"wildcard_text"`)
- Apply ハンドラ — `analysis.prompt_nodes` から `textKey` を取得して `inputs[textKey]` に書き込むよう変更(従来は `inputs.text` 固定)
- `syncToWorkflow()` — 選択中の option の `data-text-key` を読んで正しいフィールドに書き込むよう変更。生成前の同期(`_coreGenerate` 直前の `comfyEditor.syncToWorkflow()` 経由)でも正しく反映される
---
## 2026-04-28: v0.3.2 生成UIタブ — Checkpoint Batch・Seed UIレイアウト修正
+4 -4
View File
@@ -5,7 +5,7 @@ A comprehensive workflow management and generation UI plugin for [ComfyUI](https
Browse, organize, and execute workflows directly from a dedicated studio interface — without switching between windows or manually editing JSON.
![Workflow Studio](https://img.shields.io/badge/ComfyUI-Custom_Node-blue)
![Version](https://img.shields.io/badge/version-0.3.3-green)
![Version](https://img.shields.io/badge/version-0.3.4-green)
## Screenshots
@@ -50,15 +50,15 @@ Browse, organize, and execute workflows directly from a dedicated studio interfa
- **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.2)
### GenerateUI Tab (v0.3.4)
- **3-tab layout** — Input / Model / Settings tabs, each with a Raw JSON column on the right for instant preview and direct editing
- **Input tab** — Prompt (top) and Image drag-and-drop (bottom) in the left column; Raw JSON (540px) in the right column
- **Model tab** — Checkpoint, VAE, LoRA, ControlNet, UNET, TextEncoder selectors with filter; Raw JSON on the right
- **Settings tab** — KSampler (top) and LatentImage (bottom) in the left column; 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
- **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
- **Checkpoint Batch** — enable via checkbox in the right panel to sequentially generate with every checkpoint model; filter by include folders (comma-separated subfolder names, empty = all) and/or exclude folders; Stop button aborts after the current generation completes; amber progress bar tracks per-model progress
- **Checkpoint Batch** — enable via checkbox in the right panel to sequentially generate with every checkpoint model; select checkpoints by folder from the dropdown (check a folder to select all its files, expand with ▶ for individual file selection, supports any subfolder depth); Filter input to search; All / None buttons for quick selection; **Pause/Resume** suspends processing between models; Stop aborts after the current generation; amber progress bar tracks per-model progress
- **UI-to-API conversion** — automatic conversion supporting subgraphs (nested workflows), COMBO types, and display-only node exclusion
- **Eagle integration** — auto-save generated images to [Eagle](https://eagle.cool/) with metadata
+27 -7
View File
@@ -24,17 +24,23 @@ class WildcardService:
# ------------------------------------------------------------------
def list_wildcards(self) -> list[dict]:
"""Return sorted list of wildcard files (follows junction/symlink)."""
"""Return sorted list of wildcard files recursively (follows junction/symlink)."""
if not self.wildcard_dir.exists():
return []
files = []
for path in sorted(self.wildcard_dir.iterdir()):
for path in sorted(self.wildcard_dir.rglob("*")):
if path.is_file() and path.suffix.lstrip(".").lower() in ALLOWED_EXTS:
rel = path.relative_to(self.wildcard_dir)
dir_posix = rel.parent.as_posix()
if dir_posix == ".":
dir_posix = ""
files.append({
"name": path.stem,
"filename": path.name,
"filename": rel.as_posix(),
"ext": path.suffix.lstrip(".").lower(),
"size": path.stat().st_size,
"dir": dir_posix,
"wc_name": rel.with_suffix("").as_posix(),
})
return files
@@ -50,12 +56,19 @@ class WildcardService:
path = self._safe_path(filename)
if path is None:
raise ValueError(f"Invalid filename: {filename}")
path.parent.mkdir(parents=True, exist_ok=True)
path.write_text(content, encoding="utf-8")
rel = path.relative_to(self.wildcard_dir)
dir_posix = rel.parent.as_posix()
if dir_posix == ".":
dir_posix = ""
return {
"name": path.stem,
"filename": path.name,
"filename": rel.as_posix(),
"ext": path.suffix.lstrip(".").lower(),
"size": path.stat().st_size,
"dir": dir_posix,
"wc_name": rel.with_suffix("").as_posix(),
}
def delete_file(self, filename: str) -> None:
@@ -66,12 +79,19 @@ class WildcardService:
path.unlink()
def _safe_path(self, filename: str) -> Path | None:
if not filename or ".." in filename or "/" in filename or "\\" in filename:
if not filename or not filename.strip():
return None
ext = Path(filename).suffix.lstrip(".").lower()
# Normalize to forward slashes and strip leading/trailing slashes
filename = filename.replace("\\", "/").strip("/")
# Validate each path component — block traversal and empty parts
parts = filename.split("/")
for p in parts:
if not p or p == ".." or p == ".":
return None
ext = Path(parts[-1]).suffix.lstrip(".").lower()
if ext not in ALLOWED_EXTS:
return None
return self.wildcard_dir / filename
return self.wildcard_dir.joinpath(*parts)
# ------------------------------------------------------------------
# Impact Pack integration
+168
View File
@@ -688,6 +688,140 @@ body {
padding-bottom: 6px;
}
/* Checkpoint batch dropdown */
.wfm-ckpt-dropdown-wrap {
position: relative;
}
.wfm-ckpt-dropdown-trigger {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
padding: 6px 10px;
background: var(--wfm-input-bg, var(--wfm-bg));
border: 1px solid var(--wfm-border);
border-radius: var(--wfm-radius);
color: var(--wfm-text-primary);
font-size: 12px;
cursor: pointer;
text-align: left;
transition: border-color 0.2s ease;
}
.wfm-ckpt-dropdown-trigger:hover {
border-color: var(--wfm-primary);
}
.wfm-ckpt-dropdown-arrow {
font-size: 9px;
color: var(--wfm-text-secondary);
transition: transform 0.15s;
flex-shrink: 0;
margin-left: 6px;
}
.wfm-ckpt-dropdown-wrap.open .wfm-ckpt-dropdown-arrow {
transform: rotate(180deg);
}
.wfm-ckpt-dropdown-panel {
position: absolute;
z-index: 200;
top: calc(100% + 2px);
left: 0;
right: 0;
background: var(--wfm-surface);
border: 1px solid var(--wfm-border);
border-radius: var(--wfm-radius);
box-shadow: 0 4px 16px rgba(0,0,0,0.35);
}
.wfm-ckpt-dropdown-list {
max-height: 200px;
overflow-y: auto;
padding: 4px 0;
}
.wfm-ckpt-item {
display: flex;
align-items: center;
gap: 6px;
padding: 4px 10px;
cursor: pointer;
font-size: 11px;
color: var(--wfm-text-primary);
}
.wfm-ckpt-item:hover {
background: rgba(255,255,255,0.05);
}
.wfm-ckpt-item input[type=checkbox] {
width: 12px;
height: 12px;
flex-shrink: 0;
cursor: pointer;
accent-color: var(--wfm-primary);
}
.wfm-ckpt-item-label {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.wfm-ckpt-item--indented {
padding-left: 24px;
}
.wfm-ckpt-folder-group {
border-bottom: 1px solid rgba(255,255,255,0.05);
}
.wfm-ckpt-folder-group:last-child {
border-bottom: none;
}
.wfm-ckpt-folder-header {
display: flex;
align-items: center;
gap: 6px;
padding: 5px 10px;
font-size: 11px;
font-weight: 600;
color: var(--wfm-text-secondary);
-webkit-user-select: none;
user-select: none;
}
.wfm-ckpt-folder-header:hover {
background: rgba(255,255,255,0.05);
}
.wfm-ckpt-folder-header input[type=checkbox] {
width: 12px;
height: 12px;
flex-shrink: 0;
cursor: pointer;
accent-color: var(--wfm-primary);
}
.wfm-ckpt-folder-toggle {
font-size: 8px;
color: var(--wfm-text-secondary);
transition: transform 0.15s;
flex-shrink: 0;
width: 10px;
text-align: center;
cursor: pointer;
}
.wfm-ckpt-folder-group.open .wfm-ckpt-folder-toggle {
transform: rotate(90deg);
}
.wfm-ckpt-folder-name {
flex: 1;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
cursor: pointer;
}
.wfm-ckpt-folder-count {
font-size: 10px;
color: var(--wfm-text-secondary);
opacity: 0.65;
flex-shrink: 0;
}
.wfm-ckpt-folder-files {
display: none;
}
.wfm-ckpt-folder-group.open .wfm-ckpt-folder-files {
display: block;
}
/* Generation panel in right column */
.wfm-gen-panel {
background: var(--wfm-surface);
@@ -2069,6 +2203,23 @@ body {
color: var(--wfm-primary);
}
.wfm-wc-picker-dir {
padding: 4px 10px 2px;
font-size: 10px;
font-weight: 600;
color: var(--wfm-text-secondary);
background: var(--wfm-bg);
border-bottom: 1px solid var(--wfm-border);
letter-spacing: 0.04em;
text-transform: uppercase;
-webkit-user-select: none;
user-select: none;
}
.wfm-wc-picker-item--sub {
padding-left: 18px;
}
/* File manager section */
.wfm-wc-files-section {
display: flex;
@@ -2105,6 +2256,19 @@ body {
max-height: 180px;
}
.wfm-wc-dir-header {
padding: 4px 8px 2px;
font-size: 10px;
font-weight: 600;
color: var(--wfm-text-secondary);
background: var(--wfm-bg);
border-bottom: 1px solid var(--wfm-border);
letter-spacing: 0.04em;
text-transform: uppercase;
-webkit-user-select: none;
user-select: none;
}
.wfm-wc-file-item {
display: flex;
align-items: center;
@@ -2115,6 +2279,10 @@ body {
transition: background 0.1s;
}
.wfm-wc-file-item--sub {
padding-left: 16px;
}
.wfm-wc-file-item:last-child {
border-bottom: none;
}
+2
View File
@@ -265,6 +265,7 @@ function applyI18nToHtml() {
"wfm-help-gen-3": "helpGen3", "wfm-help-gen-4": "helpGen4",
"wfm-help-gen-5": "helpGen5", "wfm-help-gen-6": "helpGen6", "wfm-help-gen-7": "helpGen7",
"wfm-help-gen-8": "helpGen8", "wfm-help-gen-9": "helpGen9", "wfm-help-gen-10": "helpGen10",
"wfm-help-gen-11": "helpGen11",
"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",
@@ -290,6 +291,7 @@ function applyI18nToHtml() {
"wfm-help-gallery-5": "helpGallery5", "wfm-help-gallery-6": "helpGallery6",
"wfm-help-gallery-7": "helpGallery7", "wfm-help-gallery-8": "helpGallery8",
"wfm-help-gallery-9": "helpGallery9", "wfm-help-gallery-10": "helpGallery10",
"wfm-help-gallery-11": "helpGallery11",
"wfm-help-sidepanel-title": "helpSidepanelTitle",
"wfm-help-sidepanel-1": "helpSidepanel1", "wfm-help-sidepanel-2": "helpSidepanel2",
"wfm-help-sidepanel-3": "helpSidepanel3", "wfm-help-sidepanel-4": "helpSidepanel4",
+19 -11
View File
@@ -77,7 +77,7 @@ export const comfyEditor = {
<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}" selected>ID:${n.id} (${n.title})</option>`).join("")}
${positiveNodes.map((n) => `<option value="${n.id}" data-text-key="${n.textKey || "text"}" selected>ID:${n.id} (${n.title})</option>`).join("")}
${nodeOpts}
</select>
<button class="wfm-btn wfm-btn-sm" id="wfm-prompt-pos-apply">Apply</button>
@@ -88,7 +88,7 @@ export const comfyEditor = {
<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}" selected>ID:${n.id} (${n.title})</option>`).join("")}
${negativeNodes.map((n) => `<option value="${n.id}" data-text-key="${n.textKey || "text"}" selected>ID:${n.id} (${n.title})</option>`).join("")}
${nodeOpts}
</select>
<button class="wfm-btn wfm-btn-sm" id="wfm-prompt-neg-apply">Apply</button>
@@ -101,7 +101,9 @@ export const comfyEditor = {
const nodeId = document.getElementById("wfm-prompt-pos-target")?.value;
const text = document.getElementById("wfm-prompt-pos-text")?.value;
if (nodeId && comfyUI.currentWorkflow?.[nodeId]) {
comfyUI.currentWorkflow[nodeId].inputs.text = text;
const promptNode = (analysis.prompt_nodes || []).find(n => n.id === nodeId);
const textKey = promptNode?.textKey || "text";
comfyUI.currentWorkflow[nodeId].inputs[textKey] = text;
_syncRawJson();
}
});
@@ -110,7 +112,9 @@ export const comfyEditor = {
const nodeId = document.getElementById("wfm-prompt-neg-target")?.value;
const text = document.getElementById("wfm-prompt-neg-text")?.value;
if (nodeId && comfyUI.currentWorkflow?.[nodeId]) {
comfyUI.currentWorkflow[nodeId].inputs.text = text;
const promptNode = (analysis.prompt_nodes || []).find(n => n.id === nodeId);
const textKey = promptNode?.textKey || "text";
comfyUI.currentWorkflow[nodeId].inputs[textKey] = text;
_syncRawJson();
}
});
@@ -209,8 +213,8 @@ export const comfyEditor = {
const latent = analysis.latent_nodes?.[0];
el.innerHTML = `
<div style="display:flex;flex-direction:column;gap:0;">
<div style="padding-bottom:14px;border-bottom:1px solid var(--wfm-border);margin-bottom:14px;">
<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>
${sampler ? `
<input type="hidden" id="wfm-settings-sampler-id" value="${sampler.id}">
@@ -245,7 +249,7 @@ export const comfyEditor = {
<button class="wfm-btn wfm-btn-sm" id="wfm-settings-sampler-apply">Apply</button>
` : "<p class='wfm-placeholder'>No KSampler node found</p>"}
</div>
<div>
<div style="flex:1;min-width:0;padding-left:14px;">
<h3 style="font-size:13px;font-weight:600;text-transform:uppercase;letter-spacing:0.5px;color:var(--wfm-text-secondary);margin:0 0 12px;">Latent Image</h3>
${latent ? `
<input type="hidden" id="wfm-settings-latent-id" value="${latent.id}">
@@ -402,16 +406,20 @@ export const comfyEditor = {
syncToWorkflow() {
// Sync prompt texts before generation
const posTarget = document.getElementById("wfm-prompt-pos-target")?.value;
const posSelect = document.getElementById("wfm-prompt-pos-target");
const posTarget = posSelect?.value;
const posText = document.getElementById("wfm-prompt-pos-text")?.value;
if (posTarget && comfyUI.currentWorkflow?.[posTarget]) {
comfyUI.currentWorkflow[posTarget].inputs.text = posText;
const posTextKey = posSelect.selectedOptions[0]?.dataset?.textKey || "text";
comfyUI.currentWorkflow[posTarget].inputs[posTextKey] = posText;
}
const negTarget = document.getElementById("wfm-prompt-neg-target")?.value;
const negSelect = document.getElementById("wfm-prompt-neg-target");
const negTarget = negSelect?.value;
const negText = document.getElementById("wfm-prompt-neg-text")?.value;
if (negTarget && comfyUI.currentWorkflow?.[negTarget]) {
comfyUI.currentWorkflow[negTarget].inputs.text = negText;
const negTextKey = negSelect.selectedOptions[0]?.dataset?.textKey || "text";
comfyUI.currentWorkflow[negTarget].inputs[negTextKey] = negText;
}
},
};
+33
View File
@@ -343,6 +343,24 @@ export const comfyWorkflow = {
wIdx++;
}
}
// 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
// (e.g. "Select Wildcard 🟢 Full Cache" vs "Select Wildcard"), causing
// "Prompt outputs failed validation". Fall back to first choice when mismatch.
if (expectedType === "COMBO") {
const allInputDefs = {
...(objectInfo[node.type]?.input?.required || {}),
...(objectInfo[node.type]?.input?.optional || {}),
};
const spec = allInputDefs[name];
if (spec) {
const choices = Array.isArray(spec[0]) ? spec[0] : null;
if (choices && choices.length > 0 && !choices.includes(val)) {
val = choices[0];
}
}
}
inputs[name] = val;
}
} else {
@@ -493,6 +511,21 @@ export const comfyWorkflow = {
result.prompt_nodes.push({
id, type: ct, title, role,
text: inputs.text,
textKey: "text",
});
}
// ImpactWildcardEncode / ImpactWildcardProcessor — treat wildcard_text as prompt
if (ct === "ImpactWildcardEncode" || ct === "ImpactWildcardProcessor") {
let role = "unknown";
if (samplerPositiveRef[id]) role = "positive";
else if (samplerNegativeRef[id]) role = "negative";
else if (/pos|正/i.test(title)) role = "positive";
else if (/neg|負/i.test(title)) role = "negative";
result.prompt_nodes.push({
id, type: ct, title, role,
text: inputs.wildcard_text,
textKey: "wildcard_text",
});
}
+310 -44
View File
@@ -153,49 +153,286 @@ export async function loadWorkflowIntoEditor(workflow, filename) {
// Checkpoint Batch
// ============================================
const _ckptBatch = { aborted: false };
const _ckptBatch = { aborted: false, paused: false, _resumeResolve: null };
function _parseFolderList(str) {
return str.split(",").map((s) => s.trim().toLowerCase()).filter(Boolean);
async function _waitIfPaused() {
if (!_ckptBatch.paused) return;
await new Promise((resolve) => { _ckptBatch._resumeResolve = resolve; });
}
function _getModelFolder(modelPath) {
const normalized = modelPath.replace(/\\/g, "/");
const idx = normalized.indexOf("/");
return idx === -1 ? "" : normalized.substring(0, idx).toLowerCase();
function _setPauseBtnState(paused) {
const btn = document.getElementById("wfm-ckpt-batch-pause-btn");
if (!btn) return;
btn.textContent = paused ? "Resume" : "Pause";
btn.style.background = paused ? "var(--wfm-success, #22c55e)" : "";
btn.style.color = paused ? "#fff" : "";
}
function _filterCheckpoints(checkpoints, includeStr, excludeStr) {
const inc = _parseFolderList(includeStr);
const exc = _parseFolderList(excludeStr);
return checkpoints.filter((m) => {
const folder = _getModelFolder(m);
if (inc.length > 0 && !inc.includes(folder)) return false;
if (exc.length > 0 && exc.includes(folder)) return false;
return true;
});
// mode: "all" = 全選択, "some" = 一部選択, "none" = 全解除
const _ckptState = { mode: "all", selected: new Set() };
function _getSelectedCheckpoints() {
const all = comfyEditor.models.checkpoints || [];
if (_ckptState.mode === "all") return all;
if (_ckptState.mode === "none") return [];
return all.filter((m) => _ckptState.selected.has(m));
}
function _updateDropdownLabel() {
const labelEl = document.getElementById("wfm-ckpt-dropdown-label");
if (!labelEl) return;
const total = (comfyEditor.models.checkpoints || []).length;
if (_ckptState.mode === "all") {
labelEl.textContent = total > 0 ? `All (${total})` : "All checkpoints";
} else if (_ckptState.mode === "none") {
labelEl.textContent = `0 / ${total} selected`;
} else {
labelEl.textContent = `${_ckptState.selected.size} / ${total} selected`;
}
}
// モデルパスリストをフォルダ → [modelPath, ...] のMapに変換
function _buildFolderTree(models) {
const map = new Map();
for (const m of models) {
const normalized = m.replace(/\\/g, "/");
const lastSlash = normalized.lastIndexOf("/");
const folder = lastSlash === -1 ? "" : normalized.substring(0, lastSlash);
if (!map.has(folder)) map.set(folder, []);
map.get(folder).push(m);
}
return new Map([...map.entries()].sort((a, b) => {
if (a[0] === b[0]) return 0;
if (a[0] === "") return -1;
if (b[0] === "") return 1;
return a[0].localeCompare(b[0]);
}));
}
// フォルダ内の選択状態を返す: "checked" | "indeterminate" | "unchecked"
function _getFolderCheckState(folderModels) {
if (_ckptState.mode === "all") return "checked";
if (_ckptState.mode === "none") return "unchecked";
const selCount = folderModels.filter((m) => _ckptState.selected.has(m)).length;
if (selCount === 0) return "unchecked";
if (selCount === folderModels.length) return "checked";
return "indeterminate";
}
// 単一モデルの選択トグル(_ckptState を更新)
function _toggleSingleModel(m, checked, all) {
if (_ckptState.mode === "all" && !checked) {
_ckptState.mode = "some";
_ckptState.selected.clear();
all.forEach((x) => _ckptState.selected.add(x));
} else if (_ckptState.mode === "none" && checked) {
_ckptState.mode = "some";
_ckptState.selected.clear();
}
if (checked) _ckptState.selected.add(m);
else _ckptState.selected.delete(m);
if (_ckptState.selected.size === all.length) { _ckptState.mode = "all"; _ckptState.selected.clear(); }
if (_ckptState.mode === "some" && _ckptState.selected.size === 0) _ckptState.mode = "none";
}
// フォルダ単位の一括トグル(_ckptState を更新)
function _toggleFolderModels(folderModels, checked, all) {
if (_ckptState.mode === "all" && !checked) {
_ckptState.mode = "some";
_ckptState.selected.clear();
all.forEach((x) => _ckptState.selected.add(x));
} else if (_ckptState.mode === "none" && checked) {
_ckptState.mode = "some";
_ckptState.selected.clear();
}
folderModels.forEach((m) => { if (checked) _ckptState.selected.add(m); else _ckptState.selected.delete(m); });
if (_ckptState.selected.size === all.length) { _ckptState.mode = "all"; _ckptState.selected.clear(); }
if (_ckptState.mode === "some" && _ckptState.selected.size === 0) _ckptState.mode = "none";
}
function _rebuildCkptList() {
const listEl = document.getElementById("wfm-ckpt-list");
if (!listEl) return;
const all = comfyEditor.models.checkpoints || [];
const search = document.getElementById("wfm-ckpt-search")?.value.toLowerCase() || "";
const filtered = search ? all.filter((m) => m.toLowerCase().includes(search)) : all;
if (filtered.length === 0) {
listEl.innerHTML = `<div style="padding:8px 10px;font-size:11px;color:var(--wfm-text-secondary);">No checkpoints</div>`;
return;
}
const folderTree = _buildFolderTree(filtered);
listEl.innerHTML = "";
for (const [folder, models] of folderTree) {
const group = document.createElement("div");
group.className = "wfm-ckpt-folder-group open";
// --- フォルダヘッダー ---
const header = document.createElement("div");
header.className = "wfm-ckpt-folder-header";
const folderCb = document.createElement("input");
folderCb.type = "checkbox";
const folderState = _getFolderCheckState(models);
folderCb.checked = folderState === "checked";
folderCb.indeterminate = folderState === "indeterminate";
const toggle = document.createElement("span");
toggle.className = "wfm-ckpt-folder-toggle";
toggle.textContent = "▶";
const nameSpan = document.createElement("span");
nameSpan.className = "wfm-ckpt-folder-name";
nameSpan.textContent = folder || "(root)";
nameSpan.title = folder || "(root)";
const countSpan = document.createElement("span");
countSpan.className = "wfm-ckpt-folder-count";
countSpan.textContent = models.length;
// --- ファイルリスト ---
const filesDiv = document.createElement("div");
filesDiv.className = "wfm-ckpt-folder-files";
for (const m of models) {
const itemLabel = document.createElement("label");
itemLabel.className = "wfm-ckpt-item wfm-ckpt-item--indented";
const fileCb = document.createElement("input");
fileCb.type = "checkbox";
fileCb.value = m;
if (_ckptState.mode === "all") fileCb.checked = true;
else if (_ckptState.mode === "none") fileCb.checked = false;
else fileCb.checked = _ckptState.selected.has(m);
const normalized = m.replace(/\\/g, "/");
const lastSlash = normalized.lastIndexOf("/");
const fileName = lastSlash === -1 ? m : m.substring(lastSlash + 1);
const fileSpan = document.createElement("span");
fileSpan.className = "wfm-ckpt-item-label";
fileSpan.textContent = fileName;
fileSpan.title = m;
fileCb.addEventListener("change", () => {
_toggleSingleModel(m, fileCb.checked, all);
const s = _getFolderCheckState(models);
folderCb.checked = s === "checked";
folderCb.indeterminate = s === "indeterminate";
_updateDropdownLabel();
_updateBatchInfo();
});
itemLabel.appendChild(fileCb);
itemLabel.appendChild(fileSpan);
filesDiv.appendChild(itemLabel);
}
// フォルダCBのchange
folderCb.addEventListener("change", () => {
_toggleFolderModels(models, folderCb.checked, all);
folderCb.indeterminate = false;
filesDiv.querySelectorAll("input[type=checkbox]").forEach((cb) => { cb.checked = folderCb.checked; });
_updateDropdownLabel();
_updateBatchInfo();
});
// フォルダ名 / トグル矢印クリックで展開・折りたたみ
[toggle, nameSpan].forEach((el) => {
el.addEventListener("click", () => group.classList.toggle("open"));
});
header.appendChild(folderCb);
header.appendChild(toggle);
header.appendChild(nameSpan);
header.appendChild(countSpan);
group.appendChild(header);
group.appendChild(filesDiv);
listEl.appendChild(group);
}
}
function _updateBatchInfo() {
const infoEl = document.getElementById("wfm-ckpt-batch-info");
if (!infoEl) return;
const inc = document.getElementById("wfm-ckpt-batch-include")?.value || "";
const exc = document.getElementById("wfm-ckpt-batch-exclude")?.value || "";
const n = _filterCheckpoints(comfyEditor.models.checkpoints, inc, exc).length;
const n = _getSelectedCheckpoints().length;
infoEl.textContent = `${n} checkpoint${n !== 1 ? "s" : ""} will be processed`;
}
function initCheckpointBatch() {
const checkbox = document.getElementById("wfm-ckpt-batch-enabled");
const body = document.getElementById("wfm-ckpt-batch-body");
const wrap = document.getElementById("wfm-ckpt-dropdown-wrap");
const btn = document.getElementById("wfm-ckpt-dropdown-btn");
const panel = document.getElementById("wfm-ckpt-dropdown-panel");
checkbox?.addEventListener("change", () => {
if (body) body.style.display = checkbox.checked ? "block" : "none";
if (checkbox.checked) _updateBatchInfo();
if (checkbox.checked) {
_updateDropdownLabel();
_updateBatchInfo();
}
});
document.getElementById("wfm-ckpt-batch-include")?.addEventListener("input", _updateBatchInfo);
document.getElementById("wfm-ckpt-batch-exclude")?.addEventListener("input", _updateBatchInfo);
// ドロップダウン開閉
btn?.addEventListener("click", (e) => {
e.stopPropagation();
const isOpen = panel.style.display !== "none";
if (isOpen) {
panel.style.display = "none";
wrap.classList.remove("open");
} else {
_rebuildCkptList();
panel.style.display = "block";
wrap.classList.add("open");
document.getElementById("wfm-ckpt-search")?.focus();
}
});
// 外側クリックで閉じる
document.addEventListener("click", (e) => {
if (panel && panel.style.display !== "none" && !wrap?.contains(e.target)) {
panel.style.display = "none";
wrap?.classList.remove("open");
}
});
// 検索フィルター
document.getElementById("wfm-ckpt-search")?.addEventListener("input", _rebuildCkptList);
// 全選択
document.getElementById("wfm-ckpt-select-all")?.addEventListener("click", () => {
_ckptState.mode = "all";
_ckptState.selected.clear();
_rebuildCkptList();
_updateDropdownLabel();
_updateBatchInfo();
});
// 全解除
document.getElementById("wfm-ckpt-deselect-all")?.addEventListener("click", () => {
_ckptState.mode = "none";
_ckptState.selected.clear();
_rebuildCkptList();
_updateDropdownLabel();
_updateBatchInfo();
});
// Pause / Resume
document.getElementById("wfm-ckpt-batch-pause-btn")?.addEventListener("click", () => {
if (!_ckptBatch.paused) {
_ckptBatch.paused = true;
_setPauseBtnState(true);
} else {
_ckptBatch.paused = false;
_setPauseBtnState(false);
if (_ckptBatch._resumeResolve) {
_ckptBatch._resumeResolve();
_ckptBatch._resumeResolve = null;
}
}
});
}
// ============================================
@@ -283,12 +520,10 @@ async function _runBatchGenerate() {
return;
}
const inc = document.getElementById("wfm-ckpt-batch-include")?.value || "";
const exc = document.getElementById("wfm-ckpt-batch-exclude")?.value || "";
const list = _filterCheckpoints(comfyEditor.models.checkpoints, inc, exc);
const list = _getSelectedCheckpoints();
if (list.length === 0) {
showToast("No checkpoints match the folder filter", "error");
showToast("No checkpoints selected", "error");
return;
}
@@ -299,33 +534,54 @@ async function _runBatchGenerate() {
const progressText = document.getElementById("wfm-gen-progress-text");
if (batchProgress) batchProgress.style.display = "block";
const pauseBtn = document.getElementById("wfm-ckpt-batch-pause-btn");
if (pauseBtn) { pauseBtn.style.display = "block"; pauseBtn.disabled = false; }
_setPauseBtnState(false);
let completed = 0;
let failed = 0;
for (let i = 0; i < list.length; i++) {
if (_ckptBatch.aborted) break;
try {
for (let i = 0; i < list.length; i++) {
if (_ckptBatch.aborted) break;
const model = list[i];
if (batchCurrentName) batchCurrentName.textContent = model;
if (batchCount) batchCount.textContent = `${i + 1} / ${list.length}`;
if (batchBar) batchBar.style.width = `${((i / list.length) * 100).toFixed(1)}%`;
if (progressText) progressText.textContent = `[${i + 1}/${list.length}] Loading...`;
// 一時停止中は次のモデルへ進む前に待機
if (_ckptBatch.paused) {
if (batchCurrentName) batchCurrentName.textContent = "Paused...";
if (progressText) progressText.textContent = "Paused";
}
await _waitIfPaused();
if (_ckptBatch.aborted) break;
for (const node of ckptNodes) {
if (comfyUI.currentWorkflow?.[node.id]) {
comfyUI.currentWorkflow[node.id].inputs.ckpt_name = model;
const model = list[i];
if (batchCurrentName) batchCurrentName.textContent = model;
if (batchCount) batchCount.textContent = `${i + 1} / ${list.length}`;
if (batchBar) batchBar.style.width = `${((i / list.length) * 100).toFixed(1)}%`;
if (progressText) progressText.textContent = `[${i + 1}/${list.length}] Loading...`;
for (const node of ckptNodes) {
if (comfyUI.currentWorkflow?.[node.id]) {
comfyUI.currentWorkflow[node.id].inputs.ckpt_name = model;
}
}
try {
await _coreGenerate(true);
completed++;
} catch (err) {
if (_ckptBatch.aborted) break;
failed++;
showToast(`[${i + 1}/${list.length}] Failed: ${err.message}`, "error");
}
}
try {
await _coreGenerate(true);
completed++;
} catch (err) {
if (_ckptBatch.aborted) break;
failed++;
showToast(`[${i + 1}/${list.length}] Failed: ${err.message}`, "error");
} finally {
if (pauseBtn) pauseBtn.disabled = true;
_ckptBatch.paused = false;
if (_ckptBatch._resumeResolve) {
_ckptBatch._resumeResolve();
_ckptBatch._resumeResolve = null;
}
_setPauseBtnState(false);
}
if (batchBar) batchBar.style.width = "100%";
@@ -360,6 +616,8 @@ async function handleGenerate() {
genBtn.disabled = true;
if (interruptBtn) interruptBtn.style.display = "inline-block";
_ckptBatch.aborted = false;
_ckptBatch.paused = false;
_ckptBatch._resumeResolve = null;
const batchEnabled = document.getElementById("wfm-ckpt-batch-enabled")?.checked;
@@ -408,6 +666,7 @@ export async function initGenerateTab() {
comfyEditor.renderAll(comfyUI.currentAnalysis, comfyUI.currentWorkflow);
}
showToast("Model lists refreshed", "success");
_updateDropdownLabel();
_updateBatchInfo();
});
@@ -417,6 +676,12 @@ export async function initGenerateTab() {
// Interrupt button (stops both single generation and batch loop)
document.getElementById("wfm-gen-interrupt-btn")?.addEventListener("click", async () => {
_ckptBatch.aborted = true;
// 一時停止中でもループを抜けられるよう待機を解除
_ckptBatch.paused = false;
if (_ckptBatch._resumeResolve) {
_ckptBatch._resumeResolve();
_ckptBatch._resumeResolve = null;
}
await comfyUI.interrupt();
showToast("Interrupted", "info");
});
@@ -492,6 +757,7 @@ export async function initGenerateTab() {
updateStatus(connected);
if (connected) {
await comfyEditor.loadModelLists();
_updateDropdownLabel();
_updateBatchInfo();
}
+27 -21
View File
@@ -343,11 +343,12 @@ const LANGUAGES = {
helpGen3: "3-tab layout — Input (Prompt + Image), Model, Settings — each with a Raw JSON column for instant preview and direct editing",
helpGen4: "Input tab: Prompt (top) and Image drag-and-drop (bottom) in the left column",
helpGen5: "Model tab: Checkpoint, VAE, LoRA, ControlNet, UNET, TextEncoder selectors with filter",
helpGen6: "Settings tab: KSampler (top) and LatentImage (bottom) in the left column",
helpGen6: "Settings tab: KSampler and Latent Image side by side, each at 50% width",
helpGen7: "Raw JSON always visible in the right column of each tab — edit directly and Apply to reload the workflow",
helpGen8: "Seed control: random, fixed, increment, decrement",
helpGen9: "Generate, progress display, stop, and view results",
helpGen10: "Eagle integration: auto-save generated images to Eagle",
helpGen11: "Checkpoint Batch: select checkpoints by folder from the dropdown — check a folder to select all its files, or expand with ▶ to check individual files; use Filter to search; Pause/Resume suspends and continues between models; Stop aborts after the current generation",
helpPrompt1: "AI assistant (Ollama): model selection, chat for prompt consultation, image attachment (vision models)",
helpPrompt2: "Apply AI responses to GenerateUI prompts",
helpPrompt3: "Translation: JA\u2194EN, ZH\u2194EN",
@@ -389,12 +390,13 @@ const LANGUAGES = {
helpGallery2: "3-column layout: folder tree (left) | image grid (center) | detail panel (right)",
helpGallery3: "Thumbnail and Table view modes; double-click any image to open fullscreen lightbox",
helpGallery4: "Toolbar filters: favorites (★), text search, tag filter, group filter, sort by date/name",
helpGallery5: "Multi-select with Ctrl+click — bulk operations: Add to Group, Favorite All, Unfavorite All",
helpGallery6: "Detail panel — Info tab: filename, size, date, tags (add/remove), memo with save",
helpGallery7: "Detail panel — Metadata tab: embedded ComfyUI workflow JSON viewer with one-click clipboard copy",
helpGallery8: "Detail panel — Groups tab: create, assign, remove, rename, and delete groups per image",
helpGallery9: "Supports PNG (tEXt/iTXt metadata), JPEG, WebP, GIF; PNG workflow extraction reads ComfyUI-embedded JSON",
helpGallery10: "Folder tree: click a folder to load its images; expand subfolders with ▶ arrow",
helpGallery5: "Folder tree: click to load images, expand with ▶; '+ New' creates a subfolder inside the selected folder, 'Del' deletes it with all contents",
helpGallery6: "Multi-select with Ctrl+click — bulk operations: Add to Group, Favorite All, Unfavorite All, Move To..., Delete",
helpGallery7: "Detail panel — Info tab: filename, size, date, tags (add/remove), memo; 'Move To...' moves the image to another folder, 'Delete' removes it permanently",
helpGallery8: "Detail panel — Metadata tab: displays workflow JSON from PNG embedded data (prompt / workflow keys) or from metadata saved by the Generate UI tab; one-click clipboard copy",
helpGallery9: "Detail panel — Groups tab: create, assign, remove, rename, and delete groups per image",
helpGallery10: "Workflow auto-save: images generated in the Generate UI tab automatically have their workflow saved to gallery metadata and shown in the Metadata tab",
helpGallery11: "Supports PNG (tEXt/iTXt), JPEG, WebP, GIF; workflow extraction reads ComfyUI prompt and workflow keys embedded in PNG metadata",
helpSidepanelTitle: "Workflow Studio Library (ComfyUI Side Panel)",
helpSidepanel1: "Open from the Workflow Studio Library button in the ComfyUI toolbar",
helpSidepanel2: "Workflows tab: All / ★ Favorites / Groups sub-tabs; ★ shown for favorites in All view",
@@ -869,11 +871,12 @@ const LANGUAGES = {
helpGen3: "3タブ構成 — Input(プロンプト+画像)、Model、Settings — 各タブにRaw JSON列を常時表示",
helpGen4: "Inputタブ:左列にPrompt(上段)+ Image ドラッグ&ドロップ(下段)",
helpGen5: "Modelタブ:Checkpoint/VAE/LoRA/ControlNet/UNET/TextEncoderのセレクタ(フィルタ検索付き)",
helpGen6: "Settingsタブ:左列にKSampler(上段)+ LatentImage(下段)",
helpGen6: "Settingsタブ:KSamplerとLatent Imageを横並び(各50%幅)",
helpGen7: "Raw JSONを各タブの右列に常時表示 — 直接編集してApplyでワークフロー即時反映",
helpGen8: "シード管理:ランダム / 固定 / 増加 / 減少",
helpGen9: "画像生成、進捗表示、生成停止、結果表示",
helpGen10: "Eagle連携:生成画像をEagleへ自動保存",
helpGen11: "Checkpoint Batch:ドロップダウンのフォルダツリーからチェックポイントを選択 — フォルダにチェックでそのフォルダ内を一括選択、▶で展開して個別選択も可能;Filterで絞り込み;Pause/Resumeでモデル間の処理を一時停止・再開;Stopで現在の生成完了後に中断",
helpPrompt1: "AIアシスタント(Ollama):モデル選択、チャットでプロンプト相談、画像添付(ビジョンモデル対応)",
helpPrompt2: "AIの応答をGenerateUIのプロンプトに適用",
helpPrompt3: "翻訳機能:日⇔英、中⇔英",
@@ -915,12 +918,13 @@ const LANGUAGES = {
helpGallery2: "3カラムレイアウト: フォルダツリー (左) | 画像グリッド (中央) | 詳細パネル (右)",
helpGallery3: "サムネイル・テーブル表示モード切替;ダブルクリックで全画面ライトボックス表示",
helpGallery4: "ツールバーフィルタ:お気に入り(★)、テキスト検索、タグフィルタ、グループフィルタ、日付・名前ソート",
helpGallery5: "Ctrl+クリックで複数選択 — 一括操作:グループへ追加、一括お気に入り、一括お気に入り解除",
helpGallery6: "詳細パネル — Infoタブ:ファイル名、サイズ、日付、タグ(追加/削除)、メモ(保存機能付き)",
helpGallery7: "詳細パネル — Metadataタブ:埋め込みComfyUIワークフローJSONビューアとワンクリッククリップボードコピー",
helpGallery8: "詳細パネル — Groupsタブ:画像ごとのグループ作成、割り当て、解除、名前変更、削除",
helpGallery9: "PNG (tEXt/iTXt メタデータ), JPEG, WebP, GIF対応; PNGはComfyUIの埋め込みJSONを読み込んでワークフロー抽出可能",
helpGallery10: "フォルダツリー:フォルダをクリックして画像を読み込む;▶矢印でサブフォルダを展開",
helpGallery5: "フォルダツリー:クリックで画像を読み込み;▶で展開;「+ New」で選択フォルダ内にサブフォルダを作成;「Del」でそのフォルダとすべての内容を削除",
helpGallery6: "Ctrl+クリックで複数選択 — 一括操作:グループへ追加、一括お気に入り、一括お気に入り解除、移動(Move To...)、削除",
helpGallery7: "詳細パネル — Infoタブ:ファイル名、サイズ、日付、タグ(追加/削除)、メモ;「Move To...」で他フォルダへ移動;「Delete」で完全削除",
helpGallery8: "詳細パネル — Metadataタブ:PNGの埋め込みデータ(prompt / workflow キー)またはGenerateUIタブで保存したメタデータからワークフローJSONを表示;ワンクリックでクリップボードコピー",
helpGallery9: "詳細パネル — Groupsタブ:画像ごとのグループ作成、割り当て、解除、名前変更、削除",
helpGallery10: "ワークフロー自動保存:GenerateUIタブで生成した画像はワークフローが自動でギャラリーメタデータに保存され、Metadataタブで確認可能",
helpGallery11: "PNG (tEXt/iTXt)、JPEG、WebP、GIF対応;PNG形式はComfyUIの埋め込みJSON(prompt / workflow キー)を読み込んでワークフロー抽出が可能",
helpSidepanelTitle: "Workflow Studio Library(ComfyUIサイドパネル)",
helpSidepanel1: "ComfyUIツールバーのWorkflow Studio Libraryボタンから開く",
helpSidepanel2: "Workflowsタブ:All / ★ Favorites / Groupsサブタブ、Allビューでお気に入りに★表示",
@@ -1391,11 +1395,12 @@ const LANGUAGES = {
helpGen3: "3标签布局 — Input(提示词+图片)、Model、Settings — 每个标签含Raw JSON列实时预览",
helpGen4: "Input标签:左列为Prompt(上)+ Image拖放(下)",
helpGen5: "Model标签:Checkpoint/VAE/LoRA/ControlNet/UNET/TextEncoder选择器(含筛选)",
helpGen6: "Settings标签:左列为KSampler(上)+ LatentImage(下)",
helpGen6: "Settings标签:KSampler与Latent Image并排显示(各占50%宽度)",
helpGen7: "Raw JSON在每个标签右列常驻显示 — 直接编辑并Apply即时重载工作流",
helpGen8: "种子管理:随机/固定/递增/递减",
helpGen9: "生成图片、进度显示、停止生成、查看结果",
helpGen10: "Eagle集成:自动保存生成图片到Eagle",
helpGen11: "Checkpoint Batch:从下拉框文件夹树中选择检查点 — 勾选文件夹可一键选中该文件夹内的所有文件,▶展开后也可单独选择;使用Filter筛选;Pause/Resume可在模型之间暂停和继续;Stop在当前生成完成后中止",
helpPrompt1: "AI助手(Ollama):模型选择、聊天咨询提示词、图片附件(视觉模型)",
helpPrompt2: "将AI回复应用到生成UI的提示词",
helpPrompt3: "翻译功能:日\u2194英、中\u2194英",
@@ -1437,12 +1442,13 @@ const LANGUAGES = {
helpGallery2: "三列布局:文件夹树(左) | 图像网格(中) | 详情面板(右)",
helpGallery3: "缩略图和表格视图模式;双击任何图像可在全屏灯箱中打开",
helpGallery4: "工具栏过滤器:收藏 (★)、文本搜索、标签过滤、分组过滤、按日期/名称排序",
helpGallery5: "使用 Ctrl+点击 多选 — 批量操作:添加到分组、全部收藏、取消全部收藏",
helpGallery6: "详情面板 — 信息(Info)标签:文件名、大小、日期、标签(添加/移除)、包含保存功能的备注",
helpGallery7: "详情面板 — 元数据(Metadata)标签:ComfyUI 嵌入的内置工作流 JSON 查看器及一键复制功能",
helpGallery8: "详情面板 — 分组(Groups)标签:对每个图像进行组的创建、分配、移除、重命名和删除",
helpGallery9: "支持 PNG(tEXt/iTXt 元数据)、JPEG、WebP、GIF;对于 PNG 会读取 ComfyUI 内置的 JSON 提取工作流",
helpGallery10: "文件夹树:点击文件夹加载其包含的图像;使用 ▶ 箭头展开子文件夹",
helpGallery5: "文件夹树:点击加载图像,▶展开;'+ New'在选定文件夹内创建子文件夹;'Del'删除该文件夹及其所有内容",
helpGallery6: "使用Ctrl+点击多选 — 批量操作:添加到分组、全部收藏、取消全部收藏、移动到...、删除",
helpGallery7: "详情面板 — 信息(Info)标签:文件名、大小、日期、标签(添加/移除)、备注;'移动到...'将图像移至另一文件夹;'删除'永久删除",
helpGallery8: "详情面板 — 元数据(Metadata)标签:显示来自PNG嵌入数据(prompt / workflow键)或Generate UI标签保存的工作流JSON;一键复制到剪贴板",
helpGallery9: "详情面板 — 分组(Groups)标签:对每个图像进行组的创建、分配、移除、重命名和删除",
helpGallery10: "工作流自动保存:在Generate UI标签生成的图像,其工作流会自动保存到图库元数据,并在Metadata标签中显示",
helpGallery11: "支持PNG(tEXt/iTXt)、JPEG、WebP、GIF;PNG格式读取ComfyUI嵌入的JSON(prompt / workflow键)提取工作流",
helpSidepanelTitle: "Workflow Studio Library(ComfyUI侧面板)",
helpSidepanel1: "从ComfyUI工具栏的Workflow Studio Library按钮打开",
helpSidepanel2: "Workflows标签:All / ★ Favorites / Groups子标签,All视图中收藏项显示★",
+69 -21
View File
@@ -685,38 +685,60 @@ function wcRenderFileList() {
return;
}
// Group by directory; root ("") first, then alphabetical
const grouped = {};
for (const f of wcFiles) {
const dir = f.dir || "";
if (!grouped[dir]) grouped[dir] = [];
grouped[dir].push(f);
}
const dirs = Object.keys(grouped).sort((a, b) => {
if (a === "") return -1;
if (b === "") return 1;
return a.localeCompare(b);
});
function addFileItem(f, indented) {
const item = document.createElement("div");
item.className = "wfm-wc-file-item";
item.className = "wfm-wc-file-item" + (indented ? " wfm-wc-file-item--sub" : "");
item.innerHTML = `
<div class="wfm-wc-file-item-info">
<span class="wfm-wc-file-name">${esc(f.name)}</span>
<span class="wfm-wc-file-ext">.${esc(f.ext)}</span>
</div>
<div class="wfm-wc-file-item-actions">
<button class="wfm-pm-action-btn wfm-wc-use-btn" title="Insert __${esc(f.name)}__ at cursor">Use</button>
<button class="wfm-pm-action-btn wfm-wc-use-btn" title="Insert __${esc(f.wc_name)}__ at cursor">Use</button>
<button class="wfm-pm-action-btn wfm-wc-edit-btn" title="Edit file">&#9998;</button>
</div>
`;
// Insert reference into wildcard prompt
item.querySelector(".wfm-wc-use-btn").addEventListener("click", (e) => {
e.stopPropagation();
const ta = document.getElementById("wfm-wc-prompt");
if (ta) wcInsertAtCursor(ta, `__${f.name}__`);
if (ta) wcInsertAtCursor(ta, `__${f.wc_name}__`);
});
// Open editor
item.querySelector(".wfm-wc-edit-btn").addEventListener("click", async (e) => {
e.stopPropagation();
const content = await wcFetchContent(f.filename);
wcOpenEditor(f.name, f.ext, content ?? "", f.filename);
wcOpenEditor(f.wc_name, f.ext, content ?? "", f.filename);
});
// Click row = same as Use
item.addEventListener("click", () => {
const ta = document.getElementById("wfm-wc-prompt");
if (ta) wcInsertAtCursor(ta, `__${f.name}__`);
if (ta) wcInsertAtCursor(ta, `__${f.wc_name}__`);
});
list.appendChild(item);
}
for (const dir of dirs) {
if (dir) {
const header = document.createElement("div");
header.className = "wfm-wc-dir-header";
header.textContent = dir + "/";
list.appendChild(header);
}
for (const f of grouped[dir]) {
addFileItem(f, dir !== "");
}
}
}
// ============================================
@@ -765,16 +787,36 @@ function wcUpdateFilePicker() {
picker.innerHTML = `<div style="padding:8px;font-size:11px;color:var(--wfm-text-secondary);">No wildcard files</div>`;
return;
}
// Group by directory same as file list
const grouped = {};
for (const f of wcFiles) {
const btn = document.createElement("button");
btn.className = "wfm-wc-picker-item";
btn.textContent = `__${f.name}__`;
btn.addEventListener("click", () => {
const ta = document.getElementById("wfm-wc-prompt");
if (ta) wcInsertAtCursor(ta, `__${f.name}__`);
picker.style.display = "none";
});
picker.appendChild(btn);
const dir = f.dir || "";
if (!grouped[dir]) grouped[dir] = [];
grouped[dir].push(f);
}
const dirs = Object.keys(grouped).sort((a, b) => {
if (a === "") return -1;
if (b === "") return 1;
return a.localeCompare(b);
});
for (const dir of dirs) {
if (dir) {
const sep = document.createElement("div");
sep.className = "wfm-wc-picker-dir";
sep.textContent = dir + "/";
picker.appendChild(sep);
}
for (const f of grouped[dir]) {
const btn = document.createElement("button");
btn.className = "wfm-wc-picker-item" + (dir ? " wfm-wc-picker-item--sub" : "");
btn.textContent = `__${f.wc_name}__`;
btn.addEventListener("click", () => {
const ta = document.getElementById("wfm-wc-prompt");
if (ta) wcInsertAtCursor(ta, `__${f.wc_name}__`);
picker.style.display = "none";
});
picker.appendChild(btn);
}
}
}
@@ -1150,13 +1192,19 @@ export function initPromptTab() {
const extSelect = document.getElementById("wfm-wc-editor-ext");
const contentTA = document.getElementById("wfm-wc-editor-content");
const name = nameInput?.value.trim();
// Normalize separators and strip leading/trailing slashes
const rawName = (nameInput?.value || "").trim().replace(/\\/g, "/").replace(/\/+/g, "/").replace(/^\/|\/$/g, "");
const ext = extSelect?.value || "txt";
const content = contentTA?.value || "";
if (!name) { showToast("Enter a filename", "error"); return; }
if (!/^[\w\-. ]+$/.test(name)) { showToast("Filename can only contain letters, numbers, -, _, .", "error"); return; }
if (!rawName) { showToast("Enter a filename", "error"); return; }
// Validate each path component (allow letters, numbers, -, _, ., space)
const nameParts = rawName.split("/");
if (nameParts.some(p => !p || !/^[\w\-. ]+$/.test(p))) {
showToast("Invalid path. Use folder/name format, each part: letters, numbers, -, _, . only", "error");
return;
}
const name = rawName;
const filename = `${name}.${ext}`;
const saved = await wcSaveFile(filename, content);
if (saved) {
+23 -9
View File
@@ -352,12 +352,23 @@
</div>
<div id="wfm-ckpt-batch-body" style="display:none;margin-top:8px;">
<div style="margin-bottom:6px;">
<div style="font-size:11px;color:var(--wfm-text-secondary);margin-bottom:3px;">Include Folders (empty = all, comma-separated)</div>
<input type="text" id="wfm-ckpt-batch-include" class="wfm-input" placeholder="e.g. sdxl, flux">
</div>
<div style="margin-bottom:6px;">
<div style="font-size:11px;color:var(--wfm-text-secondary);margin-bottom:3px;">Exclude Folders (comma-separated)</div>
<input type="text" id="wfm-ckpt-batch-exclude" class="wfm-input" placeholder="e.g. old, test">
<div style="font-size:11px;color:var(--wfm-text-secondary);margin-bottom:3px;">Checkpoints</div>
<div class="wfm-ckpt-dropdown-wrap" id="wfm-ckpt-dropdown-wrap">
<button type="button" id="wfm-ckpt-dropdown-btn" class="wfm-ckpt-dropdown-trigger">
<span id="wfm-ckpt-dropdown-label">All checkpoints</span>
<span class="wfm-ckpt-dropdown-arrow">&#9660;</span>
</button>
<div id="wfm-ckpt-dropdown-panel" class="wfm-ckpt-dropdown-panel" style="display:none;">
<div style="padding:6px 8px 4px;">
<input type="text" id="wfm-ckpt-search" class="wfm-input" style="height:28px;padding:4px 8px;font-size:11px;" placeholder="Filter...">
</div>
<div style="display:flex;gap:4px;padding:0 8px 4px;">
<button type="button" id="wfm-ckpt-select-all" class="wfm-btn wfm-btn-sm" style="flex:1;font-size:10px;">All</button>
<button type="button" id="wfm-ckpt-deselect-all" class="wfm-btn wfm-btn-sm" style="flex:1;font-size:10px;">None</button>
</div>
<div id="wfm-ckpt-list" class="wfm-ckpt-dropdown-list"></div>
</div>
</div>
</div>
<div id="wfm-ckpt-batch-info" style="font-size:11px;color:var(--wfm-text-secondary);"></div>
<div id="wfm-ckpt-batch-progress" style="margin-top:8px;display:none;">
@@ -368,6 +379,9 @@
<div class="wfm-gen-progress-track">
<div id="wfm-ckpt-batch-bar" class="wfm-gen-progress-bar" style="background:var(--wfm-warning,#f59e0b);"></div>
</div>
<div style="margin-top:6px;">
<button id="wfm-ckpt-batch-pause-btn" class="wfm-btn wfm-btn-sm" style="width:100%;">Pause</button>
</div>
</div>
</div>
</div>
@@ -549,7 +563,7 @@
<!-- Editor (shown when a file is selected or New is clicked) -->
<div id="wfm-wc-editor" class="wfm-wc-editor" style="display:none;">
<div class="wfm-wc-editor-header">
<input type="text" id="wfm-wc-editor-name" class="wfm-input" placeholder="filename (no extension)" style="flex:1;min-width:0;">
<input type="text" id="wfm-wc-editor-name" class="wfm-input" placeholder="name or folder/name" style="flex:1;min-width:0;">
<select id="wfm-wc-editor-ext" class="wfm-select" style="width:70px;">
<option value="txt">txt</option>
<option value="yaml">yaml</option>
@@ -615,12 +629,12 @@
<li id="wfm-help-gen-3">3-tab layout — Input (Prompt + Image), Model, Settings — each with a Raw JSON column for instant preview and direct editing</li>
<li id="wfm-help-gen-4">Input tab: Prompt (top) and Image drag-and-drop (bottom) in the left column</li>
<li id="wfm-help-gen-5">Model tab: Checkpoint, VAE, LoRA, ControlNet, UNET, TextEncoder selectors with filter</li>
<li id="wfm-help-gen-6">Settings tab: KSampler (top) and LatentImage (bottom) in the left column</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-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-11">Checkpoint Batch: enable via checkbox in the right panel to auto-generate once per checkpoint model; filter by include folders (comma-separated), exclude folders, or leave blank to use all checkpoints; Stop button aborts the loop after the current generation; per-model progress bar shown in amber</li>
<li id="wfm-help-gen-11">Checkpoint Batch: select checkpoints by folder from the dropdown — check a folder to select all its files, or expand with ▶ to check individual files; use Filter to search; Pause/Resume suspends and continues between models; Stop aborts after the current generation</li>
</ul>
</div>