@almadar/ui 4.15.4 → 4.15.6

package/dist/context/index.cjs

@@ -3,6 +3,56 @@
 var react = require('react');
 var jsxRuntime = require('react/jsx-runtime');
 
+// lib/logger.ts
+var LEVEL_PRIORITY = { DEBUG: 0, INFO: 1, WARN: 2, ERROR: 3 };
+var ENV = typeof process !== "undefined" && process.env ? process.env : {};
+function envGet(key) {
+  return ENV[key] ?? ENV[`VITE_${key}`];
+}
+var NODE_ENV = envGet("NODE_ENV") ?? "development";
+var CONFIGURED_LEVEL = (envGet("LOG_LEVEL") ?? (NODE_ENV === "production" ? "info" : "debug")).toUpperCase();
+var MIN_PRIORITY = LEVEL_PRIORITY[CONFIGURED_LEVEL] ?? 0;
+var DEBUG_FILTER = (envGet("ALMADAR_DEBUG") ?? "").split(",").map((s) => s.trim()).filter(Boolean);
+function matchesNamespace(namespace) {
+  if (DEBUG_FILTER.length === 0) return true;
+  return DEBUG_FILTER.some((pattern) => {
+    if (pattern === "*" || pattern === "almadar:*") return true;
+    if (pattern.endsWith(":*")) return namespace.startsWith(pattern.slice(0, -1));
+    return namespace === pattern;
+  });
+}
+function createLogger(namespace) {
+  const nsAllowed = matchesNamespace(namespace);
+  const log = (level, message, data, correlationId) => {
+    if (LEVEL_PRIORITY[level] < MIN_PRIORITY) return;
+    if (level === "DEBUG" && !nsAllowed) return;
+    const prefix = `[${namespace}]`;
+    const logData = correlationId ? { ...data, cid: correlationId } : data;
+    switch (level) {
+      case "DEBUG":
+        console.debug(prefix, message, logData ?? "");
+        break;
+      case "INFO":
+        console.info(prefix, message, logData ?? "");
+        break;
+      case "WARN":
+        console.warn(prefix, message, logData ?? "");
+        break;
+      case "ERROR":
+        console.error(prefix, message, logData ?? "");
+        break;
+    }
+  };
+  return {
+    debug: (msg, data, cid) => log("DEBUG", msg, data, cid),
+    info: (msg, data, cid) => log("INFO", msg, data, cid),
+    warn: (msg, data, cid) => log("WARN", msg, data, cid),
+    error: (msg, data, cid) => log("ERROR", msg, data, cid)
+  };
+}
+
+// hooks/useUISlots.ts
+var slotLog = createLogger("almadar:ui:useUISlots");
 var DEFAULT_SOURCE_KEY = "__default__";
 var MULTI_SOURCE_STACK_TRAIT = "__multi_source_stack__";
 var ALL_SLOTS = [
@@ -161,6 +211,13 @@ function useUISlotManager() {
           indexTraitRender(content.sourceTrait, content);
           notifyTraitSubscribers(content.sourceTrait, content);
         }
+        slotLog.info("slot:written", {
+          slot: config.target,
+          sourceKey,
+          sourceTrait: content.sourceTrait,
+          patternType: content.pattern,
+          priority: content.priority
+        });
         notifySubscribers(config.target, aggregateSlot(nextSources));
         return nextAll;
       });
