@workflow/web-shared 4.1.0 → 4.1.2

package/src/lib/hydration.ts

@@ -14,6 +14,7 @@ import {
   observabilityRevivers,
   type Revivers,
 } from '@workflow/core/serialization-format';
+import { EVENT_DATA_REF_FIELDS } from '@workflow/world';
 
 // Re-export types and utilities that consumers need
 export {
@@ -274,9 +275,14 @@ function replaceEncryptedAndExpiredWithMarkers<T>(resource: T): T {
   }
 
   if (result.eventData && typeof result.eventData === 'object') {
+    const eventType =
+      typeof result.eventType === 'string' ? result.eventType : '';
+    const refKeys = EVENT_DATA_REF_FIELDS[eventType] ?? [];
     const ed = { ...(result.eventData as Record<string, unknown>) };
-    for (const key of EVENT_DATA_SERIALIZED_FIELDS) {
-      ed[key] = toDisplayMarker(ed[key]);
+    for (const key of refKeys) {
+      if (key in ed) {
+        ed[key] = toDisplayMarker(ed[key]);
+      }
     }
     result.eventData = ed;
   }
@@ -284,15 +290,6 @@ function replaceEncryptedAndExpiredWithMarkers<T>(resource: T): T {
   return result as T;
 }
 
-/** Known serialized subfields within eventData, matching hydrateEventData in core */
-const EVENT_DATA_SERIALIZED_FIELDS = [
-  'result',
-  'input',
-  'output',
-  'metadata',
-  'payload',
-];
-
 /**
  * Hydrate resource data with decryption support.
  *
@@ -300,7 +297,7 @@ const EVENT_DATA_SERIALIZED_FIELDS = [
  * This is the async version used when the user clicks "Decrypt" in the web UI.
  *
  * Handles both top-level fields (input, output, metadata) and nested
- * eventData subfields (result, input, output, metadata, payload).
+ * eventData subfields per `EVENT_DATA_REF_FIELDS` from `@workflow/world` for that event type.
  */
 export async function hydrateResourceIOWithKey<T>(
   resource: T,
@@ -344,8 +341,11 @@ export async function hydrateResourceIOWithKey<T>(
 
   // Decrypt + hydrate eventData subfields (events)
   if (result.eventData && typeof result.eventData === 'object') {
+    const eventType =
+      typeof result.eventType === 'string' ? result.eventType : '';
+    const refKeys = EVENT_DATA_REF_FIELDS[eventType] ?? [];
     const eventData = { ...(result.eventData as Record<string, unknown>) };
-    for (const field of EVENT_DATA_SERIALIZED_FIELDS) {
+    for (const field of refKeys) {
       if (field in eventData) {
         eventData[field] = await decryptField(
           eventData[field],
@@ -359,3 +359,29 @@ export async function hydrateResourceIOWithKey<T>(
 
   return result as T;
 }
+
+/**
+ * Check whether a hydrated resource (event, step, run, etc.) contains any
+ * encrypted display markers. Inspects the standard top-level fields
+ * (`input`, `output`, `error`, `metadata`) as well as the event-type-specific
+ * `eventData` ref fields.
+ */
+export function hasEncryptedFields(resource: unknown): boolean {
+  if (!resource || typeof resource !== 'object') return false;
+  const r = resource as Record<string, unknown>;
+
+  for (const key of ['input', 'output', 'metadata', 'error']) {
+    if (isEncryptedMarker(r[key])) return true;
+  }
+
+  if (r.eventData && typeof r.eventData === 'object') {
+    const eventType = typeof r.eventType === 'string' ? r.eventType : '';
+    const refKeys = EVENT_DATA_REF_FIELDS[eventType] ?? [];
+    const ed = r.eventData as Record<string, unknown>;
+    for (const key of refKeys) {
+      if (key in ed && isEncryptedMarker(ed[key])) return true;
+    }
+  }
+
+  return false;
+}