Redesign GenerateUI tab layout: 3-tab structure with inline Raw JSON (v0.2.4)

- 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 preview and direct editing from any tab - Input tab: Prompt (top) + Image (bottom) stacked vertically in left column - Model tab: model selectors with filter in left column - Settings tab: KSampler (top) + LatentImage (bottom) stacked vertically in left column - Raw JSON widget shared across tabs via DOM appendChild on tab switch - Right column slimmed to 280px: Generate/Seed/Results only - Docs: DEVLOG, README, i18n help keys, index.html help tab updated for v0.2.4 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Unify badge system, add GenUI Model button, expand sidebar Models tab (v0.2.3)
2026-03-29 18:01:45 +09:00 · 2026-03-29 17:12:28 +09:00
13 changed files with 1462 additions and 338 deletions
@@ -1,5 +1,143 @@
 # DEVLOG - ComfyUI-Workflow-Studio

+## 2026-03-29: v0.2.4 GenerateUIタブ レイアウト再設計
+
+### 概要
+- GenerateUIのサブタブを5タブ（Prompt/Image/Model/Settings/RawJSON）→ 3タブ（Input/Model/Settings）に整理
+- 各タブ内にRaw JSONエディタを右列として常時表示。どのタブでもJSON変更をリアルタイム確認・直接編集・Apply可能
+- Raw JSONタブを廃止（独立タブとしての Raw JSON は不要）
+- 右列（生成コントロール）はGenerate/Seed/結果画像のみにスリム化
+
+### 変更内容
+
+#### `templates/index.html` — タブ構成刷新
+
+- **Inputタブ**: 左列＝Prompt（上段）+ Image（下段）の縦2段、右列＝Raw JSON（540px）
+- **Modelタブ**: 左列＝モデル選択フォーム（スクロール）、右列＝Raw JSON（540px）
+- **Settingsタブ**: 左列＝KSampler（上段）+ LatentImage（下段）の縦2段、右列＝Raw JSON（540px）
+- Raw JSONのDOMノード（`wfm-gen-rawjson-widget`）はページ内に1つ定義し、タブ切替時にJSで対応する列へ移動
+- 右列（`.wfm-gen-right`）: 280px幅、Generate/Stop/Progress/Seed＋結果画像のみ
+
+#### `static/js/generate-tab.js` — タブ切替時にRaw JSONを移動
+
+- `moveRawJsonToTab(tabKey)` 追加: `wfm-gen-rawjson-widget` を `wfm-gen-rawjson-col-{tabKey}` へ `appendChild`
+- 初期表示（Input）とタブクリック時に自動移動
+
+#### `static/js/comfyui-editor.js` — Settings縦2段化
+
+- `renderSettingsTab`: KSampler / LatentImageを横2列グリッド → 縦2段（`flex-direction:column`）に変更
+- `renderAll` の末尾に `_syncRawJson()` 追加（ワークフロー読込直後にRaw JSONが即時反映）
+
+#### `static/css/main.css` — 新レイアウト用スタイル
+
+- `.wfm-gen-tab-cols`: タブ内2列レイアウト（flex行）
+- `.wfm-gen-params-col`: 左サブ列（flex:1、縦積み）
+- `.wfm-gen-params-col--scroll`: Model/Settings用スクロール変種
+- `.wfm-gen-params-section`: Input用上下2段の各セクション（flex:1、overflow-y:auto）
+- `.wfm-gen-rawjson-col`: Raw JSON列（540px固定幅）
+- `#wfm-gen-rawjson-widget` / `.wfm-gen-rawjson-header` / `.wfm-gen-rawjson-editor`: Raw JSONウィジェットスタイル
+
+### 技術的な判断
+- **Raw JSONをDOMで移動**: タブごとにtextareaのIDは1つである必要があるため、DOMノードをappendChildで移動する方式を採用。イベントリスナーはノードに付いたまま引き継がれる
+- **Raw JSON列幅540px**: テキストエディタとして十分な視認性を確保しつつ、パラメータ列にも十分な幅を残す設定
+
+---
+
+## 2026-03-29: v0.2.3 バッジ統一・GenUI Model・サイドパネルModels拡充
+
+### 概要
+- ワークフローとモデルのバッジ体系を統一（共有パレット `wfm_models_badge_palette`、自動解析廃止）
+- ModelsタブにGenUI Modelボタン追加（詳細モーダル・サイドパネル両対応）
+- ComfyUIサイドパネルのModelsタブにFavorites/Groups/By Typeサブタブを追加
+- サイドパネルのWorkflows・Nodesサブタブ名を「All」に統一、お気に入りに★表示
+- サイドパネル幅を280px→310pxに拡張
+
+### 変更内容
+
+#### `web/comfyui/node_sets_menu.js` — サイドパネルModels拡充
+
+- **Modelsタブのサブタブ構成を2段に変更:**
+  - row1: All / ★ Favorites / 📁 Groups
+  - row2: ◦ By Type
+  - `state.modelSubTab2` で行2の選択を管理
+- **`renderModelFavorites(container)`** — 全モデルを取得し `state.modelMetadata[name]?.favorite === true` のものを表示
+- **`renderModelGroups(container)`** — `state.modelGroups` からコラプス式セクションを生成
+- **Workflowsサブタブ名:** `"Workflows"` → `"All"`
+- **Nodesサブタブ名:** `"Nodes"` → `"All"`
+- **Allビューでお気に入りに★表示:**
+  - `createDraggableWfItem`: `wf.metadata?.favorite` に応じて `<span class="wfm-nlp-fav-star">★</span>` を追加
+  - `renderAllNodes`: `state.metadata[name]?.favorite` に応じて★を表示
+- **`.wfm-nlp-fav-star`** スタイル追加（`color: #f5c518; font-size: 11px; margin-right: 3px`）
+- **サイドパネル幅:** `width: 280px` → `width: 310px`
+- **`getWfModelTypes` → `getWfBadges`** にリネーム（`wf.metadata?.badges` ベースに変更）
+- **`wfModelTypes` state → `wfBadgeTypes`** にリネーム
+- `renderWfModelType` がバッジ表示に `state.wfBadgeTypes` を使用
+
+#### `static/js/models-tab.js` — GenUI Modelボタン・バッジ表示改善
+
+- **型バッジの削除:** ThumbView・CardView・SidePanelの `renderSideInfo` から `typeBadge = badgeHtml(typeLabel)` を削除。ユーザー定義バッジのみ表示
+- **`GENUI_TYPE_MAP` 追加:**
+  ```javascript
+  const GENUI_TYPE_MAP = {
+      checkpoint:  { key: "checkpoints",     inputKey: "ckpt_name" },
+      lora:        { key: "loras",           inputKey: "lora_name" },
+      vae:         { key: "vaes",            inputKey: "vae_name" },
+      controlnet:  { key: "controlNets",     inputKey: "control_net_name" },
+      unet:        { key: "diffusionModels", inputKey: "unet_name" },
+      textencoder: { key: "textEncoders",    inputKey: "clip_name1" },
+  };
+  ```
+  hypernetwork / embedding は対象外
+- **`applyToGenUI(modelName, modelType)`** 追加:
+  - `comfyUI.currentWorkflow` からターゲット `inputKey` を持つノードを検索
+  - `node.inputs[inputKey] = modelName` で直接セット
+  - `<select id="wfm-model-${key}">` の表示値も同期
+  - `<textarea id="wfm-gen-raw-json">` も同期
+  - 成功トースト表示
+- **詳細モーダルの actions に「GenUI Model」ボタン追加**（`GENUI_TYPE_MAP` に対応するタイプのみ表示）
+- **サイドパネルの Save ボタン右隣に「GenUI Model」ボタン追加**（同上）
+- **`export function openBadgeEditModal(onPaletteChange = null)`** — workflow-tab.js から呼び出せるよう export 化
+- **`bindBadgeModalEvents(onPaletteChange)`** — パレット変更後に `renderBadgeFilter()`, `renderModelGrid()`, `onPaletteChange()` を実行
+
+#### `static/js/workflow-tab.js` — バッジ体系をモデルタブと統一
+
+- **`import { openBadgeEditModal } from "./models-tab.js"`** 追加
+- **自動解析によるバッジ体系を廃止:**
+  - `state.badgeColors`, `BADGE_DEFAULT_COLORS` 削除
+  - 「Analysis」「Override」セクションを詳細モーダルから完全削除
+  - `getAllModelTypes()` → `getAllBadges()` （`wf.metadata?.badges` ベース）
+  - `state.activeModel` → `state.activeBadge`
+- **共有パレット関数を追加:** `getBadgePalette()`, `saveBadgePalette()` （`wfm_models_badge_palette` localStorage キー共有）
+- **`badgeHtml(label)`** が共有パレットを参照するように変更
+- **`wfBadgesHtml(wf)`** ヘルパー追加（`wf.metadata?.badges` から表示用バッジHTML生成）
+- **`filterWorkflows()`** が `wf.metadata?.badges` でフィルタリング
+- **詳細モーダルにバッジチェックボックスUI追加**（Modelsタブと同じ管理UI）
+- **⚙ボタン** → `renderViewSettings()`（ビュー設定のみ）
+- **「⚙ Badge」ボタン追加** → `openBadgeEditModal(() => renderGrid())`
+
+#### `templates/index.html` — Workflowツールバー更新
+
+- `<button id="wfm-reanalyze-btn">Reanalyze All</button>` 削除
+- `<button id="wfm-badge-btn">⚙ Badge</button>` 追加
+- ⚙設定ボタンの title を "View settings" に変更
+
+#### `static/js/i18n.js` — 翻訳追加（EN/JA/ZH）
+
+- **GenUI Model関連（3言語）:**
+  - `modelsGenUIBtn`: "GenUI Model"
+  - `modelsGenUITitle`: ボタンのツールチップ
+  - `modelsGenUIUnsupported`: 非対応タイプへの警告
+  - `modelsGenUINoWorkflow`: GenUIにワークフローが未読み込みの警告
+  - `modelsGenUINoNode(type)`: 対応ノードが見つからない場合の警告（アロー関数）
+
+### 技術的な判断
+
+- **バッジ統一の方針:** 自動解析モデルタイプはユーザー操作が必要なオーバーライドが多く UX が複雑だったため廃止。完全にユーザー定義バッジへ移行し、ワークフロー/モデル間で同じパレットを共有する設計に統一
+- **GenUI連携方式:** `comfyUI.currentWorkflow` を直接ミューテーション。`<select>` 要素の DOM 同期も行うことで視覚的なフィードバックを確保
+- **`openBadgeEditModal` のexport:** モデルタブとワークフロータブが同じパレット管理 UI を共有するため、`export function` に変更。`onPaletteChange` コールバックで各タブが独立してグリッドを再描画
+
+---
+
 ## 2026-03-28: v0.2.2 Modelsタブ・CivitAI連携

 ### 概要