@@ -198,7 +255,10 @@ function useUISlotManager() {
       const sourceKey = sourceTrait;
       setSources((prev) => {
         const slotSources = prev[slot];
-        if (!slotSources || !(sourceKey in slotSources)) return prev;
+        if (!slotSources || !(sourceKey in slotSources)) {
+          slotLog.debug("slot:clear-noop", { slot, sourceTrait, reason: !slotSources ? "no-slot" : "no-source" });
+          return prev;
+        }
         const content = slotSources[sourceKey];
         const timer = timersRef.current.get(content.id);
         if (timer) {
@@ -212,6 +272,7 @@ function useUISlotManager() {
         }
         const nextSources = { ...slotSources };
         delete nextSources[sourceKey];
+        slotLog.info("slot:cleared", { slot, sourceTrait, lastPatternType: content.pattern });
         notifySubscribers(slot, aggregateSlot(nextSources));
         return { ...prev, [slot]: nextSources };
       });

package/dist/context/index.js

@@ -1,6 +1,56 @@
 import { createContext, useMemo, useContext, useState, useEffect, useCallback, useRef } from 'react';
 import { jsx } from 'react/jsx-runtime';
 
+// lib/logger.ts
+var LEVEL_PRIORITY = { DEBUG: 0, INFO: 1, WARN: 2, ERROR: 3 };
+var ENV = typeof process !== "undefined" && process.env ? process.env : {};
+function envGet(key) {
+  return ENV[key] ?? ENV[`VITE_${key}`];
+}
+var NODE_ENV = envGet("NODE_ENV") ?? "development";
+var CONFIGURED_LEVEL = (envGet("LOG_LEVEL") ?? (NODE_ENV === "production" ? "info" : "debug")).toUpperCase();
+var MIN_PRIORITY = LEVEL_PRIORITY[CONFIGURED_LEVEL] ?? 0;
+var DEBUG_FILTER = (envGet("ALMADAR_DEBUG") ?? "").split(",").map((s) => s.trim()).filter(Boolean);
+function matchesNamespace(namespace) {
+  if (DEBUG_FILTER.length === 0) return true;
+  return DEBUG_FILTER.some((pattern) => {
+    if (pattern === "*" || pattern === "almadar:*") return true;
+    if (pattern.endsWith(":*")) return namespace.startsWith(pattern.slice(0, -1));
+    return namespace === pattern;
+  });
+}
+function createLogger(namespace) {
+  const nsAllowed = matchesNamespace(namespace);
+  const log = (level, message, data, correlationId) => {
+    if (LEVEL_PRIORITY[level] < MIN_PRIORITY) return;
+    if (level === "DEBUG" && !nsAllowed) return;
+    const prefix = `[${namespace}]`;
+    const logData = correlationId ? { ...data, cid: correlationId } : data;
+    switch (level) {
+      case "DEBUG":
+        console.debug(prefix, message, logData ?? "");
+        break;
+      case "INFO":
+        console.info(prefix, message, logData ?? "");
+        break;
+      case "WARN":
+        console.warn(prefix, message, logData ?? "");
+        break;
+      case "ERROR":
+        console.error(prefix, message, logData ?? "");
+        break;
+    }
+  };
+  return {
+    debug: (msg, data, cid) => log("DEBUG", msg, data, cid),
+    info: (msg, data, cid) => log("INFO", msg, data, cid),
+    warn: (msg, data, cid) => log("WARN", msg, data, cid),
+    error: (msg, data, cid) => log("ERROR", msg, data, cid)
+  };
+}
+
+// hooks/useUISlots.ts
+var slotLog = createLogger("almadar:ui:useUISlots");
 var DEFAULT_SOURCE_KEY = "__default__";
 var MULTI_SOURCE_STACK_TRAIT = "__multi_source_stack__";
 var ALL_SLOTS = [
@@ -159,6 +209,13 @@ function useUISlotManager() {
           indexTraitRender(content.sourceTrait, content);
           notifyTraitSubscribers(content.sourceTrait, content);
         }
+        slotLog.info("slot:written", {
+          slot: config.target,
+          sourceKey,
+          sourceTrait: content.sourceTrait,
+          patternType: content.pattern,
+          priority: content.priority
+        });
         notifySubscribers(config.target, aggregateSlot(nextSources));
         return nextAll;
       });
@@ -196,7 +253,10 @@ function useUISlotManager() {
       const sourceKey = sourceTrait;
       setSources((prev) => {
         const slotSources = prev[slot];
-        if (!slotSources || !(sourceKey in slotSources)) return prev;
+        if (!slotSources || !(sourceKey in slotSources)) {
+          slotLog.debug("slot:clear-noop", { slot, sourceTrait, reason: !slotSources ? "no-slot" : "no-source" });
+          return prev;
+        }
         const content = slotSources[sourceKey];
         const timer = timersRef.current.get(content.id);
         if (timer) {
@@ -210,6 +270,7 @@ function useUISlotManager() {
         }
         const nextSources = { ...slotSources };
         delete nextSources[sourceKey];
+        slotLog.info("slot:cleared", { slot, sourceTrait, lastPatternType: content.pattern });
         notifySubscribers(slot, aggregateSlot(nextSources));
         return { ...prev, [slot]: nextSources };
       });

package/dist/hooks/index.cjs

@@ -1046,6 +1046,7 @@ function useEmitEvent() {
     [eventBus]
   );
 }
+var slotLog = createLogger("almadar:ui:useUISlots");
 var DEFAULT_SOURCE_KEY = "__default__";
 var MULTI_SOURCE_STACK_TRAIT = "__multi_source_stack__";
 var ALL_SLOTS = [
@@ -1204,6 +1205,13 @@ function useUISlotManager() {
           indexTraitRender(content.sourceTrait, content);
           notifyTraitSubscribers(content.sourceTrait, content);
         }
+        slotLog.info("slot:written", {
+          slot: config.target,
+          sourceKey,
+          sourceTrait: content.sourceTrait,
+          patternType: content.pattern,
+          priority: content.priority
+        });
         notifySubscribers(config.target, aggregateSlot(nextSources));
         return nextAll;
       });
@@ -1241,7 +1249,10 @@ function useUISlotManager() {
       const sourceKey = sourceTrait;
       setSources((prev) => {
         const slotSources = prev[slot];
-        if (!slotSources || !(sourceKey in slotSources)) return prev;
+        if (!slotSources || !(sourceKey in slotSources)) {
+          slotLog.debug("slot:clear-noop", { slot, sourceTrait, reason: !slotSources ? "no-slot" : "no-source" });
+          return prev;
+        }
         const content = slotSources[sourceKey];
         const timer = timersRef.current.get(content.id);
         if (timer) {
@@ -1255,6 +1266,7 @@ function useUISlotManager() {
         }
         const nextSources = { ...slotSources };
         delete nextSources[sourceKey];
+        slotLog.info("slot:cleared", { slot, sourceTrait, lastPatternType: content.pattern });
         notifySubscribers(slot, aggregateSlot(nextSources));
         return { ...prev, [slot]: nextSources };
       });

package/dist/hooks/index.js

@@ -1044,6 +1044,7 @@ function useEmitEvent() {
     [eventBus]
   );
 }
+var slotLog = createLogger("almadar:ui:useUISlots");
 var DEFAULT_SOURCE_KEY = "__default__";
 var MULTI_SOURCE_STACK_TRAIT = "__multi_source_stack__";
 var ALL_SLOTS = [
@@ -1202,6 +1203,13 @@ function useUISlotManager() {
           indexTraitRender(content.sourceTrait, content);
           notifyTraitSubscribers(content.sourceTrait, content);
         }
+        slotLog.info("slot:written", {
+          slot: config.target,
+          sourceKey,
+          sourceTrait: content.sourceTrait,
+          patternType: content.pattern,
+          priority: content.priority
+        });
         notifySubscribers(config.target, aggregateSlot(nextSources));
         return nextAll;
       });
@@ -1239,7 +1247,10 @@ function useUISlotManager() {
       const sourceKey = sourceTrait;
       setSources((prev) => {
         const slotSources = prev[slot];
-        if (!slotSources || !(sourceKey in slotSources)) return prev;
+        if (!slotSources || !(sourceKey in slotSources)) {
+          slotLog.debug("slot:clear-noop", { slot, sourceTrait, reason: !slotSources ? "no-slot" : "no-source" });
+          return prev;
+        }
         const content = slotSources[sourceKey];
         const timer = timersRef.current.get(content.id);
         if (timer) {
@@ -1253,6 +1264,7 @@ function useUISlotManager() {
         }
         const nextSources = { ...slotSources };
         delete nextSources[sourceKey];
+        slotLog.info("slot:cleared", { slot, sourceTrait, lastPatternType: content.pattern });
         notifySubscribers(slot, aggregateSlot(nextSources));
         return { ...prev, [slot]: nextSources };
       });

package/dist/providers/index.cjs

@@ -18749,6 +18749,17 @@ function DataGrid({
     };
     eventBus.emit(`UI:${action.event}`, payload);
   };
+  const hasRenderProp = typeof children === "function";
+  React115.useEffect(() => {
+    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
+      const renderItemRaw = schemaRenderItem;
+      const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
+      dataGridLog.warn("renderItem-unresolved", {
+        rowCount: data.length,
+        renderItemIsFnLambda: isFnLambda
+      });
+    }
+  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const gridTemplateColumns = cols ? void 0 : `repeat(auto-fit, minmax(min(${minCardWidth}px, 100%), 1fr))`;
   const colsClass = cols ? {
     1: "grid-cols-1",
@@ -18767,17 +18778,6 @@ function DataGrid({
   if (data.length === 0) {
     return /* @__PURE__ */ jsxRuntime.jsx(Box, { className: "text-center py-12", children: /* @__PURE__ */ jsxRuntime.jsx(Typography, { variant: "body", color: "secondary", children: t("empty.noItems") || "No items found" }) });
   }
-  const hasRenderProp = typeof children === "function";
-  React115.useEffect(() => {
-    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
-      const renderItemRaw = schemaRenderItem;
-      const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
-      dataGridLog.warn("renderItem-unresolved", {
-        rowCount: data.length,
-        renderItemIsFnLambda: isFnLambda
-      });
-    }
-  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const allIds = data.map((item, i) => item.id || String(i));
   const allSelected = allIds.length > 0 && allIds.every((id) => selectedIds.has(id));
   const someSelected = selectedIds.size > 0;
@@ -19677,7 +19677,7 @@ var init_FilterGroup = __esm({
           eventBus.emit("UI:FILTER", {
             entity,
             field,
-            value: value === "all" ? null : value,
+            value: value === "all" || value === null ? "" : value,
             query
           });
         },
@@ -20489,7 +20489,7 @@ var init_SearchInput = __esm({
         /* @__PURE__ */ jsxRuntime.jsx(
           Input,
           {
-            type: "search",
+            type: "text",
             value: searchValue,
             onChange: handleChange,
             placeholder: resolvedPlaceholder,

package/dist/providers/index.js

@@ -18704,6 +18704,17 @@ function DataGrid({
     };
     eventBus.emit(`UI:${action.event}`, payload);
   };
+  const hasRenderProp = typeof children === "function";
+  useEffect(() => {
+    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
+      const renderItemRaw = schemaRenderItem;
+      const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
+      dataGridLog.warn("renderItem-unresolved", {
+        rowCount: data.length,
+        renderItemIsFnLambda: isFnLambda
+      });
+    }
+  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const gridTemplateColumns = cols ? void 0 : `repeat(auto-fit, minmax(min(${minCardWidth}px, 100%), 1fr))`;
   const colsClass = cols ? {
     1: "grid-cols-1",
@@ -18722,17 +18733,6 @@ function DataGrid({
   if (data.length === 0) {
     return /* @__PURE__ */ jsx(Box, { className: "text-center py-12", children: /* @__PURE__ */ jsx(Typography, { variant: "body", color: "secondary", children: t("empty.noItems") || "No items found" }) });
   }
-  const hasRenderProp = typeof children === "function";
-  useEffect(() => {
-    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
-      const renderItemRaw = schemaRenderItem;
-      const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
-      dataGridLog.warn("renderItem-unresolved", {
-        rowCount: data.length,
-        renderItemIsFnLambda: isFnLambda
-      });
-    }
-  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const allIds = data.map((item, i) => item.id || String(i));
   const allSelected = allIds.length > 0 && allIds.every((id) => selectedIds.has(id));
   const someSelected = selectedIds.size > 0;
@@ -19632,7 +19632,7 @@ var init_FilterGroup = __esm({
           eventBus.emit("UI:FILTER", {
             entity,
             field,
-            value: value === "all" ? null : value,
+            value: value === "all" || value === null ? "" : value,
             query
           });
         },
@@ -20444,7 +20444,7 @@ var init_SearchInput = __esm({
         /* @__PURE__ */ jsx(
           Input,
           {
-            type: "search",
+            type: "text",
             value: searchValue,
             onChange: handleChange,
             placeholder: resolvedPlaceholder,

package/dist/runtime/index.cjs

@@ -2086,11 +2086,11 @@ function refId(obj) {
   refIds.set(obj, id);
   return id;
 }
-var slotLog, refIds, nextRefId;
+var slotLog2, refIds, nextRefId;
 var init_slot_types = __esm({
   "runtime/ui/slot-types.ts"() {
     init_logger();
-    slotLog = createLogger("almadar:ui:slot-render");
+    slotLog2 = createLogger("almadar:ui:slot-render");
     refIds = /* @__PURE__ */ new WeakMap();
     nextRefId = 1;
   }
@@ -18525,6 +18525,17 @@ function DataGrid({
     };
     eventBus.emit(`UI:${action.event}`, payload);
   };
+  const hasRenderProp = typeof children === "function";
+  React113.useEffect(() => {
+    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
+      const renderItemRaw = schemaRenderItem;
+      const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
+      dataGridLog.warn("renderItem-unresolved", {
+        rowCount: data.length,
+        renderItemIsFnLambda: isFnLambda
+      });
+    }
+  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const gridTemplateColumns = cols ? void 0 : `repeat(auto-fit, minmax(min(${minCardWidth}px, 100%), 1fr))`;
   const colsClass = cols ? {
     1: "grid-cols-1",
@@ -18543,17 +18554,6 @@ function DataGrid({
   if (data.length === 0) {
     return /* @__PURE__ */ jsxRuntime.jsx(Box, { className: "text-center py-12", children: /* @__PURE__ */ jsxRuntime.jsx(Typography, { variant: "body", color: "secondary", children: t("empty.noItems") || "No items found" }) });
   }
-  const hasRenderProp = typeof children === "function";
-  React113.useEffect(() => {
-    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
-      const renderItemRaw = schemaRenderItem;
-      const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
-      dataGridLog.warn("renderItem-unresolved", {
-        rowCount: data.length,
-        renderItemIsFnLambda: isFnLambda
-      });
-    }
-  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const allIds = data.map((item, i) => item.id || String(i));
   const allSelected = allIds.length > 0 && allIds.every((id) => selectedIds.has(id));
   const someSelected = selectedIds.size > 0;
@@ -19389,7 +19389,7 @@ var init_FilterGroup = __esm({
           eventBus.emit("UI:FILTER", {
             entity,
             field,
-            value: value === "all" ? null : value,
+            value: value === "all" || value === null ? "" : value,
             query
           });
         },
@@ -20201,7 +20201,7 @@ var init_SearchInput = __esm({
         /* @__PURE__ */ jsxRuntime.jsx(
           Input,
           {
-            type: "search",
+            type: "text",
             value: searchValue,
             onChange: handleChange,
             placeholder: resolvedPlaceholder,
@@ -37880,7 +37880,7 @@ function SlotContentRenderer({
 }) {
   const entityProp = content.props.entity;
   if (content.pattern === "form-section") {
-    slotLog.debug("SlotContentRenderer:form-section-render", {
+    slotLog2.debug("SlotContentRenderer:form-section-render", {
       contentId: content.id,
       sourceTrait: content.sourceTrait,
       entityRefId: refId(entityProp),
@@ -38091,6 +38091,10 @@ var init_UISlotRenderer = __esm({
 
 // hooks/index.ts
 init_useEventBus();
+
+// hooks/useUISlots.ts
+init_logger();
+createLogger("almadar:ui:useUISlots");
 var ALL_SLOTS = [
   "main",
   "sidebar",
@@ -38293,6 +38297,7 @@ init_traitRegistry();
 init_verificationRegistry();
 var crossTraitLog = createLogger("almadar:ui:cross-trait");
 var flushLog = createLogger("almadar:ui:slot-flush");
+var stateLog = createLogger("almadar:ui:state-transitions");
 function toTraitDefinition(binding) {
   return {
     name: binding.trait.name,
@@ -38725,21 +38730,29 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
         const executor = new runtime.EffectExecutor({ handlers: trackingHandlers, bindings: bindingCtx, context: effectContext });
         try {
           await executor.executeAll(result.effects);
-          console.log(
-            "[TraitStateMachine] After executeAll, pendingSlots:",
-            Object.fromEntries(pendingSlots.entries())
-          );
+          stateLog.info("transition:render-ui-dispatched", {
+            traitName,
+            fromState: result.previousState,
+            toState: result.newState,
+            event: eventKey,
+            slotsTouched: Array.from(pendingSlots.keys()).join(","),
+            patternTypes: Array.from(pendingSlots.entries()).map(
+              ([slot, patterns]) => `${slot}:[${patterns.map((p2) => p2.pattern?.type ?? "null").join(",")}]`
+            ).join(";")
+          });
           void slotSource;
           for (const [slot, patterns] of pendingSlots) {
             flushSlot(traitName, slot, patterns);
           }
         } catch (error) {
-          console.error(
-            "[TraitStateMachine] Effect execution error:",
-            error,
-            "| effects:",
-            JSON.stringify(result.effects)
-          );
+          stateLog.error("transition:effect-error", {
+            traitName,
+            fromState: result.previousState,
+            toState: result.newState,
+            event: eventKey,
+            error: error instanceof Error ? error.message : String(error),
+            effectCount: result.effects.length
+          });
         }
       } else if (!result.executed) {
         if (result.guardResult === false) {
@@ -38885,13 +38898,20 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
         if (eventKey === "INIT" || eventKey === "LOAD" || eventKey === "$MOUNT") {
           continue;
         }
-        const unsub = eventBus.on(`UI:${orbitalName}.${traitName}.${eventKey}`, (event) => {
+        const selfBusKey = `UI:${orbitalName}.${traitName}.${eventKey}`;
+        crossTraitLog.debug("self:subscribe", { traitName, busKey: selfBusKey, eventKey });
+        const unsub = eventBus.on(selfBusKey, (event) => {
           if (event.source && event.source.fromBridge) {
+            crossTraitLog.debug("self:fire-skipped-bridge-echo", { traitName, busKey: selfBusKey, eventKey });
             return;
           }
+          crossTraitLog.info("self:fire", { traitName, busKey: selfBusKey, eventKey });
           enqueueAndDrain(eventKey, event.payload);
         });
-        unsubscribes.push(unsub);
+        unsubscribes.push(() => {
+          crossTraitLog.debug("self:unsubscribe", { traitName, busKey: selfBusKey, eventKey });
+          unsub();
+        });
       }
     }
     for (const binding of traitBindings) {
@@ -38909,18 +38929,23 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
         const sourceOrbital = listen.source?.orbital ?? ownOrbital;
         if (!sourceOrbital) continue;
         const busKey = `UI:${sourceOrbital}.${sourceTrait}.${listen.event}`;
-        crossTraitLog.debug("listen:subscribed", { busKey, targetTrait: binding.trait.name, triggers: listen.triggers });
+        crossTraitLog.debug("listen:subscribed", { busKey, targetTrait: binding.trait.name, sourceOrbital, sourceTrait, listenEvent: listen.event, triggers: listen.triggers });
         const unsub = eventBus.on(busKey, (event) => {
           crossTraitLog.info("listen:fired", { busKey, targetTrait: binding.trait.name, triggers: listen.triggers });
           enqueueAndDrain(listen.triggers, event.payload);
         });
-        unsubscribes.push(unsub);
+        unsubscribes.push(() => {
+          crossTraitLog.debug("listen:unsubscribe", { busKey, targetTrait: binding.trait.name, triggers: listen.triggers });
+          unsub();
+        });
       }
     }
     return () => {
+      crossTraitLog.debug("cleanup:start", { unsubscribeCount: unsubscribes.length });
       for (const unsub of unsubscribes) {
         unsub();
       }
+      crossTraitLog.debug("cleanup:done", {});
     };
   }, [traitBindings, eventBus, enqueueAndDrain]);
   return {