fix: remove prompt_id from CacheContext, type-safe canonicalization

Remove prompt_id from CacheContext — it's not relevant for cache
matching and added unnecessary plumbing (_current_prompt_id on every
cache). Lifecycle hooks still receive prompt_id directly.

Include type name in canonicalized primitives so that int 7 and
str "7" produce distinct hashes. Also canonicalize dict keys properly
instead of str() coercion.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

comfy_execution/cache_provider.py

@@ -73,9 +73,12 @@ def _canonicalize(obj: Any) -> Any:
     elif isinstance(obj, list):
         return [_canonicalize(item) for item in obj]
     elif isinstance(obj, dict):
-        return {str(k): _canonicalize(v) for k, v in sorted(obj.items())}
+        return {"__dict__": sorted(
+            [[_canonicalize(k), _canonicalize(v)] for k, v in obj.items()],
+            key=lambda x: json.dumps(x, sort_keys=True)
+        )}
     elif isinstance(obj, (int, float, str, bool, type(None))):
-        return obj
+        return (type(obj).__name__, obj)
     elif isinstance(obj, bytes):
         return ("__bytes__", obj.hex())
     else:

comfy_execution/caching.py

@@ -156,8 +156,6 @@ class BasicCache:
         self.cache = {}
         self.subcaches = {}
 
-        self._current_prompt_id = ''
-
     async def set_prompt(self, dynprompt, node_ids, is_changed_cache):
         self.dynprompt = dynprompt
         self.cache_key_set = self.key_class(dynprompt, node_ids, is_changed_cache)
@@ -319,7 +317,6 @@ class BasicCache:
             if cache_key_hash is None:
                 return None
             return CacheContext(
-                prompt_id=self._current_prompt_id,
                 node_id=node_id,
                 class_type=self._get_class_type(node_id),
                 cache_key_hash=cache_key_hash,
@@ -333,7 +330,6 @@ class BasicCache:
         subcache = self.subcaches.get(subcache_key, None)
         if subcache is None:
             subcache = BasicCache(self.key_class)
-            subcache._current_prompt_id = self._current_prompt_id
             self.subcaches[subcache_key] = subcache
         await subcache.set_prompt(self.dynprompt, children_ids, self.is_changed_cache)
         return subcache