@@ -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.2.2-green)
+![Version](https://img.shields.io/badge/version-0.2.4-green)

 ## Screenshots

@@ -36,10 +36,10 @@ Browse, organize, and execute workflows directly from a dedicated studio interfa
 ### Workflow Tab
 - **Thumbnail / Card / Table views** — switch between view modes to browse your workflow library
 - **Thumbnail side panel** — preview workflow canvas snapshots in the side panel
- **Tag-based filtering** — filter by base model (SD1.5, SDXL, etc.) and custom groups
+- **Badge filtering** — filter by user-defined badges (free labels you assign to each workflow)
 - **Search** — full-text search across workflow names and metadata
 - **Side panel tabs** — Thumbnail preview, JSON viewer with syntax highlighting, and Group management
- **Batch analysis** — auto-detect checkpoint, model type, prompt, and I/O node counts
+- **Badge management** — add, rename, delete badges with custom colors shared with the Models tab (⚙ Badge button)
 - **AI summary** — generate workflow descriptions using Ollama
 - **Import / Export** — import workflows from files or clipboard, open in ComfyUI directly
 - **Default view setting** — persist your preferred view mode (Thumbnail / Card / Table)
@@ -50,11 +50,14 @@ 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
- **Auto-generated parameter UI** — prompt, model, sampler, image, and other settings extracted from the workflow
+### GenerateUI Tab (v0.2.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
+- **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
- **Raw JSON editor** — view and edit the API-format JSON with syntax highlighting
 - **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

@@ -87,21 +90,24 @@ Browse, organize, and execute workflows directly from a dedicated studio interfa
 - **Node Sets** — save multiple nodes + connections as reusable sets from the ComfyUI canvas
 - **Right-click context menu** — "Save as Node Set" option on any node in ComfyUI

-### Models Tab (v0.2.2)
- **Model Browser** — browse all installed ComfyUI models (Checkpoint, LoRA, VAE, ControlNet, UNET, TextEncoder) with sub-tab switching
+### 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 / Card / Table views** — switch between view modes with pagination (24 items per page)
 - **Search & Filter** — full-text search, filter by tags, groups, and favorites
+- **User-defined badges** — assign free-label badges to models; badge colors shared with the Workflow tab palette
 - **Side panel tabs** — Info (file path display with click-to-copy, tags, memo), Groups management, CivitAI integration
 - **CivitAI integration** — fetch model metadata by SHA256 hash, view base model, trained words, tags, and model page link
 - **Batch CivitAI fetch** — one-click batch fetch for all models of a type with SSE progress streaming
 - **Detail modal** — preview image, CivitAI info, thumbnail change via file upload
+- **GenUI Model button** — apply the selected model directly to the corresponding node in GenerateUI's current workflow (Checkpoint, LoRA, VAE, ControlNet, UNET, TextEncoder)
 - **Group management** — create, rename, delete groups and assign/remove models
 - **Table view memo** — memo column displayed in table view for quick reference
 - **Preview images** — auto-detect `{model_stem}.preview.png` next to model files

-### Workflow Studio Library (ComfyUI Side Panel) (v0.1.8)
- **Workflows tab** — browse favorite workflows, filter by model type, filter by group
- **Nodes tab** — browse favorite nodes, node sets, and node groups
+### Workflow Studio Library (ComfyUI Side Panel) (v0.2.3)
+- **Workflows tab** — browse favorite workflows (All / ★ Favorites / Groups / By Badge sub-tabs), ★ star shown for favorites in All view
+- **Nodes tab** — browse favorite nodes (All / ★ Favorites / Groups / Sets sub-tabs), ★ star shown for favorites in All view
+- **Models tab** — browse installed models (All / ★ Favorites / Groups / By Type sub-tabs)
 - **Prompts tab** — browse prompt presets with All / Favorites / Categories sub-tabs
 - **Drag & drop workflows** — drag a workflow onto the canvas to load it
 - **Drag & drop nodes** — drag nodes/node sets onto the canvas to place them
@@ -185,6 +191,19 @@ Click the **camera icon** (next to the W button) in ComfyUI's top bar to capture

 ## Changelog

+### 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
+- **Sidebar All views** — ★ star displayed for favorite items in Workflows and Nodes All sub-tabs
+- **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
@@ -21,6 +21,8 @@ MODEL_TYPE_FOLDER_KEYS = {
    "controlnet": "controlnet",
    "unet": "diffusion_models",
    "textencoder": "text_encoders",
+    "hypernetwork": "hypernetworks",
+    "embedding": "embeddings",
 }


@@ -91,6 +93,8 @@ class ModelsService:
            entry["memo"] = updates["memo"]
        if "sha256" in updates:
            entry["sha256"] = updates["sha256"]
+        if "badges" in updates:
+            entry["badges"] = updates["badges"]
        entry["updatedAt"] = self._now_iso()
        data[model_name] = entry
        self._save_metadata(data)
@@ -505,11 +505,12 @@ body {
 }

 .wfm-gen-right {
-    width: 360px;
+    width: 280px;
    flex-shrink: 0;
    display: flex;
    flex-direction: column;
    overflow-y: auto;
+    border-left: 1px solid var(--wfm-border);
    padding: 12px;
    gap: 12px;
 }
@@ -546,13 +547,55 @@ body {

 .wfm-gen-subtab-content {
    display: none;
-    padding: 12px 16px;
-    overflow-y: auto;
    flex: 1;
+    overflow: hidden;
 }

 .wfm-gen-subtab-content.active {
-    display: block;
+    display: flex;
+}
+
+/* ── Tab inner layout: params col + rawjson col ── */
+.wfm-gen-tab-cols {
+    display: flex;
+    flex: 1;
+    overflow: hidden;
+}
+
+/* Left sub-column: parameter controls */
+.wfm-gen-params-col {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+    border-right: 1px solid var(--wfm-border);
+}
+
+/* Scrollable variant (Model / Settings single-section) */
+.wfm-gen-params-col--scroll {
+    overflow-y: auto;
+    padding: 12px 14px;
+}
+
+/* Stacked sections inside params col (Input: Prompt on top, Image below) */
+.wfm-gen-params-section {
+    flex: 1;
+    overflow-y: auto;
+    padding: 10px 14px;
+    min-height: 0;
+}
+
+.wfm-gen-params-section--top-border {
+    border-top: 1px solid var(--wfm-border);
+}
+
+/* Right sub-column: Raw JSON */
+.wfm-gen-rawjson-col {
+    width: 540px;
+    flex-shrink: 0;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
 }

 .wfm-gen-status {
@@ -572,13 +615,6 @@ body {
    color: var(--wfm-danger);
 }

-.wfm-gen-panel {
-    background: var(--wfm-surface);
-    border: 1px solid var(--wfm-border);
-    border-radius: var(--wfm-radius);
-    padding: 12px;
-}
-
 .wfm-gen-progress-container {
    display: flex;
    align-items: center;
@@ -609,8 +645,56 @@ body {
    text-align: right;
 }

-.wfm-gen-result {
+/* Raw JSON widget (shared, moved between tabs by JS) */
+#wfm-gen-rawjson-widget {
    flex: 1;
+    min-height: 0;
+}
+
+.wfm-gen-rawjson-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 6px 10px;
+    background: var(--wfm-bg-secondary);
+    border-bottom: 1px solid var(--wfm-border);
+    flex-shrink: 0;
+}
+
+.wfm-gen-rawjson-label {
+    font-size: 12px;
+    font-weight: 600;
+    color: var(--wfm-text-secondary);
+    text-transform: uppercase;
+    letter-spacing: 0.5px;
+}
+
+.wfm-gen-rawjson-editor {
+    flex: 1 !important;
+    height: auto !important;
+}
+
+.wfm-gen-col-title {
+    font-size: 12px;
+    font-weight: 600;
+    margin: 0 0 10px 0;
+    color: var(--wfm-text-secondary);
+    text-transform: uppercase;
+    letter-spacing: 0.5px;
+    border-bottom: 1px solid var(--wfm-border);
+    padding-bottom: 6px;
+}
+
+/* Generation panel in right column */
+.wfm-gen-panel {
+    background: var(--wfm-surface);
+    border: 1px solid var(--wfm-border);
+    border-radius: var(--wfm-radius);
+    padding: 12px;
+    flex-shrink: 0;
+}
+
+.wfm-gen-result {
    display: flex;
    flex-direction: column;
    align-items: center;
@@ -1195,6 +1279,79 @@ body {
    margin-left: auto;
 }

+/* ============================================
+   Badge Filter Bar (model type row)
+   ============================================ */
+
+.wfm-models-type-divider {
+    width: 1px;
+    height: 20px;
+    background: var(--wfm-border);
+    flex-shrink: 0;
+}
+
+.wfm-badge-filter-bar {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 4px;
+    align-items: center;
+}
+
+.wfm-badge-filter-btn {
+    padding: 2px 10px;
+    font-size: 11px;
+    border-radius: 10px;
+    border: 1px solid transparent;
+    background: var(--wfm-bg-tertiary);
+    color: var(--wfm-text-secondary);
+    cursor: pointer;
+    transition: opacity 0.15s, box-shadow 0.15s;
+    white-space: nowrap;
+}
+
+.wfm-badge-filter-btn:hover {
+    opacity: 0.85;
+}
+
+.wfm-badge-filter-btn.active {
+    box-shadow: 0 0 0 2px var(--wfm-primary);
+    opacity: 1;
+}
+
+/* ============================================
+   Badge checkbox list in modal
+   ============================================ */
+
+.wfm-badge-checkboxes {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 6px;
+    padding: 4px 0;
+}
+
+.wfm-badge-check-label {
+    display: flex;
+    align-items: center;
+    gap: 4px;
+    cursor: pointer;
+}
+
+.wfm-badge-check-label input[type="checkbox"] {
+    display: none;
+}
+
+.wfm-badge-check-label input[type="checkbox"]:not(:checked) + .wfm-badge {
+    opacity: 0.45;
+}
+
+.wfm-badge-clickable {
+    cursor: pointer;
+}
+
+.wfm-badge-clickable:hover {
+    opacity: 0.8;
+}
+
 /* ============================================
   Modal Detail - Two Column Layout
   ============================================ */
@@ -1820,7 +1977,7 @@ body {
 }

 .wfm-side-thumb-img-wrap {
-    width: 100%;
+    width: 90%;
    aspect-ratio: 1 / 1;
    background: var(--wfm-bg);
    border: 1px solid var(--wfm-border);
@@ -1829,6 +1986,7 @@ body {
    align-items: center;
    justify-content: center;
    overflow: hidden;
+    align-self: center;
 }

 .wfm-side-thumb-img-wrap img {
@@ -252,10 +252,11 @@ function applyI18nToHtml() {
        "wfm-help-about-1": "helpAbout1", "wfm-help-about-2": "helpAbout2",
        "wfm-help-wf-1": "helpWf1", "wfm-help-wf-2": "helpWf2", "wfm-help-wf-3": "helpWf3",
        "wfm-help-wf-4": "helpWf4", "wfm-help-wf-5": "helpWf5", "wfm-help-wf-6": "helpWf6",
-        "wfm-help-wf-7": "helpWf7", "wfm-help-wf-8": "helpWf8",
+        "wfm-help-wf-7": "helpWf7",
        "wfm-help-gen-1": "helpGen1", "wfm-help-gen-2": "helpGen2",
        "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-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",
@@ -270,13 +271,15 @@ function applyI18nToHtml() {
        "wfm-help-models-1": "helpModels1", "wfm-help-models-2": "helpModels2",
        "wfm-help-models-3": "helpModels3", "wfm-help-models-4": "helpModels4",
        "wfm-help-models-5": "helpModels5", "wfm-help-models-6": "helpModels6",
-        "wfm-help-models-7": "helpModels7",
+        "wfm-help-models-7": "helpModels7", "wfm-help-models-8": "helpModels8",
+        "wfm-help-models-9": "helpModels9",
        "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",
        "wfm-help-sidepanel-5": "helpSidepanel5", "wfm-help-sidepanel-6": "helpSidepanel6",
        "wfm-help-sidepanel-7": "helpSidepanel7", "wfm-help-sidepanel-8": "helpSidepanel8",
        "wfm-help-sidepanel-9": "helpSidepanel9", "wfm-help-sidepanel-10": "helpSidepanel10",
+        "wfm-help-sidepanel-11": "helpSidepanel11",
        "wfm-help-shortcuts-title": "helpShortcutsTitle",
        "wfm-help-shortcuts-1": "helpShortcuts1", "wfm-help-shortcuts-2": "helpShortcuts2",
        "wfm-help-shortcuts-3": "helpShortcuts3", "wfm-help-shortcuts-4": "helpShortcuts4",
@@ -134,6 +134,25 @@ export const comfyUI = {
        );
    },

+    async fetchHypernetworks() {
+        return this._fetchModelList(
+            ["HypernetworkLoader"],
+            "hypernetwork_name"
+        );
+    },
+
+    async fetchEmbeddings() {
+        // ComfyUI exposes embeddings via /embeddings endpoint
+        try {
+            const res = await fetch(`${this.baseUrl}/embeddings`);
+            if (res.ok) {
+                const list = await res.json();
+                return Array.isArray(list) ? list : [];
+            }
+        } catch {}
+        return [];
+    },
+
    async fetchSamplers() {
        return this._fetchModelList(["KSampler"], "sampler_name");
    },
@@ -61,6 +61,7 @@ export const comfyEditor = {
        this.renderImageTab(analysis, "wfm-gen-image-fields");
        this.renderModelTab(analysis, "wfm-gen-model-fields");
        this.renderSettingsTab(analysis, "wfm-gen-settings-fields");
+        _syncRawJson();
    },

    renderPromptTab(analysis, containerId) {
@@ -208,9 +209,9 @@ export const comfyEditor = {
        const latent = analysis.latent_nodes?.[0];

        el.innerHTML = `
-            <div style="display:grid;grid-template-columns:1fr 1fr;gap:16px;">
-                <div>
-                    <h3 style="font-size:14px;margin-bottom:12px;">KSampler</h3>
+            <div style="display:flex;flex-direction:column;gap:0;">
+                <div style="padding-bottom:14px;border-bottom:1px solid var(--wfm-border);margin-bottom: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;">KSampler</h3>
                    ${sampler ? `
                    <input type="hidden" id="wfm-settings-sampler-id" value="${sampler.id}">
                    <div class="wfm-form-group">
@@ -245,7 +246,7 @@ export const comfyEditor = {
                    ` : "<p class='wfm-placeholder'>No KSampler node found</p>"}
                </div>
                <div>
-                    <h3 style="font-size:14px;margin-bottom:12px;">Latent Image</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;">Latent Image</h3>
                    ${latent ? `
                    <input type="hidden" id="wfm-settings-latent-id" value="${latent.id}">
                    <div class="wfm-form-group">
@@ -246,6 +246,16 @@ export async function initGenerateTab() {
        showToast("Interrupted", "info");
    });

+    // Move shared Raw JSON widget into the active tab's rawjson-col
+    function moveRawJsonToTab(tabKey) {
+        const widget = document.getElementById("wfm-gen-rawjson-widget");
+        const col = document.getElementById(`wfm-gen-rawjson-col-${tabKey}`);
+        if (widget && col) {
+            col.appendChild(widget);
+            widget.style.display = "flex";
+        }
+    }
+
    // Subtab navigation
    document.querySelectorAll(".wfm-gen-subtab-btn").forEach((btn) => {
        btn.addEventListener("click", () => {
@@ -254,10 +264,14 @@ export async function initGenerateTab() {
            btn.classList.add("active");
            document.querySelectorAll(".wfm-gen-subtab-content").forEach((c) => c.classList.remove("active"));
            document.getElementById(`wfm-gen-subtab-${target}`)?.classList.add("active");
+            moveRawJsonToTab(target);
        });
    });

-    // Raw JSON apply
+    // Initial placement: move to first active tab (input)
+    moveRawJsonToTab("input");
+
+    // Raw JSON apply (always-visible panel in right column)
    document.getElementById("wfm-gen-apply-raw-btn")?.addEventListener("click", async () => {
        const textarea = document.getElementById("wfm-gen-raw-json");
        if (!textarea) return;
@@ -31,6 +31,13 @@ const LANGUAGES = {
        import: "Import",
        badgeColors: "Badge Colors",
        resetColors: "Reset",
+        badgeManage: "Manage Badges",
+        badgeAdd: "Add",
+        badgeDelete: "Delete",
+        badgeNone: "No badges defined yet.",
+        badgeNoneHint: "No badges defined. Click \u2699 Manage Badges to add.",
+        badgeNewLabel: "Badge label...",
+        badgeColorHint: "Change color",
        defaultView: "Default View",
        viewThumbnail: "Thumbnail",
        viewCard: "Card",
@@ -225,11 +232,18 @@ const LANGUAGES = {
        modelsTags: "Tags",
        modelsTagsPlaceholder: "tag1, tag2, ...",
        modelsModelType: "Model Type",
+        modelsBadges: "Badges",
+        modelsInfo: "Info",
        modelsFavorite: "Favorite",
        modelsMemo: "Memo",
        modelsMemoPlaceholder: "Notes about this model...",
        modelsSave: "Save",
        modelsSaved: "Metadata saved",
+        modelsGenUIBtn: "GenUI Model",
+        modelsGenUITitle: "Set this model in GenerateUI",
+        modelsGenUIUnsupported: "This model type cannot be set in GenerateUI",
+        modelsGenUINoWorkflow: "No workflow loaded in GenerateUI",
+        modelsGenUINoNode: (type) => `No ${type} node found in current workflow`,
        modelsCopyName: "Click to copy model name",
        modelsCopiedName: "Model name copied",
        modelsFilePath: "File Path",
@@ -283,16 +297,18 @@ const LANGUAGES = {
        helpWf3: "Create, rename, delete groups and assign/remove workflows",
        helpWf4: "Import JSON/PNG files via button or drag & drop",
        helpWf5: "Side panel: thumbnail, JSON viewer (format badge: UI/API/App), clipboard copy, group management",
-        helpWf6: "Detail modal: rename, favorite, thumbnail change, analysis, category override, tags, memo, AI summary, open in ComfyUI, load in GenerateUI, set as default, delete",
-        helpWf7: "Customize badge colors per category",
-        helpWf8: "Batch re-analysis of all workflow I/O (P: prompt nodes, I: image nodes, output: save nodes)",
+        helpWf6: "Detail modal: rename, favorite, thumbnail change, badge assignment, tags, memo, AI summary, open in ComfyUI, load in GenerateUI, set as default, delete",
+        helpWf7: "Badge management: add, rename, delete badges with custom colors shared with the Models tab (⚙ Badge button)",
        helpGen1: "Connect/disconnect ComfyUI and check connection status",
        helpGen2: "Load workflows from Workflow tab (App format .app.json not supported)",
-        helpGen3: "Edit parameters: Prompt, Image (drag & drop), Model (checkpoint/VAE/LoRA/ControlNet with filter), Settings (steps/CFG/sampler/scheduler/resolution), Raw JSON",
-        helpGen4: "Seed control: random, fixed, increment, decrement",
-        helpGen5: "Generate, progress display, and stop",
-        helpGen6: "View results with main image and thumbnail history",
-        helpGen7: "Eagle integration: auto-save generated images to Eagle",
+        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",
+        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",
        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",
@@ -314,17 +330,19 @@ const LANGUAGES = {
        helpNodes4: "Create, rename, delete node groups and assign/remove nodes",
        helpNodes5: "Side panel: Details (class name, package, category, description, flags), I/O Spec (inputs/outputs with types and defaults), Groups management",
        helpNodes6: "Node Sets: create reusable node collections with descriptions, tags, and link definitions between nodes",
-        helpModels1: "Browse installed models: Checkpoint, LoRA, VAE, ControlNet, UNET, TextEncoder with sub-tab switching",
+        helpModels1: "Browse installed models: Checkpoint, LoRA, VAE, ControlNet, UNET, TextEncoder, Hypernetwork, Embedding with sub-tab switching",
        helpModels2: "Thumbnail, Card, and Table view modes with pagination",
        helpModels3: "Search, tag filter, group filter, and favorites filter",
        helpModels4: "Side panel: Info (file path, tags, memo), Groups management, CivitAI integration",
        helpModels5: "CivitAI integration: fetch model info by SHA256 hash, batch fetch per model type",
        helpModels6: "Detail modal: preview image, CivitAI info (base model, trained words, tags), thumbnail change",
        helpModels7: "Group management: create, rename, delete groups and assign/remove models",
+        helpModels8: "GenUI Model button: apply the selected model to the corresponding node in GenerateUI's current workflow (Checkpoint / LoRA / VAE / ControlNet / UNET / TextEncoder)",
+        helpModels9: "User-defined badges: assign free-label badges with custom colors shared with the Workflow tab",
        helpSidepanelTitle: "Workflow Studio Library (ComfyUI Side Panel)",
        helpSidepanel1: "Open from the Workflow Studio Library button in the ComfyUI toolbar",
-        helpSidepanel2: "Workflows tab: browse favorite workflows, filter by model type, and filter by group",
-        helpSidepanel3: "Nodes tab: browse favorite nodes, node sets, and node groups",
+        helpSidepanel2: "Workflows tab: All / ★ Favorites / Groups sub-tabs; ★ shown for favorites in All view",
+        helpSidepanel3: "Nodes tab: All / ★ Favorites / Groups / Sets sub-tabs; ★ shown for favorites in All view",
        helpSidepanel4: "Prompts tab: browse prompt presets with All/Favorites/Categories sub-tabs",
        helpSidepanel5: "Drag & drop workflows onto the canvas to load them",
        helpSidepanel6: "Drag & drop nodes/node sets onto the canvas to place them",
@@ -332,6 +350,7 @@ const LANGUAGES = {
        helpSidepanel8: "Copy individual positive (P) or negative (N) prompts from sidebar items",
        helpSidepanel9: "Double-click items to load/place without dragging",
        helpSidepanel10: "Search within each sub-tab to quickly find items",
+        helpSidepanel11: "Models tab: All / ★ Favorites / Groups / By Type sub-tabs",
        helpShortcutsTitle: "Keyboard Shortcuts",
        helpShortcuts1: "Escape: Close modal/panel",
        helpShortcuts2: "Enter: Confirm rename, send chat",
@@ -473,6 +492,13 @@ const LANGUAGES = {
        import: "インポート",
        badgeColors: "バッジ色",
        resetColors: "リセット",
+        badgeManage: "バッジ管理",
+        badgeAdd: "追加",
+        badgeDelete: "削除",
+        badgeNone: "バッジが未定義です。",
+        badgeNoneHint: "バッジが未定義です。⚙ バッジ管理から追加できます。",
+        badgeNewLabel: "バッジ名...",
+        badgeColorHint: "色を変更",
        defaultView: "デフォルト表示",
        viewThumbnail: "サムネイル",
        viewCard: "カード",
@@ -667,11 +693,18 @@ const LANGUAGES = {
        modelsTags: "タグ",
        modelsTagsPlaceholder: "タグ1, タグ2, ...",
        modelsModelType: "モデルタイプ",
+        modelsBadges: "バッジ",
+        modelsInfo: "情報",
        modelsFavorite: "お気に入り",
        modelsMemo: "メモ",
        modelsMemoPlaceholder: "このモデルについてのメモ...",
        modelsSave: "保存",
        modelsSaved: "メタデータを保存しました",
+        modelsGenUIBtn: "GenUI Model",
+        modelsGenUITitle: "GenerateUIにこのモデルをセット",
+        modelsGenUIUnsupported: "このモデルタイプはGenerateUIに設定できません",
+        modelsGenUINoWorkflow: "GenerateUIにワークフローが読み込まれていません",
+        modelsGenUINoNode: (type) => `現在のワークフローに${type}ノードが見つかりません`,
        modelsCopyName: "クリックでモデル名をコピー",
        modelsCopiedName: "モデル名をコピーしました",
        modelsFilePath: "ファイルパス",
@@ -725,16 +758,18 @@ const LANGUAGES = {
        helpWf3: "グループの作成・名前変更・削除、ワークフローの割り当て・解除",
        helpWf4: "JSON/PNGファイルのインポート（ボタンまたはドラッグ＆ドロップ）",
        helpWf5: "サイドパネル：サムネイル、JSONビューア（フォーマットバッジ：UI/API/App形式）、クリップボードコピー、グループ管理",
-        helpWf6: "詳細モーダル：名前変更、お気に入り、サムネイル変更、分析、カテゴリオーバーライド、タグ、メモ、AI要約、ComfyUIで開く、生成UIに読み込み、デフォルト設定、削除",
-        helpWf7: "カテゴリごとのバッジ色カスタマイズ",
-        helpWf8: "全ワークフローの入出力一括再分析（P:プロンプト入力、I:画像入力、出力:saveノード）",
+        helpWf6: "詳細モーダル：名前変更、お気に入り、サムネイル変更、バッジ付与、タグ、メモ、AI要約、ComfyUIで開く、生成UIに読み込み、デフォルト設定、削除",
+        helpWf7: "バッジ管理：バッジの追加・名前変更・削除、カスタム色設定（Modelsタブと共有）— ⚙ Badgeボタン",
        helpGen1: "ComfyUIの接続・切断、接続状態の確認",
        helpGen2: "Workflowタブからワークフローを読み込み（App形式 .app.json は非対応）",
-        helpGen3: "パラメータ編集：プロンプト、画像（ドラッグ＆ドロップ）、モデル（checkpoint/VAE/LoRA/ControlNet、フィルタ検索）、設定（Steps/CFG/サンプラー/スケジューラ/解像度）、Raw JSON",
-        helpGen4: "シード管理：ランダム / 固定 / 増加 / 減少",
-        helpGen5: "画像生成、進捗表示、生成停止",
-        helpGen6: "メイン画像とサムネイル履歴で結果表示",
-        helpGen7: "Eagle連携：生成画像をEagleへ自動保存",
+        helpGen3: "3タブ構成 — Input（プロンプト＋画像）、Model、Settings — 各タブにRaw JSON列を常時表示",
+        helpGen4: "Inputタブ：左列にPrompt（上段）＋ Image ドラッグ＆ドロップ（下段）",
+        helpGen5: "Modelタブ：Checkpoint/VAE/LoRA/ControlNet/UNET/TextEncoderのセレクタ（フィルタ検索付き）",
+        helpGen6: "Settingsタブ：左列にKSampler（上段）＋ LatentImage（下段）",
+        helpGen7: "Raw JSONを各タブの右列に常時表示 — 直接編集してApplyでワークフロー即時反映",
+        helpGen8: "シード管理：ランダム / 固定 / 増加 / 減少",
+        helpGen9: "画像生成、進捗表示、生成停止、結果表示",
+        helpGen10: "Eagle連携：生成画像をEagleへ自動保存",
        helpPrompt1: "AIアシスタント（Ollama）：モデル選択、チャットでプロンプト相談、画像添付（ビジョンモデル対応）",
        helpPrompt2: "AIの応答をGenerateUIのプロンプトに適用",
        helpPrompt3: "翻訳機能：日⇔英、中⇔英",
@@ -756,17 +791,19 @@ const LANGUAGES = {
        helpNodes4: "ノードグループの作成・名前変更・削除、ノードの割り当て・解除",
        helpNodes5: "サイドパネル：詳細（クラス名、パッケージ、カテゴリ、説明、フラグ）、I/O仕様（入出力の型・デフォルト値）、グループ管理",
        helpNodes6: "ノードセット：再利用可能なノードコレクションの作成（説明、タグ、ノード間リンク定義付き）",
-        helpModels1: "インストール済みモデルの閲覧：Checkpoint、LoRA、VAE、ControlNet、UNET、TextEncoderをサブタブで切り替え",
+        helpModels1: "インストール済みモデルの閲覧：Checkpoint、LoRA、VAE、ControlNet、UNET、TextEncoder、Hypernetwork、Embeddingをサブタブで切り替え",
        helpModels2: "サムネイル / カード / テーブル表示モード切り替え（ページネーション付き）",
        helpModels3: "検索、タグフィルタ、グループフィルタ、お気に入りフィルタ",
        helpModels4: "サイドパネル：基本情報（ファイルパス、タグ、メモ）、グループ管理、CivitAI連携",
        helpModels5: "CivitAI連携：SHA256ハッシュでモデル情報取得、モデルタイプごとの一括取得",
        helpModels6: "詳細モーダル：プレビュー画像、CivitAI情報（ベースモデル、トリガーワード、タグ）、サムネイル変更",
        helpModels7: "グループ管理：グループの作成・名前変更・削除、モデルの割り当て・解除",
+        helpModels8: "GenUI Modelボタン：選択モデルをGenerateUIの現在のワークフローの該当ノードに直接適用（Checkpoint / LoRA / VAE / ControlNet / UNET / TextEncoder）",
+        helpModels9: "ユーザー定義バッジ：自由ラベルのバッジをモデルに付与（Workflowタブと色パレットを共有）",
        helpSidepanelTitle: "Workflow Studio Library（ComfyUIサイドパネル）",
        helpSidepanel1: "ComfyUIツールバーのWorkflow Studio Libraryボタンから開く",
-        helpSidepanel2: "Workflowsタブ：お気に入りワークフロー閲覧、モデル種別フィルタ、グループフィルタ",
-        helpSidepanel3: "Nodesタブ：お気に入りノード、ノードセット、ノードグループの閲覧",
+        helpSidepanel2: "Workflowsタブ：All / ★ Favorites / Groupsサブタブ、Allビューでお気に入りに★表示",
+        helpSidepanel3: "Nodesタブ：All / ★ Favorites / Groups / Setsサブタブ、Allビューでお気に入りに★表示",
        helpSidepanel4: "Promptsタブ：プロンプトプリセットの閲覧（All/お気に入り/カテゴリ サブタブ）",
        helpSidepanel5: "ワークフローをキャンバスにドラッグ＆ドロップで読み込み",
        helpSidepanel6: "ノード/ノードセットをキャンバスにドラッグ＆ドロップで配置",
@@ -774,6 +811,7 @@ const LANGUAGES = {
        helpSidepanel8: "サイドバーアイテムからポジティブ（P）/ネガティブ（N）プロンプトを個別コピー",
        helpSidepanel9: "ダブルクリックでもアイテムの読み込み・配置が可能",
        helpSidepanel10: "各サブタブ内で検索してアイテムをすばやく検索",
+        helpSidepanel11: "Modelsタブ：All / ★ Favorites / Groups / By Typeサブタブ",
        helpShortcutsTitle: "キーボード操作",
        helpShortcuts1: "Escape：モーダル・パネルを閉じる",
        helpShortcuts2: "Enter：名前変更の確定、チャット送信",
@@ -915,6 +953,13 @@ const LANGUAGES = {
        import: "导入",
        badgeColors: "标签颜色",
        resetColors: "重置",
+        badgeManage: "管理标签",
+        badgeAdd: "添加",
+        badgeDelete: "删除",
+        badgeNone: "尚未定义标签。",
+        badgeNoneHint: "尚未定义标签。点击 ⚙ 管理标签来添加。",
+        badgeNewLabel: "标签名称...",
+        badgeColorHint: "更改颜色",
        defaultView: "默认视图",
        viewThumbnail: "缩略图",
        viewCard: "卡片",
@@ -1105,11 +1150,18 @@ const LANGUAGES = {
        modelsTags: "标签",
        modelsTagsPlaceholder: "标签1, 标签2, ...",
        modelsModelType: "模型类型",
+        modelsBadges: "标签",
+        modelsInfo: "信息",
        modelsFavorite: "收藏",
        modelsMemo: "备注",
        modelsMemoPlaceholder: "关于此模型的备注...",
        modelsSave: "保存",
        modelsSaved: "元数据已保存",
+        modelsGenUIBtn: "GenUI Model",
+        modelsGenUITitle: "在GenerateUI中设置此模型",
+        modelsGenUIUnsupported: "此模型类型无法在GenerateUI中设置",
+        modelsGenUINoWorkflow: "GenerateUI中未加载工作流",
+        modelsGenUINoNode: (type) => `当前工作流中未找到${type}节点`,
        modelsCopyName: "点击复制模型名称",
        modelsCopiedName: "模型名称已复制",
        modelsFilePath: "文件路径",
@@ -1163,16 +1215,18 @@ const LANGUAGES = {
        helpWf3: "创建、重命名、删除分组，分配/移除工作流",
        helpWf4: "通过按钮或拖放导入JSON/PNG文件",
        helpWf5: "侧面板：缩略图、JSON查看器（格式徽章：UI/API/App）、剪贴板复制、分组管理",
-        helpWf6: "详情弹窗：重命名、收藏、缩略图更换、分析、分类覆盖、标签、备注、AI摘要、在ComfyUI中打开、加载到生成UI、设为默认、删除",
-        helpWf7: "按分类自定义徽章颜色",
-        helpWf8: "批量重新分析所有工作流I/O（P:提示词节点、I:图片节点、输出:保存节点）",
+        helpWf6: "详情弹窗：重命名、收藏、缩略图更换、徽章分配、标签、备注、AI摘要、在ComfyUI中打开、加载到生成UI、设为默认、删除",
+        helpWf7: "徽章管理：添加、重命名、删除徽章并自定义颜色（与Models标签共享）— ⚙ Badge按钮",
        helpGen1: "连接/断开ComfyUI，检查连接状态",
        helpGen2: "从工作流标签页加载工作流（不支持App格式.app.json）",
-        helpGen3: "编辑参数：提示词、图片（拖放）、模型（checkpoint/VAE/LoRA/ControlNet含筛选）、设置（Steps/CFG/采样器/调度器/分辨率）、Raw JSON",
-        helpGen4: "种子管理：随机/固定/递增/递减",
-        helpGen5: "生成图片、进度显示、停止生成",
-        helpGen6: "主图和缩略图历史查看结果",
-        helpGen7: "Eagle集成：自动保存生成图片到Eagle",
+        helpGen3: "3标签布局 — Input（提示词+图片）、Model、Settings — 每个标签含Raw JSON列实时预览",
+        helpGen4: "Input标签：左列为Prompt（上）+ Image拖放（下）",
+        helpGen5: "Model标签：Checkpoint/VAE/LoRA/ControlNet/UNET/TextEncoder选择器（含筛选）",
+        helpGen6: "Settings标签：左列为KSampler（上）+ LatentImage（下）",
+        helpGen7: "Raw JSON在每个标签右列常驻显示 — 直接编辑并Apply即时重载工作流",
+        helpGen8: "种子管理：随机/固定/递增/递减",
+        helpGen9: "生成图片、进度显示、停止生成、查看结果",
+        helpGen10: "Eagle集成：自动保存生成图片到Eagle",
        helpPrompt1: "AI助手（Ollama）：模型选择、聊天咨询提示词、图片附件（视觉模型）",
        helpPrompt2: "将AI回复应用到生成UI的提示词",
        helpPrompt3: "翻译功能：日\u2194英、中\u2194英",
@@ -1194,17 +1248,19 @@ const LANGUAGES = {
        helpNodes4: "创建、重命名、删除节点组，分配/移除节点",
        helpNodes5: "侧面板：详情（类名、包、分类、描述、标志）、I/O规格（输入输出类型和默认值）、组管理",
        helpNodes6: "节点集：创建可复用的节点集合（含描述、标签、节点间链接定义）",
-        helpModels1: "浏览已安装模型：Checkpoint、LoRA、VAE、ControlNet、UNET、TextEncoder，通过子标签切换",
+        helpModels1: "浏览已安装模型：Checkpoint、LoRA、VAE、ControlNet、UNET、TextEncoder、Hypernetwork、Embedding，通过子标签切换",
        helpModels2: "缩略图、卡片和表格视图模式切换（带分页）",
        helpModels3: "搜索、标签筛选、分组筛选、收藏筛选",
        helpModels4: "侧面板：基本信息（文件路径、标签、备注）、分组管理、CivitAI集成",
        helpModels5: "CivitAI集成：通过SHA256哈希获取模型信息，按模型类型批量获取",
        helpModels6: "详情弹窗：预览图片、CivitAI信息（基础模型、触发词、标签）、缩略图更改",
        helpModels7: "分组管理：创建、重命名、删除分组，分配/移除模型",
+        helpModels8: "GenUI Model按钮：将选中模型直接应用到GenerateUI当前工作流的对应节点（Checkpoint / LoRA / VAE / ControlNet / UNET / TextEncoder）",
+        helpModels9: "用户自定义徽章：为模型添加自由标签徽章（颜色调色板与Workflow标签共享）",
        helpSidepanelTitle: "Workflow Studio Library（ComfyUI侧面板）",
        helpSidepanel1: "从ComfyUI工具栏的Workflow Studio Library按钮打开",
-        helpSidepanel2: "Workflows标签：浏览收藏工作流、按模型类型筛选、按分组筛选",
-        helpSidepanel3: "Nodes标签：浏览收藏节点、节点集、节点组",
+        helpSidepanel2: "Workflows标签：All / ★ Favorites / Groups子标签，All视图中收藏项显示★",
+        helpSidepanel3: "Nodes标签：All / ★ Favorites / Groups / Sets子标签，All视图中收藏项显示★",
        helpSidepanel4: "Prompts标签：浏览提示词预设（全部/收藏/分类 子标签）",
        helpSidepanel5: "将工作流拖放到画布上即可加载",
        helpSidepanel6: "将节点/节点集拖放到画布上即可放置",
@@ -1212,6 +1268,7 @@ const LANGUAGES = {
        helpSidepanel8: "从侧边栏项目中单独复制正面（P）或负面（N）提示词",
        helpSidepanel9: "双击项目也可加载/放置",
        helpSidepanel10: "在各子标签内搜索快速查找项目",
+        helpSidepanel11: "Models标签：All / ★ Favorites / Groups / By Type子标签",
        helpShortcutsTitle: "键盘操作",
        helpShortcuts1: "Escape：关闭弹窗/面板",
        helpShortcuts2: "Enter：确认重命名、发送聊天",
@@ -6,6 +6,7 @@
 import { showToast, openModal, closeModal } from "./app.js";
 import { t } from "./i18n.js";
 import { comfyUI } from "./comfyui-client.js";
+import { comfyEditor } from "./comfyui-editor.js";

 // ── State ─────────────────────────────────────────────────

@@ -17,12 +18,15 @@ const state = {
        controlnet: [],
        unet: [],
        textencoder: [],
+        hypernetwork: [],
+        embedding: [],
    },
    modelMetadata: {},
    modelGroups: {},
    civitaiCache: {},
    searchText: "",
    tagFilter: "",
+    badgeFilter: "",
    groupFilter: "",
    showFavoritesOnly: false,
    viewMode: localStorage.getItem("wfm_models_view") || "thumb",
@@ -30,7 +34,6 @@ const state = {
    selectedModel: null,
    loaded: {},
    currentPage: 0,
-    badgeColors: JSON.parse(localStorage.getItem("wfm_models_badge_colors") || "{}"),
 };

 const MODELS_PER_PAGE = 24;
@@ -42,6 +45,8 @@ const FETCH_MAP = {
    controlnet: () => comfyUI.fetchControlNets(),
    unet: () => comfyUI.fetchDiffusionModels(),
    textencoder: () => comfyUI.fetchTextEncoders(),
+    hypernetwork: () => comfyUI.fetchHypernetworks(),
+    embedding: () => comfyUI.fetchEmbeddings(),
 };

 const TYPE_LABELS = {
@@ -51,18 +56,80 @@ const TYPE_LABELS = {
    controlnet: "ControlNet",
    unet: "UNET",
    textencoder: "TextEncoder",
+    hypernetwork: "Hypernetwork",
+    embedding: "Embedding",
 };

-// Default badge colors for model types
-const DEFAULT_BADGE_COLORS = {
-    Checkpoint: "#6366f1",
-    LoRA: "#f59e0b",
-    VAE: "#10b981",
-    ControlNet: "#ef4444",
-    UNET: "#8b5cf6",
-    TextEncoder: "#06b6d4",
+// Mapping from models-tab type → comfyui-editor key + inputKey
+const GENUI_TYPE_MAP = {
+    checkpoint:  { key: "checkpoints",    inputKey: "ckpt_name" },
+    lora:        { key: "loras",          inputKey: "lora_name" },
+    vae:         { key: "vaes",           inputKey: "vae_name" },
+    controlnet:  { key: "controlNets",    inputKey: "control_net_name" },
+    unet:        { key: "diffusionModels",inputKey: "unet_name" },
+    textencoder: { key: "textEncoders",   inputKey: "clip_name1" },
 };

+function applyToGenUI(modelName, modelType) {
+    const mapping = GENUI_TYPE_MAP[modelType];
+    if (!mapping) {
+        showToast(t("modelsGenUIUnsupported"), "warning");
+        return;
+    }
+    if (!comfyUI.currentWorkflow) {
+        showToast(t("modelsGenUINoWorkflow"), "warning");
+        return;
+    }
+
+    const { key, inputKey } = mapping;
+
+    // Find the first matching node in the current workflow
+    const nodeId = Object.keys(comfyUI.currentWorkflow).find((id) => {
+        const node = comfyUI.currentWorkflow[id];
+        return node.inputs && inputKey in node.inputs;
+    });
+
+    if (!nodeId) {
+        showToast(t("modelsGenUINoNode", TYPE_LABELS[modelType] || modelType), "warning");
+        return;
+    }
+
+    comfyUI.currentWorkflow[nodeId].inputs[inputKey] = modelName;
+
+    // Sync GenUI select element if visible
+    const selectEl = document.getElementById(`wfm-model-${key}`);
+    if (selectEl) {
+        // Add option if not present (subdir paths may not be in list)
+        if (![...selectEl.options].some(o => o.value === modelName)) {
+            const opt = document.createElement("option");
+            opt.value = modelName;
+            opt.textContent = modelName;
+            selectEl.appendChild(opt);
+        }
+        selectEl.value = modelName;
+    }
+
+    // Sync raw JSON display
+    const rawTextarea = document.getElementById("wfm-gen-raw-json");
+    if (rawTextarea) {
+        rawTextarea.value = JSON.stringify(comfyUI.currentWorkflow, null, 2);
+    }
+
+    showToast(`${TYPE_LABELS[modelType]}: ${modelName.split("/").pop().split("\\").pop()}`, "success");
+}
+
+// User-defined badge colors (stored in metadata per model)
+// Global badge palette: label → color, stored in localStorage
+function getBadgePalette() {
+    try {
+        return JSON.parse(localStorage.getItem("wfm_models_badge_palette") || "{}");
+    } catch { return {}; }
+}
+
+function saveBadgePalette(palette) {
+    localStorage.setItem("wfm_models_badge_palette", JSON.stringify(palette));
+}
+
 // ── Helpers ───────────────────────────────────────────────

 function escapeHtml(s) {
@@ -112,11 +179,25 @@ function loadPreviewImage(imgEl, placeholderEl, modelName, modelType) {
 }

 function badgeHtml(label) {
-    const color = state.badgeColors[label] || DEFAULT_BADGE_COLORS[label] || "";
+    const palette = getBadgePalette();
+    const color = palette[label] || "";
    const style = color ? ` style="background:${color};color:#fff;"` : "";
    return `<span class="wfm-badge wfm-badge-model"${style}>${escapeHtml(label)}</span>`;
 }

+function modelBadgesHtml(modelName, clickable = false) {
+    const meta = state.modelMetadata[modelName] || {};
+    const badges = meta.badges || [];
+    if (badges.length === 0) return "";
+    return badges.map((label) => {
+        const palette = getBadgePalette();
+        const color = palette[label] || "";
+        const style = color ? ` style="background:${color};color:#fff;"` : "";
+        const dataAttr = clickable ? ` data-badge-filter="${escapeHtml(label)}"` : "";
+        return `<span class="wfm-badge wfm-badge-model${clickable ? " wfm-badge-clickable" : ""}"${style}${dataAttr}>${escapeHtml(label)}</span>`;
+    }).join("");
+}
+
 // ── API ───────────────────────────────────────────────────

 async function fetchModelMetadata() {
@@ -169,6 +250,13 @@ function filterModels() {
        });
    }

+    if (state.badgeFilter) {
+        models = models.filter((m) => {
+            const meta = state.modelMetadata[m];
+            return meta && meta.badges && meta.badges.includes(state.badgeFilter);
+        });
+    }
+
    if (state.groupFilter) {
        const members = state.modelGroups[state.groupFilter] || [];
        models = models.filter((m) => members.includes(m));
@@ -198,28 +286,121 @@ function getAllTags() {
    return [...set].sort();
 }

-// ── Badge Color Settings ──────────────────────────────────
+// ── Badge Management ──────────────────────────────────────

-function renderBadgeSettings() {
-    const panel = document.getElementById("wfm-models-badge-settings-panel");
-    if (!panel) return;
+export function openBadgeEditModal(onPaletteChange = null) {
+    const palette = getBadgePalette();
+    const labels = Object.keys(palette).sort();

-    const labels = Object.keys(TYPE_LABELS).map((k) => TYPE_LABELS[k]);
-    panel.innerHTML = labels
-        .map((label) => {
-            const color = state.badgeColors[label] || DEFAULT_BADGE_COLORS[label] || "#6366f1";
-            return `<div class="wfm-badge-color-row">
+    const rowsHtml = labels.map((label) => {
+        const color = palette[label] || "#6366f1";
+        return `<div class="wfm-badge-color-row" data-badge-label="${escapeHtml(label)}">
+            ${badgeHtml(label)}
+            <input type="color" value="${color}" data-badge-label="${escapeHtml(label)}" class="wfm-badge-color-input" title="${t("badgeColorHint")}">
+            <button class="wfm-btn wfm-btn-sm wfm-btn-danger wfm-badge-delete-btn" data-badge-label="${escapeHtml(label)}" title="${t("badgeDelete")}">&times;</button>
+        </div>`;
+    }).join("");
+
+    const html = `
+        <div style="min-width:320px;">
+            <div id="wfm-badge-list">${rowsHtml || `<p style="color:var(--wfm-text-secondary);font-size:12px;">${t("badgeNone")}</p>`}</div>
+            <div style="border-top:1px solid var(--wfm-border);margin-top:12px;padding-top:12px;display:flex;gap:6px;align-items:center;">
+                <input type="text" id="wfm-badge-new-label" class="wfm-input" style="flex:1;" placeholder="${t("badgeNewLabel")}">
+                <input type="color" id="wfm-badge-new-color" value="#6366f1" style="width:36px;height:28px;padding:1px;border-radius:4px;cursor:pointer;">
+                <button class="wfm-btn wfm-btn-sm wfm-btn-primary" id="wfm-badge-add-btn">${t("badgeAdd")}</button>
+            </div>
+        </div>`;
+
+    openModal(t("badgeManage"), html);
+    bindBadgeModalEvents(onPaletteChange);
+}
+
+function bindBadgeModalEvents(onPaletteChange = null) {
+    const afterChange = () => {
+        renderBadgeFilter();
+        renderModelGrid();
+        if (onPaletteChange) onPaletteChange();
+    };
+
+    const refreshList = () => {
+        const palette = getBadgePalette();
+        const labels = Object.keys(palette).sort();
+        const listEl = document.getElementById("wfm-badge-list");
+        if (!listEl) return;
+        listEl.innerHTML = labels.map((label) => {
+            const color = palette[label] || "#6366f1";
+            return `<div class="wfm-badge-color-row" data-badge-label="${escapeHtml(label)}">
                ${badgeHtml(label)}
-                <input type="color" value="${color}" data-badge-label="${escapeHtml(label)}" class="wfm-badge-color-input">
+                <input type="color" value="${color}" data-badge-label="${escapeHtml(label)}" class="wfm-badge-color-input" title="${t("badgeColorHint")}">
+                <button class="wfm-btn wfm-btn-sm wfm-btn-danger wfm-badge-delete-btn" data-badge-label="${escapeHtml(label)}" title="${t("badgeDelete")}">&times;</button>
            </div>`;
-        })
-        .join("");
+        }).join("") || `<p style="color:var(--wfm-text-secondary);font-size:12px;">${t("badgeNone")}</p>`;
+        bindBadgeRowEvents(refreshList, afterChange);
+        afterChange();
+    };

-    panel.querySelectorAll(".wfm-badge-color-input").forEach((input) => {
+    bindBadgeRowEvents(refreshList, afterChange);
+
+    document.getElementById("wfm-badge-add-btn")?.addEventListener("click", () => {
+        const labelInput = document.getElementById("wfm-badge-new-label");
+        const colorInput = document.getElementById("wfm-badge-new-color");
+        const label = labelInput?.value.trim();
+        if (!label) return;
+        const palette = getBadgePalette();
+        palette[label] = colorInput?.value || "#6366f1";
+        saveBadgePalette(palette);
+        if (labelInput) labelInput.value = "";
+        refreshList();
+    });
+}
+
+function bindBadgeRowEvents(refreshList, afterChange = null) {
+    document.querySelectorAll(".wfm-badge-color-input").forEach((input) => {
        input.addEventListener("input", (e) => {
-            state.badgeColors[e.target.dataset.badgeLabel] = e.target.value;
-            localStorage.setItem("wfm_models_badge_colors", JSON.stringify(state.badgeColors));
-            renderBadgeSettings();
+            const label = e.target.dataset.badgeLabel;
+            const palette = getBadgePalette();
+            palette[label] = e.target.value;
+            saveBadgePalette(palette);
+            refreshList();
+        });
+    });
+    document.querySelectorAll(".wfm-badge-delete-btn").forEach((btn) => {
+        btn.addEventListener("click", () => {
+            const label = btn.dataset.badgeLabel;
+            const palette = getBadgePalette();
+            delete palette[label];
+            saveBadgePalette(palette);
+            refreshList();
+        });
+    });
+}
+
+// ── Badge Filter Bar ──────────────────────────────────────
+
+function renderBadgeFilter() {
+    const container = document.getElementById("wfm-models-badge-filter-bar");
+    if (!container) return;
+    const palette = getBadgePalette();
+    const labels = Object.keys(palette).sort();
+
+    if (labels.length === 0) {
+        container.innerHTML = "";
+        return;
+    }
+
+    container.innerHTML = labels.map((label) => {
+        const color = palette[label] || "";
+        const isActive = state.badgeFilter === label;
+        const style = color ? `background:${color};color:#fff;` : "";
+        return `<button class="wfm-badge-filter-btn${isActive ? " active" : ""}" data-badge="${escapeHtml(label)}" style="${style}">${escapeHtml(label)}</button>`;
+    }).join("");
+
+    container.querySelectorAll(".wfm-badge-filter-btn").forEach((btn) => {
+        btn.addEventListener("click", () => {
+            const label = btn.dataset.badge;
+            state.badgeFilter = state.badgeFilter === label ? "" : label;
+            state.currentPage = 0;
+            renderBadgeFilter();
            renderModelGrid();
        });
    });
@@ -306,8 +487,7 @@ function renderThumbView(grid, models, totalPages) {
    models.forEach((modelName) => {
        const meta = state.modelMetadata[modelName] || {};
        const { name } = parseModelPath(modelName);
-        const typeLabel = TYPE_LABELS[state.activeModelType];
-        const badges = badgeHtml(typeLabel);
+        const userBadges = modelBadgesHtml(modelName);
        const tagsHtml = (meta.tags || []).map((tag) => `<span class="wfm-badge wfm-badge-sm">${escapeHtml(tag)}</span>`).join("");
        const favStar = meta.favorite ? "\u2605" : "\u2606";
        const favClass = meta.favorite ? "wfm-fav-btn active" : "wfm-fav-btn";
@@ -324,7 +504,7 @@ function renderThumbView(grid, models, totalPages) {
            </div>
            <div class="wfm-card-body">
                <div class="wfm-card-title" title="${escapeHtml(modelName)}">${escapeHtml(getStem(name))}</div>
-                <div class="wfm-card-meta">${badges} ${tagsHtml}</div>
+                <div class="wfm-card-meta">${userBadges} ${tagsHtml}</div>
            </div>
            <button class="${favClass}" title="${t("modelsFavorite")}">${favStar}</button>`;

@@ -356,8 +536,7 @@ function renderCardView(grid, models, totalPages) {
        const meta = state.modelMetadata[modelName] || {};
        const { dir, name } = parseModelPath(modelName);
        const ext = getExtension(name);
-        const typeLabel = TYPE_LABELS[state.activeModelType];
-        const badges = badgeHtml(typeLabel);
+        const userBadges = modelBadgesHtml(modelName);
        const tagsHtml = (meta.tags || []).map((tag) => `<span class="wfm-badge wfm-badge-sm">${escapeHtml(tag)}</span>`).join("");
        const favStar = meta.favorite ? "\u2605" : "\u2606";
        const favClass = meta.favorite ? "wfm-fav-btn active" : "wfm-fav-btn";
@@ -373,7 +552,7 @@ function renderCardView(grid, models, totalPages) {
                <div class="wfm-card-meta">
                    ${dir ? `<span class="wfm-badge wfm-badge-sm wfm-badge-dir">${escapeHtml(dir)}</span>` : ""}
                    <span class="wfm-badge wfm-badge-sm">${escapeHtml(ext)}</span>
-                    ${badges} ${tagsHtml}
+                    ${userBadges} ${tagsHtml}
                </div>
            </div>
            <button class="${favClass}" title="${t("modelsFavorite")}">${favStar}</button>`;
@@ -478,11 +657,22 @@ async function toggleFavorite(modelName) {
 function openDetailModal(modelName) {
    const meta = state.modelMetadata[modelName] || {};
    const { dir, name } = parseModelPath(modelName);
-    const typeLabel = TYPE_LABELS[state.activeModelType];
-    const typeBadge = badgeHtml(typeLabel);
    const ext = getExtension(name);
    const isFav = !!meta.favorite;
    const tagsStr = (meta.tags || []).join(", ");
+    const selectedBadges = meta.badges || [];
+    const palette = getBadgePalette();
+    const allBadgeLabels = Object.keys(palette).sort();
+
+    const badgeCheckboxes = allBadgeLabels.map((label) => {
+        const checked = selectedBadges.includes(label) ? " checked" : "";
+        const color = palette[label] || "";
+        const style = color ? `background:${color};color:#fff;` : "";
+        return `<label class="wfm-badge-check-label">
+            <input type="checkbox" class="wfm-badge-checkbox" value="${escapeHtml(label)}"${checked}>
+            <span class="wfm-badge wfm-badge-model" style="${style}">${escapeHtml(label)}</span>
+        </label>`;
+    }).join("");

    const html = `
        <div class="wfm-modal-thumb-section">
@@ -496,10 +686,17 @@ function openDetailModal(modelName) {
        <div class="wfm-modal-two-col">
            <div class="wfm-modal-left">
                <section>
-                    <h4>${t("modelsModelType")}</h4>
-                    <div>${typeBadge} <span class="wfm-badge wfm-badge-sm">${escapeHtml(ext)}</span></div>
+                    <h4>${t("modelsInfo")}</h4>
+                    <div><span class="wfm-badge wfm-badge-sm">${escapeHtml(ext)}</span>${dir ? ` <span class="wfm-badge wfm-badge-sm wfm-badge-dir">${escapeHtml(dir)}</span>` : ""}</div>
+                </section>
+                <section>
+                    <h4>${t("modelsBadges")} <button class="wfm-btn wfm-btn-sm" id="wfm-modal-badge-manage" style="margin-left:6px;font-size:10px;">&#9881; ${t("badgeManage")}</button></h4>
+                    <div id="wfm-modal-badge-checkboxes" class="wfm-badge-checkboxes">
+                        ${allBadgeLabels.length === 0
+                            ? `<span style="color:var(--wfm-text-secondary);font-size:12px;">${t("badgeNoneHint")}</span>`
+                            : badgeCheckboxes}
+                    </div>
                </section>
-                ${dir ? `<section><h4>${t("modelsSubdir")}</h4><div>${escapeHtml(dir)}</div></section>` : ""}
                <section>
                    <h4>${t("modelsTags")} <span style="font-weight:normal;font-size:11px;">${t("modelsTagsHint")}</span></h4>
                    <input type="text" class="wfm-input" id="wfm-modal-model-tags" value="${escapeHtml(tagsStr)}" placeholder="${t("modelsTagsPlaceholder")}">
@@ -510,6 +707,9 @@ function openDetailModal(modelName) {
                </section>
                <div class="wfm-modal-actions">
                    <button class="wfm-btn wfm-btn-primary wfm-btn-sm" id="wfm-modal-model-save">${t("modelsSave")}</button>
+                    ${GENUI_TYPE_MAP[state.activeModelType]
+                        ? `<button class="wfm-btn wfm-btn-sm" id="wfm-modal-genui-model" title="${t("modelsGenUITitle")}">${t("modelsGenUIBtn")}</button>`
+                        : ""}
                </div>
            </div>
        </div>`;
@@ -540,18 +740,29 @@ function openDetailModal(modelName) {
        titleEl.parentNode.insertBefore(favBtn, titleEl);
    }

+    // Badge manage button → open badge edit modal
+    document.getElementById("wfm-modal-badge-manage")?.addEventListener("click", () => {
+        openBadgeEditModal();
+    });
+
    // Save
    document.getElementById("wfm-modal-model-save")?.addEventListener("click", async () => {
        const tagsInput = document.getElementById("wfm-modal-model-tags");
        const memoInput = document.getElementById("wfm-modal-model-memo");
        const tags = tagsInput ? tagsInput.value.split(",").map((s) => s.trim()).filter(Boolean) : [];
        const memo = memoInput ? memoInput.value : "";
-        await saveModelMetadata(modelName, { tags, memo });
+        const badges = [...document.querySelectorAll(".wfm-badge-checkbox:checked")].map((cb) => cb.value);
+        await saveModelMetadata(modelName, { tags, memo, badges });
        showToast(t("modelsSaved"), "success");
        renderTagFilter();
        renderModelGrid();
    });

+    // GenUI Model button
+    document.getElementById("wfm-modal-genui-model")?.addEventListener("click", () => {
+        applyToGenUI(modelName, state.activeModelType);
+    });
+
    // Change thumbnail
    const changeBtn = document.getElementById("wfm-modal-change-thumb");
    const thumbFile = document.getElementById("wfm-modal-thumb-file");
@@ -636,8 +847,8 @@ function renderSideInfo(modelName) {
    const meta = state.modelMetadata[modelName] || {};
    const { dir, name } = parseModelPath(modelName);
    const ext = getExtension(name);
-    const typeLabel = TYPE_LABELS[state.activeModelType] || state.activeModelType;
    const tagsStr = (meta.tags || []).join(", ");
+    const userBadgesHtml = modelBadgesHtml(modelName, false);

    el.innerHTML = `
        <div class="wfm-side-thumb-container">
@@ -648,8 +859,9 @@ function renderSideInfo(modelName) {
            <div class="wfm-side-thumb-info">
                <div class="wfm-side-thumb-name wfm-model-name-copy" title="${t("modelsCopyName")}">${escapeHtml(name)}</div>
                <div class="wfm-side-thumb-meta">
-                    ${badgeHtml(typeLabel)} <span class="wfm-badge wfm-badge-sm">${escapeHtml(ext)}</span>
+                    <span class="wfm-badge wfm-badge-sm">${escapeHtml(ext)}</span>
                    ${dir ? `<span class="wfm-badge wfm-badge-sm wfm-badge-dir">${escapeHtml(dir)}</span>` : ""}
+                    ${userBadgesHtml}
                </div>
            </div>
        </div>
@@ -671,8 +883,11 @@ function renderSideInfo(modelName) {
                <textarea id="wfm-models-side-memo" class="wfm-textarea" rows="4" placeholder="${t("modelsMemoPlaceholder")}">${escapeHtml(meta.memo || "")}</textarea>
            </div>
        </div>
-        <div class="wfm-node-detail-section">
+        <div class="wfm-node-detail-section" style="display:flex;gap:6px;">
            <button id="wfm-models-side-save-btn" class="wfm-btn wfm-btn-sm wfm-btn-primary">${t("modelsSave")}</button>
+            ${GENUI_TYPE_MAP[state.activeModelType]
+                ? `<button id="wfm-models-side-genui-btn" class="wfm-btn wfm-btn-sm" title="${t("modelsGenUITitle")}">${t("modelsGenUIBtn")}</button>`
+                : ""}
        </div>`;

    // Load preview image
@@ -726,6 +941,11 @@ function renderSideInfo(modelName) {
            renderModelGrid();
        });
    });
+
+    // GenUI Model button
+    el.querySelector("#wfm-models-side-genui-btn")?.addEventListener("click", () => {
+        applyToGenUI(modelName, state.activeModelType);
+    });
 }

 // ── Side Panel: Group Tab ─────────────────────────────────
@@ -1122,6 +1342,7 @@ export function initModelsTab() {
            state.activeModelType = btn.dataset.modelType;
            state.searchText = "";
            state.tagFilter = "";
+            state.badgeFilter = "";
            state.currentPage = 0;
            state.selectedModel = null;
            closeSidePanel();
@@ -1130,6 +1351,7 @@ export function initModelsTab() {
            if (searchInput) searchInput.value = "";
            const tagFilter = document.getElementById("wfm-models-tag-filter");
            if (tagFilter) tagFilter.value = "";
+            renderBadgeFilter();

            loadModelsForCurrentType();
        });
@@ -1185,16 +1407,10 @@ export function initModelsTab() {
        });
    });

-    // Badge settings
-    const badgeBtn = document.getElementById("wfm-models-badge-settings-btn");
-    const badgePanel = document.getElementById("wfm-models-badge-settings-panel");
-    if (badgeBtn && badgePanel) {
-        badgeBtn.addEventListener("click", () => {
-            const visible = badgePanel.style.display !== "none";
-            badgePanel.style.display = visible ? "none" : "block";
-            if (!visible) renderBadgeSettings();
-        });
-    }
+    // Badge manage button (toolbar)
+    document.getElementById("wfm-models-badge-settings-btn")?.addEventListener("click", () => {
+        openBadgeEditModal();
+    });

    // Refresh
    document.getElementById("wfm-models-refresh-btn")?.addEventListener("click", () => {
@@ -1224,6 +1440,9 @@ export function initModelsTab() {
        });
    });

+    // Initialize badge filter bar
+    renderBadgeFilter();
+
    // Lazy load on first tab click
    let firstLoad = false;
    document.querySelector('[data-tab="models"]')?.addEventListener("click", () => {
@@ -9,6 +9,7 @@ import { comfyWorkflow } from "./comfyui-workflow.js";
 import { loadWorkflowIntoEditor } from "./generate-tab.js";
 import { t, getSummaryPrompt } from "./i18n.js";
 import { highlightJSON } from "./json-highlight.js";
+import { openBadgeEditModal } from "./models-tab.js";

 // ============================================
 // State
@@ -16,29 +17,32 @@ import { highlightJSON } from "./json-highlight.js";

 const state = {
    workflows: [],
-    activeModel: "ALL",
+    activeBadge: "ALL",
    searchText: "",
    viewMode: localStorage.getItem("wfm_default_view") || "thumb", // thumb | card | table
    selectedWf: null,
    groupFilter: "", // empty = all groups
    currentPage: 0,
-    badgeColors: (() => {
-        try { return JSON.parse(localStorage.getItem("wfm_badge_colors") || "{}"); }
-        catch { return {}; }
-    })(),
 };

 const WF_PER_PAGE = 24;

-const BADGE_DEFAULT_COLORS = {
-    "SD1.5": "#e67e22",
-    SDXL: "#2ecc71",
-    Flux: "#9b59b6",
-    Flux2: "#8e44ad",
-    SD3: "#3498db",
-    Qwen: "#e74c3c",
-    "Z-IMAGE": "#1abc9c",
-};
+function getBadgePalette() {
+    try { return JSON.parse(localStorage.getItem("wfm_models_badge_palette") || "{}"); }
+    catch { return {}; }
+}
+
+function saveBadgePalette(palette) {
+    localStorage.setItem("wfm_models_badge_palette", JSON.stringify(palette));
+}
+
+function escapeHtml(s) {
+    return String(s)
+        .replace(/&/g, "&amp;")
+        .replace(/</g, "&lt;")
+        .replace(/>/g, "&gt;")
+        .replace(/"/g, "&quot;");
+}

 // ============================================
 // Open in ComfyUI
@@ -217,15 +221,22 @@ async function getRawWorkflow(filename) {
 // Rendering Helpers
 // ============================================

-function badgeHtml(type) {
-    const color = state.badgeColors[type] || BADGE_DEFAULT_COLORS[type] || "#0077ff";
-    return `<span class="wfm-badge wfm-badge-model" style="background:${color}">${type}</span>`;
+function badgeHtml(label) {
+    const palette = getBadgePalette();
+    const color = palette[label] || "";
+    const style = color ? ` style="background:${color};color:#fff;"` : "";
+    return `<span class="wfm-badge wfm-badge-model"${style}>${escapeHtml(label)}</span>`;
 }

-function getAllModelTypes() {
+function wfBadgesHtml(wf) {
+    const badges = wf.metadata?.badges || [];
+    return badges.map(label => badgeHtml(label)).join("");
+}
+
+function getAllBadges() {
    const set = new Set();
    state.workflows.forEach((wf) =>
-        (wf.analysis.modelTypes || []).forEach((t) => set.add(t))
+        (wf.metadata?.badges || []).forEach((b) => set.add(b))
    );
    return [...set].sort();
 }
@@ -234,17 +245,17 @@ function renderModelFilters() {
    const container = document.getElementById("wfm-model-filters");
    if (!container) return;

-    const types = getAllModelTypes();
+    const badges = getAllBadges();

    container.innerHTML = `
-        <button class="wfm-filter-btn ${state.activeModel === "ALL" ? "active" : ""}" data-filter="ALL">ALL</button>
-        <button class="wfm-filter-btn ${state.activeModel === "FAVORITE" ? "active" : ""}" data-filter="FAVORITE">&#9733;</button>
-        ${types.map((t) => `<button class="wfm-filter-btn ${state.activeModel === t ? "active" : ""}" data-filter="${t}">${t}</button>`).join("")}
+        <button class="wfm-filter-btn ${state.activeBadge === "ALL" ? "active" : ""}" data-filter="ALL">ALL</button>
+        <button class="wfm-filter-btn ${state.activeBadge === "FAVORITE" ? "active" : ""}" data-filter="FAVORITE">&#9733;</button>
+        ${badges.map((b) => `<button class="wfm-filter-btn ${state.activeBadge === b ? "active" : ""}" data-filter="${escapeHtml(b)}">${escapeHtml(b)}</button>`).join("")}
    `;

    container.querySelectorAll(".wfm-filter-btn").forEach((btn) => {
        btn.addEventListener("click", () => {
-            state.activeModel = btn.dataset.filter;
+            state.activeBadge = btn.dataset.filter;
            state.currentPage = 0;
            renderModelFilters();
            renderGrid();
@@ -254,10 +265,10 @@ function renderModelFilters() {

 function filterWorkflows() {
    return state.workflows.filter((wf) => {
-        if (state.activeModel === "FAVORITE") {
+        if (state.activeBadge === "FAVORITE") {
            if (!wf.metadata.favorite) return false;
-        } else if (state.activeModel !== "ALL") {
-            if (!(wf.analysis.modelTypes || []).includes(state.activeModel))
+        } else if (state.activeBadge !== "ALL") {
+            if (!(wf.metadata?.badges || []).includes(state.activeBadge))
                return false;
        }

@@ -326,7 +337,7 @@ function renderGrid() {
        card.className = "wfm-card";
        card.dataset.filename = wf.filename;
        const hasThumb = !!wf.thumbnail;
-        const badges = (wf.analysis.modelTypes || []).map((t) => badgeHtml(t)).join("");
+        const badges = wfBadgesHtml(wf);
        const tags = (wf.metadata.tags || []).map((t) => `<span class="wfm-tag">#${t}</span>`).join("");
        const favStar = wf.metadata.favorite ? "\u2605" : "\u2606";
        const favClass = wf.metadata.favorite ? "wfm-fav-btn active" : "wfm-fav-btn";
@@ -407,7 +418,7 @@ function renderTableView(grid, filtered) {
        const tr = document.createElement("tr");
        tr.className = "wfm-table-row";
        tr.dataset.filename = wf.filename;
-        const badges = (wf.analysis.modelTypes || []).map((t) => badgeHtml(t)).join("");
+        const badges = wfBadgesHtml(wf);
        const tags = (wf.metadata.tags || []).map((t) => `<span class="wfm-tag">#${t}</span>`).join("");
        const thumbHtml = wf.thumbnail
            ? `<img src="${wf.thumbnail}" class="wfm-table-thumb" loading="lazy" />`
@@ -550,7 +561,7 @@ function sidePanelThumbUpdate(wf) {
        nameEl.textContent = wf ? wf.filename.replace(/\.json$/, "") : "";
    }
    if (metaEl && wf) {
-        const badges = (wf.analysis.modelTypes || []).map((mt) => badgeHtml(mt)).join(" ");
+        const badges = wfBadgesHtml(wf);
        const io = `P:${wf.analysis.inputs?.prompts || 0} I:${wf.analysis.inputs?.images || 0} → ${wf.analysis.outputs?.images || 0}`;
        metaEl.innerHTML = `${badges} <span style="margin-left:4px;">${io}</span>`;
    } else if (metaEl) {
@@ -608,14 +619,13 @@ function refreshGroupSelects() {
 }

 // ============================================
-// Badge Color Settings
+// View Settings Panel
 // ============================================

-function renderBadgeSettings() {
+function renderViewSettings() {
    const panel = document.getElementById("wfm-badge-settings-panel");
    if (!panel) return;

-    // === Default View section ===
    const currentView = localStorage.getItem("wfm_default_view") || "thumb";
    const viewOptions = [
        { value: "thumb", label: t("viewThumbnail") },
@@ -629,57 +639,20 @@ function renderBadgeSettings() {
        </label>`
    ).join("");

-    // === Badge Colors section ===
-    const types = getAllModelTypes();
-    const allKnown = new Set([...Object.keys(BADGE_DEFAULT_COLORS), ...types]);
-    const rows = [...allKnown].sort().map((type) => {
-        const color = state.badgeColors[type] || BADGE_DEFAULT_COLORS[type] || "#0077ff";
-        return `<div class="wfm-badge-color-row" data-type="${type}">
-            <span class="wfm-badge wfm-badge-model" style="background:${color}">${type}</span>
-            <input type="color" class="wfm-badge-color-input" value="${color}" data-type="${type}" title="Change color for ${type}" />
-        </div>`;
-    }).join("");
-
    panel.innerHTML = `
        <div class="wfm-badge-settings-title">${t("defaultView")}</div>
-        <div class="wfm-settings-radio-group">${viewRadios}</div>
-        <hr style="border:none;border-top:1px solid var(--wfm-border);margin:8px 0;">
-        <div class="wfm-badge-settings-title">${t("badgeColors")}</div>
-        ${rows}
-        <button id="wfm-badge-color-reset" class="wfm-btn wfm-btn-sm" style="margin-top:6px;width:100%;">${t("resetColors")}</button>`;
+        <div class="wfm-settings-radio-group">${viewRadios}</div>`;

-    // Default view change
    panel.querySelectorAll('input[name="wfm-default-view"]').forEach((radio) => {
        radio.addEventListener("change", () => {
            localStorage.setItem("wfm_default_view", radio.value);
            state.viewMode = radio.value;
-            // Update active state on view mode buttons
            document.querySelectorAll(".wfm-view-btn").forEach((b) => {
                b.classList.toggle("active", b.dataset.view === radio.value);
            });
            renderGrid();
        });
    });
-
-    // Badge color change
-    panel.querySelectorAll(".wfm-badge-color-input").forEach((input) => {
-        input.addEventListener("input", (e) => {
-            const type = e.target.dataset.type;
-            const color = e.target.value;
-            state.badgeColors[type] = color;
-            localStorage.setItem("wfm_badge_colors", JSON.stringify(state.badgeColors));
-            const badge = e.target.closest(".wfm-badge-color-row")?.querySelector(".wfm-badge");
-            if (badge) badge.style.background = color;
-            renderGrid();
-        });
-    });
-
-    panel.querySelector("#wfm-badge-color-reset")?.addEventListener("click", () => {
-        state.badgeColors = {};
-        localStorage.removeItem("wfm_badge_colors");
-        renderBadgeSettings();
-        renderGrid();
-    });
 }

 // ============================================
@@ -704,10 +677,21 @@ async function saveModalMeta(wf) {

 function openDetailModal(wf) {
    const meta = wf.metadata;
-    const types = (wf.analysis.modelTypes || []).map((t) => badgeHtml(t)).join(" ");
-    const io = `P:${wf.analysis.inputs?.prompts || 0} I:${wf.analysis.inputs?.images || 0} → ${wf.analysis.outputs?.images || 0}`;
-    const overrideText = (meta.modelTypesOverride || []).join(", ");
    const isFav = !!meta.favorite;
+    const palette = getBadgePalette();
+    const allBadgeLabels = Object.keys(palette).sort();
+    const activeBadges = meta.badges || [];
+    const badgeCheckboxes = allBadgeLabels.length === 0
+        ? `<span style="color:var(--wfm-text-secondary);font-size:12px;">${t("badgeNoneHint")}</span>`
+        : allBadgeLabels.map((label) => {
+            const color = palette[label] || "";
+            const style = color ? ` style="background:${color};color:#fff;"` : "";
+            const checked = activeBadges.includes(label) ? " checked" : "";
+            return `<label class="wfm-badge-check-label">
+                <input type="checkbox" class="wfm-badge-checkbox" value="${escapeHtml(label)}"${checked}>
+                <span class="wfm-badge wfm-badge-model"${style}>${escapeHtml(label)}</span>
+            </label>`;
+        }).join("");

    const thumbSrc = wf.thumbnail || "";
    const html = `
@@ -720,23 +704,9 @@ function openDetailModal(wf) {
        <div class="wfm-modal-two-col">
            <div class="wfm-modal-left">
                <section>
-                    <div style="display:flex;align-items:center;gap:8px;margin-bottom:6px;">
-                        <h4>${t("analysis")}</h4>
-                        <button class="wfm-btn wfm-btn-sm" id="wfm-detail-analyze">${t("analyze")}</button>
-                    </div>
-                    <div id="wfm-detail-analysis" class="wfm-detail-analysis">
-                        <div>${types || `<span style="color:var(--wfm-text-secondary)">${t("noModelDetected")}</span>`}</div>
-                        <div style="font-size:11px;color:var(--wfm-text-secondary);margin-top:4px;">${io}</div>
-                    </div>
-                    <div id="wfm-detail-override-row" style="margin-top:8px;">
-                        <div style="display:flex;gap:4px;align-items:center;">
-                            <span style="font-size:12px;color:var(--wfm-text-secondary);white-space:nowrap;">${t("modelCategory")}</span>
-                            <input type="text" class="wfm-input" id="wfm-detail-model-override"
-                                value="${overrideText}"
-                                placeholder="${t("modelOverridePlaceholder")}" style="flex:1;font-size:12px;padding:4px 6px;min-width:0;">
-                            <button class="wfm-btn wfm-btn-sm wfm-btn-primary" id="wfm-detail-override-save">${t("save")}</button>
-                        </div>
-                    </div>
+                    <h4>${t("modelsBadges")} <button class="wfm-btn wfm-btn-sm" id="wfm-detail-badge-manage">&#9881; ${t("badgeManage")}</button></h4>
+                    <div id="wfm-detail-badge-checkboxes" class="wfm-badge-checkboxes">${badgeCheckboxes}</div>
+                    <button class="wfm-btn wfm-btn-sm wfm-btn-primary" id="wfm-detail-badges-save" style="margin-top:6px;">${t("save")}</button>
                </section>
                <section>
                    <h4>${t("tags")} <span style="font-weight:normal;font-size:11px;">${t("tagsHint")}</span></h4>
@@ -844,51 +814,40 @@ function openDetailModal(wf) {
        document.getElementById(id)?.addEventListener("blur", () => saveModalMeta(wf));
    });

-    // Analyze button
-    document.getElementById("wfm-detail-analyze")?.addEventListener("click", async () => {
-        const btn = document.getElementById("wfm-detail-analyze");
-        btn.disabled = true;
-        btn.textContent = t("analyzing");
-        try {
-            const res = await fetch("/api/wfm/workflows/analyze", {
-                method: "POST",
-                headers: { "Content-Type": "application/json" },
-                body: JSON.stringify({ filename: wf.filename }),
-            });
-            const data = await res.json();
-            if (data.error) throw new Error(data.error);
-            wf.analysis = data.analysis;
-            const cached = state.workflows.find((w) => w.filename === wf.filename);
-            if (cached) cached.analysis = data.analysis;
-            // Re-render analysis section
-            const analysisEl = document.getElementById("wfm-detail-analysis");
-            if (analysisEl) {
-                const newTypes = (data.analysis.modelTypes || []).map((mt) => badgeHtml(mt)).join(" ");
-                const newIo = `P:${data.analysis.inputs?.prompts || 0} I:${data.analysis.inputs?.images || 0} → ${data.analysis.outputs?.images || 0}`;
-                analysisEl.innerHTML = `<div>${newTypes || `<span style="color:var(--wfm-text-secondary)">${t("noModelDetected")}</span>`}</div>
-                    <div style="font-size:11px;color:var(--wfm-text-secondary);margin-top:4px;">${newIo}</div>`;
-            }
-            renderGrid();
-            showToast(t("analysisComplete"), "success");
-        } catch (err) {
-            showToast(t("analyzeError") + ": " + err.message, "error");
-        } finally {
-            btn.disabled = false;
-            btn.textContent = t("analyze");
-        }
+    // Badge manage button
+    document.getElementById("wfm-detail-badge-manage")?.addEventListener("click", () => {
+        openBadgeEditModal(() => {
+            // Rebuild checkboxes after palette changes
+            const palette = getBadgePalette();
+            const allLabels = Object.keys(palette).sort();
+            const currentBadges = [...document.querySelectorAll(".wfm-badge-checkbox:checked")].map(cb => cb.value);
+            const el = document.getElementById("wfm-detail-badge-checkboxes");
+            if (!el) return;
+            el.innerHTML = allLabels.length === 0
+                ? `<span style="color:var(--wfm-text-secondary);font-size:12px;">${t("badgeNoneHint")}</span>`
+                : allLabels.map((label) => {
+                    const color = palette[label] || "";
+                    const style = color ? ` style="background:${color};color:#fff;"` : "";
+                    const checked = currentBadges.includes(label) ? " checked" : "";
+                    return `<label class="wfm-badge-check-label">
+                        <input type="checkbox" class="wfm-badge-checkbox" value="${escapeHtml(label)}"${checked}>
+                        <span class="wfm-badge wfm-badge-model"${style}>${escapeHtml(label)}</span>
+                    </label>`;
+                }).join("");
+        });
    });

-    // Model type override save
-    document.getElementById("wfm-detail-override-save")?.addEventListener("click", async () => {
-        const overrideStr = document.getElementById("wfm-detail-model-override")?.value || "";
-        const modelTypesOverride = overrideStr.split(",").map((t) => t.trim()).filter(Boolean);
+    // Badge save
+    document.getElementById("wfm-detail-badges-save")?.addEventListener("click", async () => {
+        const badges = [...document.querySelectorAll(".wfm-badge-checkbox:checked")].map(cb => cb.value);
        try {
-            await saveMetadata(wf.filename, { modelTypesOverride });
-            wf.metadata.modelTypesOverride = modelTypesOverride;
+            await saveMetadata(wf.filename, { badges });
+            wf.metadata.badges = badges;
            const cached = state.workflows.find((w) => w.filename === wf.filename);
-            if (cached) cached.metadata.modelTypesOverride = modelTypesOverride;
+            if (cached) cached.metadata.badges = badges;
            renderGrid();
-            showToast(t("overrideSaved"), "success");
+            renderModelFilters();
+            showToast(t("modelsSaved"), "success");
        } catch (err) {
            showToast(t("saveError") + ": " + err.message, "error");
        }
@@ -1271,7 +1230,7 @@ export function initWorkflowTab() {
        showToast("Refreshed", "success");
    });

-    // Toolbar: Badge color settings
+    // Toolbar: ⚙ settings button (view settings panel)
    const badgeSettingsBtn = document.getElementById("wfm-badge-settings-btn");
    const badgeSettingsPanel = document.getElementById("wfm-badge-settings-panel");
    if (badgeSettingsBtn && badgeSettingsPanel) {
@@ -1282,7 +1241,7 @@ export function initWorkflowTab() {
                badgeSettingsPanel.style.display = "none";
                return;
            }
-            renderBadgeSettings();
+            renderViewSettings();
            badgeSettingsPanel.style.display = "";
        });
        document.addEventListener("click", (e) => {
@@ -1292,15 +1251,9 @@ export function initWorkflowTab() {
        });
    }

-    // Toolbar: Reanalyze All button
-    document.getElementById("wfm-reanalyze-btn")?.addEventListener("click", async () => {
-        try {
-            const result = await reanalyzeAll();
-            showToast(`Reanalyzed ${result.count ?? 0} workflows`, "success");
-            await loadWorkflows();
-        } catch (err) {
-            showToast("Reanalyze error: " + err.message, "error");
-        }
+    // Toolbar: ⚙ Badge button
+    document.getElementById("wfm-badge-btn")?.addEventListener("click", () => {
+        openBadgeEditModal(() => renderGrid());
    });

    // Initial load
@@ -50,13 +50,13 @@
                        <button class="wfm-view-btn" data-view="table" title="Table">&#8801;</button>
                    </div>
                    <button id="wfm-refresh-btn" class="wfm-btn wfm-btn-sm">Refresh</button>
-                    <button id="wfm-reanalyze-btn" class="wfm-btn wfm-btn-sm" title="Re-analyze all workflows">Reanalyze All</button>
                    <label class="wfm-btn wfm-btn-sm" style="cursor:pointer;">
                        Import
                        <input type="file" id="wfm-import-input" multiple accept=".json,.png" style="display:none">
                    </label>
+                    <button id="wfm-badge-btn" class="wfm-btn wfm-btn-sm" title="Badge settings">&#9881; Badge</button>
                    <div class="wfm-badge-settings-wrap">
-                        <button id="wfm-badge-settings-btn" class="wfm-btn wfm-btn-sm" title="Badge color settings">&#9881;</button>
+                        <button id="wfm-badge-settings-btn" class="wfm-btn wfm-btn-sm" title="View settings">&#9881;</button>
                        <div id="wfm-badge-settings-panel" class="wfm-badge-settings-panel" style="display:none;"></div>
                    </div>
                    <div id="wfm-workflow-pagination" class="wfm-pagination-inline"></div>
@@ -199,8 +199,8 @@
        <!-- Models Tab -->
        <section id="wfm-tab-models" class="wfm-tab-content">
            <div class="wfm-toolbar">
-                <!-- Row 1: Model type sub-tabs -->
-                <div class="wfm-toolbar-row" style="gap:8px;">
+                <!-- Row 1: Model type sub-tabs + badge filter -->
+                <div class="wfm-toolbar-row" style="gap:8px;flex-wrap:wrap;align-items:center;">
                    <div class="wfm-models-type-nav">
                        <button class="wfm-models-type-btn active" data-model-type="checkpoint">Checkpoint</button>
                        <button class="wfm-models-type-btn" data-model-type="lora">LoRA</button>
@@ -208,7 +208,11 @@
                        <button class="wfm-models-type-btn" data-model-type="controlnet">ControlNet</button>
                        <button class="wfm-models-type-btn" data-model-type="unet">UNET</button>
                        <button class="wfm-models-type-btn" data-model-type="textencoder">TextEncoder</button>
+                        <button class="wfm-models-type-btn" data-model-type="hypernetwork">Hypernetwork</button>
+                        <button class="wfm-models-type-btn" data-model-type="embedding">Embedding</button>
                    </div>
+                    <div class="wfm-models-type-divider"></div>
+                    <div id="wfm-models-badge-filter-bar" class="wfm-badge-filter-bar"></div>
                </div>
                <!-- Row 2: Search / filter toolbar -->
                <div id="wfm-models-toolbar" class="wfm-toolbar-row" style="gap:6px;flex-wrap:wrap;">
@@ -225,10 +229,7 @@
                    <button id="wfm-models-refresh-btn" class="wfm-btn wfm-btn-sm">Refresh</button>
                    <button id="wfm-models-civitai-batch-btn" class="wfm-btn wfm-btn-sm" title="Fetch CivitAI info for all models">CivitAI</button>
                    <span id="wfm-models-civitai-progress" style="font-size:12px;color:var(--wfm-text-secondary);"></span>
-                    <div class="wfm-badge-settings-wrap">
-                        <button id="wfm-models-badge-settings-btn" class="wfm-btn wfm-btn-sm" title="Badge color settings">&#9881;</button>
-                        <div id="wfm-models-badge-settings-panel" class="wfm-badge-settings-panel" style="display:none;"></div>
-                    </div>
+                    <button id="wfm-models-badge-settings-btn" class="wfm-btn wfm-btn-sm" title="Badge settings">&#9881; Badge</button>
                    <div id="wfm-models-pagination" class="wfm-pagination-inline"></div>
                </div>
            </div>
@@ -278,53 +279,57 @@

            <!-- Editor Layout -->
            <div class="wfm-gen-layout">
-                <!-- Left Column: Parameter Editor -->
+                <!-- Left Column: Parameter Tabs -->
                <div class="wfm-gen-left">
-                    <!-- Subtab Navigation -->
+                    <!-- Tab Navigation -->
                    <div class="wfm-gen-subtab-nav">
-                        <button class="wfm-gen-subtab-btn active" data-subtab="prompt">Prompt</button>
-                        <button class="wfm-gen-subtab-btn" data-subtab="image">Image</button>
+                        <button class="wfm-gen-subtab-btn active" data-subtab="input">Input</button>
                        <button class="wfm-gen-subtab-btn" data-subtab="model">Model</button>
                        <button class="wfm-gen-subtab-btn" data-subtab="settings">Settings</button>
-                        <button class="wfm-gen-subtab-btn" data-subtab="raw">Raw JSON</button>
                    </div>

-                    <!-- Subtab: Prompt -->
-                    <div id="wfm-gen-subtab-prompt" class="wfm-gen-subtab-content active">
-                        <div id="wfm-gen-prompt-fields">
-                            <p class="wfm-placeholder">Load a workflow to edit prompts</p>
+                    <!-- Tab: Input — left sub-col: Prompt(top)+Image(bottom), right sub-col: Raw JSON -->
+                    <div id="wfm-gen-subtab-input" class="wfm-gen-subtab-content active">
+                        <div class="wfm-gen-tab-cols">
+                            <div class="wfm-gen-params-col">
+                                <div class="wfm-gen-params-section">
+                                    <h3 class="wfm-gen-col-title">Prompt</h3>
+                                    <div id="wfm-gen-prompt-fields">
+                                        <p class="wfm-placeholder">Load a workflow to edit prompts</p>
+                                    </div>
+                                </div>
+                                <div class="wfm-gen-params-section wfm-gen-params-section--top-border">
+                                    <h3 class="wfm-gen-col-title">Image</h3>
+                                    <div id="wfm-gen-image-fields">
+                                        <p class="wfm-placeholder">Load a workflow to set input images</p>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="wfm-gen-rawjson-col" id="wfm-gen-rawjson-col-input"></div>
                        </div>
                    </div>

-                    <!-- Subtab: Image Input -->
-                    <div id="wfm-gen-subtab-image" class="wfm-gen-subtab-content">
-                        <div id="wfm-gen-image-fields">
-                            <p class="wfm-placeholder">Load a workflow to set input images</p>
-                        </div>
-                    </div>
-
-                    <!-- Subtab: Model -->
+                    <!-- Tab: Model — left sub-col: model selects, right sub-col: Raw JSON -->
                    <div id="wfm-gen-subtab-model" class="wfm-gen-subtab-content">
-                        <div id="wfm-gen-model-fields">
-                            <p class="wfm-placeholder">Load a workflow to edit models</p>
+                        <div class="wfm-gen-tab-cols">
+                            <div class="wfm-gen-params-col wfm-gen-params-col--scroll">
+                                <div id="wfm-gen-model-fields">
+                                    <p class="wfm-placeholder">Load a workflow to edit models</p>
+                                </div>
+                            </div>
+                            <div class="wfm-gen-rawjson-col" id="wfm-gen-rawjson-col-model"></div>
                        </div>
                    </div>

-                    <!-- Subtab: Settings -->
+                    <!-- Tab: Settings — left sub-col: KSampler(top)+LatentImage(bottom), right sub-col: Raw JSON -->
                    <div id="wfm-gen-subtab-settings" class="wfm-gen-subtab-content">
-                        <div id="wfm-gen-settings-fields">
-                            <p class="wfm-placeholder">Load a workflow to edit settings</p>
-                        </div>
-                    </div>
-
-                    <!-- Subtab: Raw JSON -->
-                    <div id="wfm-gen-subtab-raw" class="wfm-gen-subtab-content">
-                        <div style="margin-bottom:8px;">
-                            <button id="wfm-gen-apply-raw-btn" class="wfm-btn wfm-btn-sm">Apply JSON</button>
-                        </div>
-                        <div class="wfm-json-container" style="height:500px;">
-                            <pre id="wfm-gen-raw-json-highlight" class="wfm-json-highlight"></pre>
-                            <textarea id="wfm-gen-raw-json" class="wfm-json-editor" spellcheck="false" placeholder="Paste workflow JSON here..."></textarea>
+                        <div class="wfm-gen-tab-cols">
+                            <div class="wfm-gen-params-col wfm-gen-params-col--scroll">
+                                <div id="wfm-gen-settings-fields">
+                                    <p class="wfm-placeholder">Load a workflow to edit settings</p>
+                                </div>
+                            </div>
+                            <div class="wfm-gen-rawjson-col" id="wfm-gen-rawjson-col-settings"></div>
                        </div>
                    </div>
                </div>
@@ -349,7 +354,7 @@
                        <!-- Seed -->
                        <div style="display:flex;gap:8px;align-items:center;margin-top:8px;">
                            <label style="font-size:12px;color:var(--wfm-text-secondary);white-space:nowrap;">Seed:</label>
-                            <input type="number" id="wfm-gen-seed-value" class="wfm-input" value="-1" style="width:140px;">
+                            <input type="number" id="wfm-gen-seed-value" class="wfm-input" value="-1" style="width:130px;">
                            <select id="wfm-gen-seed-mode" class="wfm-select" style="width:auto;">
                                <option value="random">Random</option>
                                <option value="fixed">Fixed</option>
@@ -366,6 +371,18 @@
                    </div>
                </div>
            </div>
+
+            <!-- Raw JSON shared widget (moved into active tab's rawjson-col by JS) -->
+            <div id="wfm-gen-rawjson-widget" style="display:none;flex-direction:column;height:100%;">
+                <div class="wfm-gen-rawjson-header">
+                    <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 class="wfm-json-container wfm-gen-rawjson-editor">
+                    <pre id="wfm-gen-raw-json-highlight" class="wfm-json-highlight"></pre>
+                    <textarea id="wfm-gen-raw-json" class="wfm-json-editor" spellcheck="false" placeholder="Paste workflow JSON here..."></textarea>
+                </div>
+            </div>
        </section>

        <!-- Prompt Tab -->
@@ -499,9 +516,8 @@
                            <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>
                            <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, analysis, category override, tags, memo, AI summary, open in ComfyUI, load in GenerateUI, set as default, delete</li>
-                            <li id="wfm-help-wf-7">Customize badge colors per category</li>
-                            <li id="wfm-help-wf-8">Batch re-analysis of all workflow I/O (P: prompt nodes, I: image nodes, output: save nodes)</li>
+                            <li id="wfm-help-wf-6">Detail modal: rename, favorite, thumbnail change, badge assignment, tags, memo, AI summary, open in ComfyUI, 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>

@@ -510,11 +526,14 @@
                        <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)</li>
-                            <li id="wfm-help-gen-3">Edit parameters: Prompt, Image (drag &amp; drop), Model (checkpoint/VAE/LoRA/ControlNet with filter), Settings (steps/CFG/sampler/scheduler/resolution), Raw JSON</li>
-                            <li id="wfm-help-gen-4">Seed control: random, fixed, increment, decrement</li>
-                            <li id="wfm-help-gen-5">Generate, progress display, and stop</li>
-                            <li id="wfm-help-gen-6">View results with main image and thumbnail history</li>
-                            <li id="wfm-help-gen-7">Eagle integration: auto-save generated images to Eagle</li>
+                            <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-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</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>
                        </ul>
                    </div>

@@ -560,13 +579,15 @@
                    <div class="wfm-help-card">
                        <h3>Models Tab</h3>
                        <ul>
-                            <li id="wfm-help-models-1">Browse installed models: Checkpoint, LoRA, VAE, ControlNet, UNET, TextEncoder with sub-tab switching</li>
+                            <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, Card, and Table view modes with pagination</li>
                            <li id="wfm-help-models-3">Search, tag filter, group filter, and favorites filter</li>
                            <li id="wfm-help-models-4">Side panel: 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>
                            <li id="wfm-help-models-6">Detail modal: preview image, CivitAI info (base model, trained words, tags), thumbnail change</li>
                            <li id="wfm-help-models-7">Group management: create, rename, delete groups and assign/remove models</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)</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>

@@ -574,8 +595,9 @@
                        <h3 id="wfm-help-sidepanel-title">Workflow Studio Library (ComfyUI Side Panel)</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: browse favorite workflows, filter by model type, and filter by group</li>
-                            <li id="wfm-help-sidepanel-3">Nodes tab: browse favorite nodes, node sets, and node groups</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 sub-tabs; ★ shown for favorites in All view</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>
                            <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>
@@ -21,7 +21,7 @@ export const NODE_SETS_TOOLTIP = "Workflow Studio Library \u2013 Browse & drag w
 const state = {
    visible: false,
    // Top-level tab
-    topTab: "workflows",           // "workflows" | "nodes" | "prompts"
+    topTab: "workflows",           // "workflows" | "nodes" | "prompts" | "models"
    // Node sub-tabs (existing)
    activeTab: "all",              // all | favorites | groups
    activeTab2: null,              // 2nd row: "sets" (or null when 1st row active)
@@ -35,7 +35,7 @@ const state = {
    wfSubTab2: null,               // 2nd row: "wf-modeltype" (or null when 1st row active)
    wfList: [],                    // full workflow array from API
    wfFavorites: [],               // metadata.favorite === true
-    wfModelTypes: [],              // unique model type strings
+    wfBadgeTypes: [],              // unique badge strings
    wfGroups: {},                  // from localStorage "wfm_groups"
    wfLoaded: false,
    // Prompts sub-tabs
@@ -44,6 +44,12 @@ const state = {
    promptFavorites: [],           // favorite === true
    promptCategories: [],          // unique category strings
    promptLoaded: false,
+    // Models sub-tabs
+    modelSubTab: "model-all",      // "model-all" | "model-favorites" | "model-groups"
+    modelSubTab2: null,            // 2nd row: "model-type" (or null when 1st row active)
+    modelMetadata: {},             // {modelName: {favorite, tags, badges, ...}}
+    modelGroups: {},               // {groupName: [modelName, ...]} from /api/wfm/models/groups
+    modelsLoaded: false,
    // Shared
    searchText: "",
 };
@@ -117,6 +123,62 @@ const loadPromptData = async () => {
    state.promptLoaded = true;
 };

+// ============================================
+// API – Models
+// ============================================
+
+const MODEL_TYPE_LABELS = {
+    checkpoint: "Checkpoint",
+    lora: "LoRA",
+    vae: "VAE",
+    controlnet: "ControlNet",
+    unet: "UNET",
+    textencoder: "TextEncoder",
+    hypernetwork: "Hypernetwork",
+    embedding: "Embedding",
+};
+
+const MODEL_TYPES = Object.keys(MODEL_TYPE_LABELS);
+
+const fetchModelList = async (type) => {
+    try {
+        const comfyBase = window.location.origin;
+        const fetchMap = {
+            checkpoint: () => fetch(`${comfyBase}/object_info/CheckpointLoaderSimple`).then(r => r.json()).then(d => d?.CheckpointLoaderSimple?.input?.required?.ckpt_name?.[0] || []),
+            lora:        () => fetch(`${comfyBase}/object_info/LoraLoader`).then(r => r.json()).then(d => d?.LoraLoader?.input?.required?.lora_name?.[0] || []),
+            vae:         () => fetch(`${comfyBase}/object_info/VAELoader`).then(r => r.json()).then(d => d?.VAELoader?.input?.required?.vae_name?.[0] || []),
+            controlnet:  () => fetch(`${comfyBase}/object_info/ControlNetLoader`).then(r => r.json()).then(d => d?.ControlNetLoader?.input?.required?.control_net_name?.[0] || []),
+            unet:        () => fetch(`${comfyBase}/object_info/UNETLoader`).then(r => r.json()).then(d => d?.UNETLoader?.input?.required?.unet_name?.[0] || []),
+            textencoder: () => fetch(`${comfyBase}/object_info/CLIPLoader`).then(r => r.json()).then(d => d?.CLIPLoader?.input?.required?.clip_name1?.[0] || []),
+            hypernetwork:() => fetch(`${comfyBase}/object_info/HypernetworkLoader`).then(r => r.json()).then(d => d?.HypernetworkLoader?.input?.required?.hypernetwork_name?.[0] || []),
+            embedding:   () => fetch(`${comfyBase}/embeddings`).then(r => r.json()).then(d => Array.isArray(d) ? d : []),
+        };
+        const fn = fetchMap[type];
+        return fn ? await fn() : [];
+    } catch { return []; }
+};
+
+const fetchModelMetadata = async () => {
+    try {
+        const res = await fetch("/api/wfm/models/metadata");
+        return res.ok ? await res.json() : {};
+    } catch { return {}; }
+};
+
+const fetchModelGroups = async () => {
+    try {
+        const res = await fetch("/api/wfm/models/groups");
+        return res.ok ? await res.json() : {};
+    } catch { return {}; }
+};
+
+const loadModelsData = async () => {
+    const [metadata, groups] = await Promise.all([fetchModelMetadata(), fetchModelGroups()]);
+    state.modelMetadata = metadata;
+    state.modelGroups = groups;
+    state.modelsLoaded = true;
+};
+
 // ============================================
 // API – Workflows
 // ============================================
@@ -142,15 +204,12 @@ const loadWfData = async () => {
    // Extract favorites
    state.wfFavorites = workflows.filter(w => w.metadata?.favorite);

-    // Extract unique model types
-    const typeSet = new Set();
+    // Extract unique badge labels
+    const badgeSet = new Set();
    for (const wf of workflows) {
-        const types = wf.metadata?.modelTypesOverride?.length
-            ? wf.metadata.modelTypesOverride
-            : (wf.analysis?.modelTypes || []);
-        types.forEach(t => typeSet.add(t));
+        (wf.metadata?.badges || []).forEach(b => badgeSet.add(b));
    }
-    state.wfModelTypes = [...typeSet].sort();
+    state.wfBadgeTypes = [...badgeSet].sort();

    // Load groups from localStorage and clean up stale entries
    try {
@@ -275,6 +334,70 @@ const placePromptNode = (posText, negText, promptName, pos) => {
    showToast(`Placed: ${promptName || "Prompt"}`, "success");
 };

+// ============================================
+// Model node placement
+// ============================================
+
+// Model type → { classType, widgetName } mapping
+const MODEL_NODE_MAP = {
+    checkpoint:   { classType: "CheckpointLoaderSimple", widgetName: "ckpt_name" },
+    lora:         { classType: "LoraLoader",             widgetName: "lora_name" },
+    vae:          { classType: "VAELoader",              widgetName: "vae_name" },
+    controlnet:   { classType: "ControlNetLoader",       widgetName: "control_net_name" },
+    unet:         { classType: "UNETLoader",             widgetName: "unet_name" },
+    textencoder:  { classType: "CLIPLoader",             widgetName: "clip_name1" },
+    hypernetwork: { classType: "HypernetworkLoader",     widgetName: "hypernetwork_name" },
+    // embedding has no loader node — copy-only
+};
+
+const placeModelNode = (modelName, modelType, pos) => {
+    const mapping = MODEL_NODE_MAP[modelType];
+    if (!mapping) {
+        // Embedding: copy "embedding:name" to clipboard and notify
+        const lastSlash = Math.max(modelName.lastIndexOf("/"), modelName.lastIndexOf("\\"));
+        const filename = lastSlash >= 0 ? modelName.substring(lastSlash + 1) : modelName;
+        const dot = filename.lastIndexOf(".");
+        const stem = dot >= 0 ? filename.substring(0, dot) : filename;
+        const text = `embedding:${stem}`;
+        navigator.clipboard.writeText(text).then(() => {
+            showToast(`Copied: ${text}`, "success");
+        });
+        return;
+    }
+
+    const graph = app.graph;
+    if (!graph) return;
+
+    const node = LiteGraph.createNode(mapping.classType);
+    if (!node) {
+        showToast(`Node not found: ${mapping.classType}`, "error");
+        return;
+    }
+
+    const canvas = app.canvas;
+    const centerPos = canvas
+        ? [-canvas.ds.offset[0] + canvas.canvas.width / 2 / canvas.ds.scale,
+           -canvas.ds.offset[1] + canvas.canvas.height / 2 / canvas.ds.scale]
+        : [100, 100];
+    node.pos = pos || centerPos;
+    graph.add(node);
+
+    // Set the model widget value
+    if (node.widgets) {
+        const w = node.widgets.find(ww => ww.name === mapping.widgetName);
+        if (w) {
+            w.value = modelName;
+            // Trigger callback if present (updates node appearance)
+            if (w.callback) w.callback(modelName);
+        }
+    }
+
+    app.canvas.setDirty(true, true);
+    const lastSlash = Math.max(modelName.lastIndexOf("/"), modelName.lastIndexOf("\\"));
+    const filename = lastSlash >= 0 ? modelName.substring(lastSlash + 1) : modelName;
+    showToast(`Placed: ${filename}`, "success");
+};
+
 // ============================================
 // Workflow canvas loading
 // ============================================
@@ -311,13 +434,24 @@ const installCanvasDropHandler = () => {
    canvasEl.addEventListener("dragover", (e) => {
        if (e.dataTransfer.types.includes("application/x-wfm-node") ||
            e.dataTransfer.types.includes("application/x-wfm-workflow") ||
-            e.dataTransfer.types.includes("application/x-wfm-prompt")) {
+            e.dataTransfer.types.includes("application/x-wfm-prompt") ||
+            e.dataTransfer.types.includes("application/x-wfm-model")) {
            e.preventDefault();
            e.dataTransfer.dropEffect = "copy";
        }
    });

    canvasEl.addEventListener("drop", (e) => {
+        // Handle model drop
+        const modelRaw = e.dataTransfer.getData("application/x-wfm-model");
+        if (modelRaw) {
+            e.preventDefault();
+            const { modelName, modelType } = JSON.parse(modelRaw);
+            const pos = getCanvasDropPos(e);
+            placeModelNode(modelName, modelType, pos);
+            return;
+        }
+
        // Handle prompt drop
        const promptRaw = e.dataTransfer.getData("application/x-wfm-prompt");
        if (promptRaw) {
@@ -377,6 +511,7 @@ const createPanel = () => {
            <button class="wfm-nlp-tab wfm-nlp-top-tab active" data-toptab="workflows">Workflows</button>
            <button class="wfm-nlp-tab wfm-nlp-top-tab" data-toptab="nodes">Nodes</button>
            <button class="wfm-nlp-tab wfm-nlp-top-tab" data-toptab="prompts">Prompts</button>
+            <button class="wfm-nlp-tab wfm-nlp-top-tab" data-toptab="models">Models</button>
        </div>
        <div class="wfm-nlp-subtabs"></div>
        <div class="wfm-nlp-subtabs wfm-nlp-subtabs-row2"></div>
@@ -399,7 +534,7 @@ const createPanel = () => {
            const searchInput = panel.querySelector(".wfm-nlp-search-input");
            if (searchInput) {
                searchInput.value = "";
-                const placeholders = { workflows: "Search workflows...", nodes: "Search nodes...", prompts: "Search prompts..." };
+                const placeholders = { workflows: "Search workflows...", nodes: "Search nodes...", prompts: "Search prompts...", models: "Search models..." };
                searchInput.placeholder = placeholders[tab] || "Search...";
            }
            panel.querySelectorAll(".wfm-nlp-top-tab").forEach(b => b.classList.remove("active"));
@@ -412,6 +547,8 @@ const createPanel = () => {
                await loadData();
            } else if (tab === "prompts" && !state.promptLoaded) {
                await loadPromptData();
+            } else if (tab === "models" && !state.modelsLoaded) {
+                await loadModelsData();
            }

            rebuildSubTabs();
@@ -431,10 +568,16 @@ const createPanel = () => {
    // Refresh
    panel.querySelector(".wfm-nlp-refresh").addEventListener("click", async () => {
        if (state.topTab === "workflows") {
+            state.wfLoaded = false;
            await loadWfData();
        } else if (state.topTab === "prompts") {
+            state.promptLoaded = false;
            await loadPromptData();
+        } else if (state.topTab === "models") {
+            state.modelsLoaded = false;
+            await loadModelsData();
        } else {
+            state.loaded = false;
            await loadData();
        }
        renderContent();
@@ -463,7 +606,46 @@ const rebuildSubTabs = () => {
        row2.querySelectorAll(".wfm-nlp-sub-tab").forEach(b => b.classList.remove("active"));
    };

-    if (state.topTab === "prompts") {
+    if (state.topTab === "models") {
+        const row1Tabs = [
+            { key: "model-all", label: "All" },
+            { key: "model-favorites", label: "\u2605 Favorites" },
+            { key: "model-groups", label: "\ud83d\udcc1 Groups" },
+        ];
+        const row2Tabs = [
+            { key: "model-type", label: "\u25a6 By Type" },
+        ];
+
+        const activeKey = state.modelSubTab2 || state.modelSubTab;
+
+        for (const t of row1Tabs) {
+            const btn = document.createElement("button");
+            btn.className = "wfm-nlp-tab wfm-nlp-sub-tab" + (activeKey === t.key ? " active" : "");
+            btn.dataset.subtab = t.key;
+            btn.textContent = t.label;
+            btn.addEventListener("click", () => {
+                state.modelSubTab = t.key;
+                state.modelSubTab2 = null;
+                updateAllActive();
+                btn.classList.add("active");
+                renderContent();
+            });
+            row1.appendChild(btn);
+        }
+        for (const t of row2Tabs) {
+            const btn = document.createElement("button");
+            btn.className = "wfm-nlp-tab wfm-nlp-sub-tab" + (activeKey === t.key ? " active" : "");
+            btn.dataset.subtab = t.key;
+            btn.textContent = t.label;
+            btn.addEventListener("click", () => {
+                state.modelSubTab2 = t.key;
+                updateAllActive();
+                btn.classList.add("active");
+                renderContent();
+            });
+            row2.appendChild(btn);
+        }
+    } else if (state.topTab === "prompts") {
        const row1Tabs = [
            { key: "prompt-all", label: "All" },
            { key: "prompt-favorites", label: "\u2605 Favorites" },
@@ -488,7 +670,7 @@ const rebuildSubTabs = () => {
        // No row2 tabs for prompts
    } else if (state.topTab === "workflows") {
        const row1Tabs = [
-            { key: "wf-all", label: "Workflows" },
+            { key: "wf-all", label: "All" },
            { key: "wf-favorites", label: "\u2605 Favorites" },
            { key: "wf-groups", label: "\ud83d\udcc1 Groups" },
        ];
@@ -527,7 +709,7 @@ const rebuildSubTabs = () => {
        }
    } else {
        const row1Tabs = [
-            { key: "all", label: "Nodes" },
+            { key: "all", label: "All" },
            { key: "favorites", label: "\u2733 Favorites" },
            { key: "groups", label: "\ud83d\udcc1 Groups" },
        ];
@@ -575,7 +757,19 @@ const renderContent = () => {
    const content = panelEl?.querySelector(".wfm-nlp-content");
    if (!content) return;

-    if (state.topTab === "prompts") {
+    if (state.topTab === "models") {
+        if (!state.modelsLoaded) {
+            content.innerHTML = `<div class="wfm-nlp-empty">Loading...</div>`;
+            return;
+        }
+        const modelKey = state.modelSubTab2 || state.modelSubTab;
+        switch (modelKey) {
+            case "model-all": renderModelAll(content); break;
+            case "model-favorites": renderModelFavorites(content); break;
+            case "model-groups": renderModelGroups(content); break;
+            case "model-type": renderModelByType(content); break;
+        }
+    } else if (state.topTab === "prompts") {
        if (!state.promptLoaded) {
            content.innerHTML = `<div class="wfm-nlp-empty">Loading...</div>`;
            return;
@@ -616,26 +810,27 @@ const renderContent = () => {
 // Render – Workflow sub-tabs
 // ============================================

-const getWfModelTypes = (wf) => {
-    return wf.metadata?.modelTypesOverride?.length
-        ? wf.metadata.modelTypesOverride
-        : (wf.analysis?.modelTypes || []);
+const getWfBadges = (wf) => {
+    return wf.metadata?.badges || [];
 };

 const createDraggableWfItem = (wf) => {
    const displayName = wf.filename.replace(/\.json$/i, "");
-    const types = getWfModelTypes(wf);
+    const types = getWfBadges(wf);
    const badge = types.length ? types.join(", ") : "";
    const fmt = wf.analysis?.format || "";
    const fmtBadge = (fmt === "api" || fmt === "app")
        ? `<span class="wfm-nlp-fmt-badge wfm-nlp-fmt-${fmt}">${fmt.toUpperCase()}</span>`
        : "";
+    const starHtml = wf.metadata?.favorite
+        ? `<span class="wfm-nlp-fav-star">\u2605</span>`
+        : "";

    const el = document.createElement("div");
    el.className = "wfm-nlp-item";
    el.draggable = true;
    el.innerHTML = `
-        <div class="wfm-nlp-item-label">${fmtBadge}${esc(displayName)}</div>
+        <div class="wfm-nlp-item-label">${fmtBadge}${starHtml}${esc(displayName)}</div>
        ${badge ? `<div class="wfm-nlp-item-sub">${esc(badge)}</div>` : ""}
    `;

@@ -698,17 +893,16 @@ const renderWfFavorites = (container) => {
 const renderWfModelType = (container) => {
    container.innerHTML = "";

-    if (state.wfModelTypes.length === 0) {
+    if (state.wfBadgeTypes.length === 0) {
        container.innerHTML = `<div class="wfm-nlp-empty">
-            No model types detected.<br><small>Analyze workflows in Workflow Studio</small>
+            No badges found.<br><small>Add badges to workflows in Workflow Studio</small>
        </div>`;
        return;
    }

-    for (const modelType of state.wfModelTypes) {
+    for (const modelType of state.wfBadgeTypes) {
        const wfs = state.wfList.filter(w => {
-            const types = getWfModelTypes(w);
-            return types.includes(modelType);
+            return (w.metadata?.badges || []).includes(modelType);
        }).filter(matchesWfSearch);

        if (state.searchText && wfs.length === 0) continue;
@@ -795,6 +989,284 @@ const renderWfGroups = (container) => {
    }
 };

+// ============================================
+// Render – Models sub-tabs
+// ============================================
+
+const matchesModelSearch = (name) => {
+    if (!state.searchText) return true;
+    const s = state.searchText;
+    if (name.toLowerCase().includes(s)) return true;
+    const meta = state.modelMetadata[name] || {};
+    if ((meta.tags || []).some(t => t.toLowerCase().includes(s))) return true;
+    if ((meta.badges || []).some(b => b.toLowerCase().includes(s))) return true;
+    if ((meta.memo || "").toLowerCase().includes(s)) return true;
+    return false;
+};
+
+const createModelItem = (modelName, modelType) => {
+    const meta = state.modelMetadata[modelName] || {};
+    const isFav = !!meta.favorite;
+    const badges = (meta.badges || []);
+    const tags = (meta.tags || []);
+
+    // Stem (filename without extension)
+    const lastSlash = Math.max(modelName.lastIndexOf("/"), modelName.lastIndexOf("\\"));
+    const filename = lastSlash >= 0 ? modelName.substring(lastSlash + 1) : modelName;
+    const dot = filename.lastIndexOf(".");
+    const stem = dot >= 0 ? filename.substring(0, dot) : filename;
+
+    const badgesHtml = badges.map(b =>
+        `<span class="wfm-nlp-model-badge">${esc(b)}</span>`
+    ).join("");
+    const tagsHtml = tags.length
+        ? `<span class="wfm-nlp-item-sub">${esc(tags.join(", "))}</span>`
+        : "";
+
+    const isEmbedding = modelType === "embedding";
+    const dragTitle = isEmbedding
+        ? `Drag to canvas (copies embedding:${stem})`
+        : `Drag to canvas to place ${MODEL_TYPE_LABELS[modelType] || modelType} node`;
+
+    const el = document.createElement("div");
+    el.className = "wfm-nlp-item wfm-nlp-model-item";
+    el.draggable = true;
+    el.title = `${modelName}\n${dragTitle}`;
+    el.innerHTML = `
+        <div class="wfm-nlp-item-row">
+            <div class="wfm-nlp-item-body">
+                <div class="wfm-nlp-item-label">
+                    ${isFav ? '<span style="color:#ffd700;margin-right:3px;">&#9733;</span>' : ""}${esc(stem)}
+                </div>
+                ${badgesHtml ? `<div class="wfm-nlp-model-badges">${badgesHtml}</div>` : ""}
+                ${tagsHtml}
+            </div>
+            <button class="wfm-nlp-copy-btn wfm-nlp-model-copy" title="Copy model name">C</button>
+        </div>
+    `;
+
+    el.addEventListener("dragstart", (e) => {
+        e.dataTransfer.effectAllowed = "copy";
+        e.dataTransfer.setData("application/x-wfm-model",
+            JSON.stringify({ modelName, modelType }));
+        el.classList.add("dragging");
+    });
+    el.addEventListener("dragend", () => el.classList.remove("dragging"));
+
+    // Double-click: place node immediately at canvas center
+    el.addEventListener("dblclick", () => placeModelNode(modelName, modelType));
+
+    el.querySelector(".wfm-nlp-model-copy").addEventListener("click", (e) => {
+        e.stopPropagation();
+        navigator.clipboard.writeText(stem).then(() => {
+            showToast("Copied: " + stem, "success");
+        });
+    });
+
+    return el;
+};
+
+const renderModelAll = async (container) => {
+    container.innerHTML = `<div class="wfm-nlp-empty">Loading...</div>`;
+
+    // Fetch all model types in parallel
+    const results = await Promise.all(
+        MODEL_TYPES.map(async (type) => {
+            const list = await fetchModelList(type);
+            return { type, list };
+        })
+    );
+
+    // Flatten: [{name, type}]
+    const allModels = [];
+    for (const { type, list } of results) {
+        for (const name of list) {
+            allModels.push({ name, type });
+        }
+    }
+
+    const filtered = allModels.filter(m => matchesModelSearch(m.name));
+
+    if (filtered.length === 0) {
+        container.innerHTML = `<div class="wfm-nlp-empty">${allModels.length === 0 ? "No models found." : "No matches"}</div>`;
+        return;
+    }
+
+    container.innerHTML = "";
+    for (const m of filtered) {
+        const item = createModelItem(m.name, m.type);
+        const typeLabel = MODEL_TYPE_LABELS[m.type] || m.type;
+        const typeBadgeEl = item.querySelector(".wfm-nlp-item-body");
+        if (typeBadgeEl) {
+            const tb = document.createElement("span");
+            tb.className = "wfm-nlp-model-type-badge";
+            tb.textContent = typeLabel;
+            typeBadgeEl.prepend(tb);
+        }
+        container.appendChild(item);
+    }
+};
+
+const renderModelByType = async (container) => {
+    container.innerHTML = `<div class="wfm-nlp-empty">Loading...</div>`;
+
+    const results = await Promise.all(
+        MODEL_TYPES.map(async (type) => {
+            const list = await fetchModelList(type);
+            return { type, list };
+        })
+    );
+
+    container.innerHTML = "";
+    let hasAny = false;
+
+    for (const { type, list } of results) {
+        const filtered = list.filter(name => matchesModelSearch(name));
+        if (state.searchText && filtered.length === 0) continue;
+        if (list.length === 0) continue;
+
+        hasAny = true;
+        const typeLabel = MODEL_TYPE_LABELS[type] || type;
+        const section = document.createElement("div");
+        section.className = "wfm-nlp-group-section";
+
+        const header = document.createElement("div");
+        header.className = "wfm-nlp-group-header collapsed";
+        header.innerHTML = `<span>${esc(typeLabel)}</span> <span class="wfm-nlp-badge">${filtered.length}</span>`;
+        header.addEventListener("click", () => {
+            const listEl = section.querySelector(".wfm-nlp-group-list");
+            listEl.style.display = listEl.style.display === "none" ? "block" : "none";
+            header.classList.toggle("collapsed");
+        });
+        section.appendChild(header);
+
+        const listEl = document.createElement("div");
+        listEl.className = "wfm-nlp-group-list";
+        listEl.style.display = "none";
+        for (const name of filtered) {
+            listEl.appendChild(createModelItem(name, type));
+        }
+        section.appendChild(listEl);
+        container.appendChild(section);
+    }
+
+    if (!hasAny) {
+        container.innerHTML = `<div class="wfm-nlp-empty">No models found.</div>`;
+    }
+};
+
+const renderModelFavorites = async (container) => {
+    container.innerHTML = `<div class="wfm-nlp-empty">Loading...</div>`;
+
+    // Fetch all models and check against metadata favorites
+    const results = await Promise.all(
+        MODEL_TYPES.map(async (type) => {
+            const list = await fetchModelList(type);
+            return { type, list };
+        })
+    );
+
+    const favorites = [];
+    for (const { type, list } of results) {
+        for (const name of list) {
+            if (state.modelMetadata[name]?.favorite) {
+                favorites.push({ name, type });
+            }
+        }
+    }
+
+    const filtered = favorites.filter(m => matchesModelSearch(m.name));
+
+    if (filtered.length === 0) {
+        container.innerHTML = `<div class="wfm-nlp-empty">${favorites.length === 0 ? "No favorites yet." : "No matches"}</div>`;
+        return;
+    }
+
+    container.innerHTML = "";
+    for (const m of filtered) {
+        const item = createModelItem(m.name, m.type);
+        const typeLabel = MODEL_TYPE_LABELS[m.type] || m.type;
+        const typeBadgeEl = item.querySelector(".wfm-nlp-item-body");
+        if (typeBadgeEl) {
+            const tb = document.createElement("span");
+            tb.className = "wfm-nlp-model-type-badge";
+            tb.textContent = typeLabel;
+            typeBadgeEl.prepend(tb);
+        }
+        container.appendChild(item);
+    }
+};
+
+const renderModelGroups = async (container) => {
+    container.innerHTML = `<div class="wfm-nlp-empty">Loading...</div>`;
+
+    const groups = state.modelGroups;
+    const groupNames = Object.keys(groups);
+
+    if (groupNames.length === 0) {
+        container.innerHTML = `<div class="wfm-nlp-empty">No groups found.</div>`;
+        return;
+    }
+
+    // Build name→type lookup by fetching all models once
+    const results = await Promise.all(
+        MODEL_TYPES.map(async (type) => {
+            const list = await fetchModelList(type);
+            return { type, list };
+        })
+    );
+    const typeOf = {};
+    for (const { type, list } of results) {
+        for (const name of list) typeOf[name] = type;
+    }
+
+    container.innerHTML = "";
+    let hasAny = false;
+
+    for (const groupName of groupNames) {
+        const members = (groups[groupName] || []).filter(name => matchesModelSearch(name));
+        if (state.searchText && members.length === 0) continue;
+        if ((groups[groupName] || []).length === 0) continue;
+
+        hasAny = true;
+        const section = document.createElement("div");
+        section.className = "wfm-nlp-group-section";
+
+        const header = document.createElement("div");
+        header.className = "wfm-nlp-group-header collapsed";
+        header.innerHTML = `<span>${esc(groupName)}</span> <span class="wfm-nlp-badge">${members.length}</span>`;
+        header.addEventListener("click", () => {
+            const listEl = section.querySelector(".wfm-nlp-group-list");
+            listEl.style.display = listEl.style.display === "none" ? "block" : "none";
+            header.classList.toggle("collapsed");
+        });
+        section.appendChild(header);
+
+        const listEl = document.createElement("div");
+        listEl.className = "wfm-nlp-group-list";
+        listEl.style.display = "none";
+        for (const name of members) {
+            const type = typeOf[name] || "checkpoint";
+            const item = createModelItem(name, type);
+            const typeLabel = MODEL_TYPE_LABELS[type] || type;
+            const typeBadgeEl = item.querySelector(".wfm-nlp-item-body");
+            if (typeBadgeEl) {
+                const tb = document.createElement("span");
+                tb.className = "wfm-nlp-model-type-badge";
+                tb.textContent = typeLabel;
+                typeBadgeEl.prepend(tb);
+            }
+            listEl.appendChild(item);
+        }
+        section.appendChild(listEl);
+        container.appendChild(section);
+    }
+
+    if (!hasAny) {
+        container.innerHTML = `<div class="wfm-nlp-empty">No matches.</div>`;
+    }
+};
+
 // ============================================
 // Render – Prompt sub-tabs
 // ============================================
@@ -998,7 +1470,11 @@ const renderAllNodes = (container) => {

    container.innerHTML = "";
    for (const name of nodeNames) {
-        const el = createDraggableItem(name, "single", { classType: name });
+        const isFav = state.metadata[name]?.favorite;
+        const label = isFav
+            ? `<span class="wfm-nlp-fav-star">\u2605</span>${esc(name)}`
+            : esc(name);
+        const el = createDraggableItem(label, "single", { classType: name });
        el.addEventListener("dblclick", () => placeSingleNode(name));
        container.appendChild(el);
    }
@@ -1150,6 +1626,8 @@ export const togglePanel = async () => {
            await loadData();
        } else if (state.topTab === "prompts" && !state.promptLoaded) {
            await loadPromptData();
+        } else if (state.topTab === "models" && !state.modelsLoaded) {
+            await loadModelsData();
        }
        renderContent();
    }
@@ -1299,7 +1777,7 @@ const injectStyles = () => {
            position: fixed;
            right: 0;
            top: 0;
-            width: 280px;
+            width: 310px;
            height: 100vh;
            background: var(--comfy-menu-bg, #1e1e1e);
            border-left: 1px solid var(--border-color, #4e4e4e);
@@ -1545,6 +2023,45 @@ const injectStyles = () => {
            color: #ff4757;
            border-color: #ff4757;
        }
+        .wfm-nlp-model-item { cursor: default; }
+        .wfm-nlp-model-item:hover .wfm-nlp-copy-btns { opacity: 1; }
+        .wfm-nlp-model-copy:hover {
+            background: rgba(74,158,255,0.25);
+            color: #4a9eff;
+            border-color: #4a9eff;
+        }
+        .wfm-nlp-fav-star {
+            color: #f5c518;
+            font-size: 11px;
+            margin-right: 3px;
+            vertical-align: middle;
+            line-height: 1;
+        }
+        .wfm-nlp-model-type-badge {
+            display: inline-block;
+            font-size: 9px;
+            font-weight: bold;
+            padding: 1px 5px;
+            border-radius: 3px;
+            background: rgba(74,158,255,0.25);
+            color: #4a9eff;
+            margin-bottom: 2px;
+            vertical-align: middle;
+        }
+        .wfm-nlp-model-badges {
+            display: flex;
+            flex-wrap: wrap;
+            gap: 3px;
+            margin-top: 2px;
+        }
+        .wfm-nlp-model-badge {
+            display: inline-block;
+            font-size: 9px;
+            padding: 1px 5px;
+            border-radius: 10px;
+            background: rgba(255,255,255,0.12);
+            color: var(--descrip-text, #aaa);
+        }
    `;
    document.head.appendChild(style);
 };