Merge 032332368a into e4c370a7d9

- Use --ff-only flag to detect non-fast-forward situations
- Create backup branch before resetting divergent local branch
- Reset to remote branch when fast-forward is not possible
- Use time.strftime() instead of datetime for better compatibility
- Bump version to 3.38.2

custom-node-list.json

@@ -38812,6 +38812,18 @@
             "install_type": "unzip",
             "description": "Various image processing nodes."
         },
+		{
+            "author": "MajoorWaldi",
+            "title": "Majoor Assets Manager",
+			"id": "ComfyUI-Majoor-AssetsManager",
+            "reference": "https://github.com/MajoorWaldi/ComfyUI-Majoor-AssetsManager",
+            "files": [
+				"https://github.com/MajoorWaldi/ComfyUI-Majoor-AssetsManager"
+			],
+            "install_type": "git-clone",
+            "description": "An advanced Assets manager for ComfyUI outputs with gallery, metadata inspection, ratings, and tags.",
+            "tags": ["Assets manager", "gallery", "metadata", "workflow", "utility"]
+		},
         {
             "author": "aimingfail",
             "title": "Image2Halftone Node for ComfyUI",

extension-node-map.json

@@ -238,7 +238,8 @@
     ],
     "https://github.com/1038lab/ComfyUI-VoxCPMTTS": [
         [
-            "AILab_VoxCPMTTS"
+            "AILab_VoxCPMTTS",
+            "AILab_VoxCPMTTS_Advanced"
         ],
         {
             "title_aux": "ComfyUI-VoxCPMTTS"
@@ -16319,6 +16320,7 @@
             "BboxSplit",
             "Cascade",
             "ImageFilters",
+            "LMS_VisionController",
             "Luts",
             "LutsAdvanced",
             "RemoveAreaByMask",
@@ -16696,6 +16698,9 @@
     "https://github.com/ShootTheSound/comfyUI-Realtime-Lora": [
         [
             "ApplyTrainedLora",
+            "MusubiQwenImageEditLoraTrainer",
+            "MusubiQwenImageLoraTrainer",
+            "MusubiWanLoraTrainer",
             "MusubiZImageLoraTrainer",
             "RealtimeLoraTrainer",
             "SD15LoraTrainer",
@@ -22625,13 +22630,21 @@
             "HSVAdjuster",
             "HeightAmplifier",
             "HeightCombiner",
+            "HeightToNormal",
             "ImageBitDepthChecker",
             "ImageEnhancement",
             "LevelsAdjustment",
             "LotusHeightProcessor",
+            "LotusNormalProcessor",
             "MicroDetailOverlay",
             "MultiTextureBlender",
+            "NormalConverter",
+            "NormalFormatAuto",
+            "NormalFormatBruteForce",
+            "NormalFormatValidator",
+            "NormalIntensity",
             "NormalMapCombiner",
+            "NormalToDepth",
             "PBRAdjuster",
             "PBRBatchToPipe",
             "PBRCombiner",
@@ -22651,6 +22664,8 @@
             "SSSMapGenerator",
             "ScratchesGenerator",
             "SeamlessTiling",
+            "SharpenDepth",
+            "SharpenNormal",
             "SimpleRecolor",
             "SmartBlur",
             "SmartTextureResizer",
@@ -50270,6 +50285,7 @@
             "vsLinx_BooleanOrOperator",
             "vsLinx_BypassOnBool",
             "vsLinx_FitImageIntoBBoxMask",
+            "vsLinx_ImpactMultilineWildcardText",
             "vsLinx_LoadSelectedImagesBatch",
             "vsLinx_LoadSelectedImagesList",
             "vsLinx_MuteOnBool"

git_helper.py

@@ -2,6 +2,7 @@ import subprocess
 import sys
 import os
 import traceback
+import time
 
 import git
 import json
@@ -219,7 +220,14 @@ def gitpull(path):
             repo.close()
             return
 
-        remote.pull()
+        try:
+            repo.git.pull('--ff-only')
+        except git.GitCommandError:
+            backup_name = f'backup_{time.strftime("%Y%m%d_%H%M%S")}'
+            repo.create_head(backup_name)
+            print(f"[ComfyUI-Manager] Cannot fast-forward. Backup created: {backup_name}")
+            repo.git.reset('--hard', f'{remote_name}/{branch_name}')
+            print(f"[ComfyUI-Manager] Reset to {remote_name}/{branch_name}")
 
         repo.git.submodule('update', '--init', '--recursive')
         new_commit_hash = repo.head.commit.hexsha

glob/manager_core.py

@@ -44,7 +44,7 @@ import manager_migration
 from node_package import InstalledNodePackage
 
 
-version_code = [3, 38, 1]
+version_code = [3, 38, 2]
 version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
 
 
@@ -2253,9 +2253,17 @@ def git_pull(path):
 
         current_branch = repo.active_branch
         remote_name = current_branch.tracking_branch().remote_name
-        remote = repo.remote(name=remote_name)
 
-        remote.pull()
+        try:
+            repo.git.pull('--ff-only')
+        except git.GitCommandError:
+            branch_name = current_branch.name
+            backup_name = f'backup_{time.strftime("%Y%m%d_%H%M%S")}'
+            repo.create_head(backup_name)
+            logging.info(f"[ComfyUI-Manager] Cannot fast-forward. Backup created: {backup_name}")
+            repo.git.reset('--hard', f'{remote_name}/{branch_name}')
+            logging.info(f"[ComfyUI-Manager] Reset to {remote_name}/{branch_name}")
+
         repo.git.submodule('update', '--init', '--recursive')
 
         repo.close()

json-checker.py

@@ -82,7 +82,7 @@ def validate_required_fields(entry: Dict, entry_index: int, required_fields: Lis
         elif isinstance(entry[field], str) and not entry[field].strip():
             errors.append(f"Field '{field}' is empty")
         elif field == 'files' and not entry[field]:  # Empty array
-            errors.append(f"Field 'files' is empty array")
+            errors.append("Field 'files' is empty array")
 
     return errors
 

node_db/dev/extension-node-map.json

@@ -9000,6 +9000,9 @@
             "AudioResampler",
             "CollectKeyedVideosNode",
             "CollectVideosNode",
+            "ConformAudio",
+            "ConformVideo",
+            "ExtendVideoNearestFrame",
             "ImageDelay",
             "IntToString",
             "KlingVideoHandler",
@@ -9010,7 +9013,6 @@
             "StringSplitSelect",
             "Unbroken-Video-Handler",
             "VideoHandler",
-            "VideoSanitizer",
             "WorkflowLoggerNode"
         ],
         {

node_db/new/extension-node-map.json

@@ -238,7 +238,8 @@
     ],
     "https://github.com/1038lab/ComfyUI-VoxCPMTTS": [
         [
-            "AILab_VoxCPMTTS"
+            "AILab_VoxCPMTTS",
+            "AILab_VoxCPMTTS_Advanced"
         ],
         {
             "title_aux": "ComfyUI-VoxCPMTTS"
@@ -16319,6 +16320,7 @@
             "BboxSplit",
             "Cascade",
             "ImageFilters",
+            "LMS_VisionController",
             "Luts",
             "LutsAdvanced",
             "RemoveAreaByMask",
@@ -16696,6 +16698,9 @@
     "https://github.com/ShootTheSound/comfyUI-Realtime-Lora": [
         [
             "ApplyTrainedLora",
+            "MusubiQwenImageEditLoraTrainer",
+            "MusubiQwenImageLoraTrainer",
+            "MusubiWanLoraTrainer",
             "MusubiZImageLoraTrainer",
             "RealtimeLoraTrainer",
             "SD15LoraTrainer",
@@ -22625,13 +22630,21 @@
             "HSVAdjuster",
             "HeightAmplifier",
             "HeightCombiner",
+            "HeightToNormal",
             "ImageBitDepthChecker",
             "ImageEnhancement",
             "LevelsAdjustment",
             "LotusHeightProcessor",
+            "LotusNormalProcessor",
             "MicroDetailOverlay",
             "MultiTextureBlender",
+            "NormalConverter",
+            "NormalFormatAuto",
+            "NormalFormatBruteForce",
+            "NormalFormatValidator",
+            "NormalIntensity",
             "NormalMapCombiner",
+            "NormalToDepth",
             "PBRAdjuster",
             "PBRBatchToPipe",
             "PBRCombiner",
@@ -22651,6 +22664,8 @@
             "SSSMapGenerator",
             "ScratchesGenerator",
             "SeamlessTiling",
+            "SharpenDepth",
+            "SharpenNormal",
             "SimpleRecolor",
             "SmartBlur",
             "SmartTextureResizer",
@@ -50270,6 +50285,7 @@
             "vsLinx_BooleanOrOperator",
             "vsLinx_BypassOnBool",
             "vsLinx_FitImageIntoBBoxMask",
+            "vsLinx_ImpactMultilineWildcardText",
             "vsLinx_LoadSelectedImagesBatch",
             "vsLinx_LoadSelectedImagesList",
             "vsLinx_MuteOnBool"

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "comfyui-manager"
 description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
-version = "3.38.1"
+version = "3.38.2"
 license = { file = "LICENSE.txt" }
 dependencies = ["GitPython", "PyGithub", "matrix-nio", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions", "toml", "uv", "chardet"]
 

scanner.py

@@ -377,7 +377,7 @@ def extract_nodes_from_repo(repo_path: Path, verbose: bool = False, force_rescan
                 # Extract metadata from this file
                 metadata = extract_metadata_only(str(py_file))
                 all_metadata.update(metadata)
-        except Exception as e:
+        except Exception:
             # Silently skip files that can't be read
             continue