@oxyhq/services 26.0.0 → 26.0.1

package/src/ui/hooks/queries/userCache.ts

@@ -39,10 +39,10 @@
  * It is a cache write only — zero network, one `setQueryData` per key.
  */
 
-import type { UserNameResponse } from "@oxyhq/contracts";
-import type { QueryClient } from "@tanstack/react-query";
-import { useAuthStore } from "../../stores/authStore";
-import { queryKeys } from "./queryKeys";
+import type { QueryClient } from '@tanstack/react-query';
+import type { UserNameResponse } from '@oxyhq/contracts';
+import { queryKeys } from './queryKeys';
+import { useAuthStore } from '../../stores/authStore';
 
 /**
  * A user-shaped object that can be upserted into the cache. Intentionally
@@ -53,30 +53,30 @@ import { queryKeys } from "./queryKeys";
  * pass through untouched (so the upsert never has to know the full DTO shape).
  */
 export interface CacheableUser {
-	id?: string;
-	/** Some sources (post/notification actors) carry the id as Mongo `_id`. */
-	_id?: string;
-	username?: string;
-	/**
-	 * Canonical structured name (`UserNameResponse`) OR a plain display string on
-	 * the looser actor objects. Normalized to the object shape on write.
-	 */
-	name?: string | UserNameResponse;
-	/** Avatar file id. `null`/`''` are treated as "no avatar" (never degrade). */
-	avatar?: string | null;
-	/** Social counts. A partial `_count` never replaces a fuller one. */
-	_count?: { followers?: number; following?: number } | null;
-	/**
-	 * Viewer-relative follow relationship. Present ONLY on an authenticated
-	 * single-profile fetch; `null`/absent for anon/self/bulk/feed. Never stripped
-	 * from an existing entry by a source that lacks it.
-	 */
-	relationship?: { isFollowing?: boolean; followsYou?: boolean } | null;
-	[key: string]: unknown;
+  id?: string;
+  /** Some sources (post/notification actors) carry the id as Mongo `_id`. */
+  _id?: string;
+  username?: string;
+  /**
+   * Canonical structured name (`UserNameResponse`) OR a plain display string on
+   * the looser actor objects. Normalized to the object shape on write.
+   */
+  name?: string | UserNameResponse;
+  /** Avatar file id. `null`/`''` are treated as "no avatar" (never degrade). */
+  avatar?: string | null;
+  /** Social counts. A partial `_count` never replaces a fuller one. */
+  _count?: { followers?: number; following?: number } | null;
+  /**
+   * Viewer-relative follow relationship. Present ONLY on an authenticated
+   * single-profile fetch; `null`/absent for anon/self/bulk/feed. Never stripped
+   * from an existing entry by a source that lacks it.
+   */
+  relationship?: { isFollowing?: boolean; followsYou?: boolean } | null;
+  [key: string]: unknown;
 }
 
 /** The degraded display-name sentinel (ghost-author rule). */
-const DEGRADED_DISPLAY_NAME = "Unknown user";
+const DEGRADED_DISPLAY_NAME = 'Unknown user';
 
 /** A cache entry always carries a resolved string `id`. */
 type CachedUser = CacheableUser & { id: string; name?: UserNameResponse };
@@ -88,34 +88,28 @@ type CachedUser = CacheableUser & { id: string; name?: UserNameResponse };
  * meaningful (a real `verified: false` or `_count.followers: 0`).
  */
 function isMeaningful(value: unknown): boolean {
-	if (value === undefined || value === null) return false;
-	if (typeof value === "string") return value.trim() !== "";
-	return true;
+  if (value === undefined || value === null) return false;
+  if (typeof value === 'string') return value.trim() !== '';
+  return true;
 }
 
 /** A display name is meaningful only when non-empty AND not the degraded sentinel. */
 function isMeaningfulDisplayName(value: unknown): value is string {
-	return (
-		typeof value === "string" &&
-		value.trim() !== "" &&
-		value !== DEGRADED_DISPLAY_NAME
-	);
+  return typeof value === 'string' && value.trim() !== '' && value !== DEGRADED_DISPLAY_NAME;
 }
 
 function isPlainObject(value: unknown): value is Record<string, unknown> {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
 
 /** Normalize the polymorphic `name` (string | object | nullish) to the canonical object shape. */
-function normalizeName(
-	name: CacheableUser["name"],
-): UserNameResponse | undefined {
-	if (name === undefined || name === null) return undefined;
-	if (typeof name === "string") {
-		const trimmed = name.trim();
-		return trimmed ? { displayName: trimmed } : undefined;
-	}
-	return name;
+function normalizeName(name: CacheableUser['name']): UserNameResponse | undefined {
+  if (name === undefined || name === null) return undefined;
+  if (typeof name === 'string') {
+    const trimmed = name.trim();
+    return trimmed ? { displayName: trimmed } : undefined;
+  }
+  return name;
 }
 
 /**
@@ -125,12 +119,12 @@ function normalizeName(
  * object so the cache never holds a bare-string name).
  */
 function toCachedUser(user: CacheableUser, fallbackId: string): CachedUser {
-	const { name: rawName, ...rest } = user;
-	const id = String(user.id ?? user._id ?? fallbackId);
-	const name = normalizeName(rawName);
-	const normalized: CachedUser = { ...rest, id };
-	if (name !== undefined) normalized.name = name;
-	return normalized;
+  const { name: rawName, ...rest } = user;
+  const id = String(user.id ?? user._id ?? fallbackId);
+  const name = normalizeName(rawName);
+  const normalized: CachedUser = { ...rest, id };
+  if (name !== undefined) normalized.name = name;
+  return normalized;
 }
 
 /**
@@ -138,43 +132,39 @@ function toCachedUser(user: CacheableUser, fallbackId: string): CachedUser {
  * when no id can be resolved (nothing to key on).
  */
 function normalizeIncoming(user: CacheableUser): CachedUser | null {
-	const cached = toCachedUser(user, "");
-	return cached.id ? cached : null;
+  const cached = toCachedUser(user, '');
+  return cached.id ? cached : null;
 }
 
 /** Merge two `name` objects field-by-field, with anti-degradation on `displayName`. */
 function mergeName(
-	existing: UserNameResponse | undefined,
-	incoming: UserNameResponse | undefined,
+  existing: UserNameResponse | undefined,
+  incoming: UserNameResponse | undefined,
 ): UserNameResponse | undefined {
-	if (incoming === undefined) return existing;
-	if (existing === undefined) return incoming;
-	const merged: UserNameResponse = { ...existing };
-	for (const [key, value] of Object.entries(incoming)) {
-		if (key === "displayName") continue;
-		if (isMeaningful(value)) merged[key] = value;
-	}
-	// Never let an empty / `'Unknown user'` displayName overwrite a real one.
-	if (isMeaningfulDisplayName(incoming.displayName)) {
-		merged.displayName = incoming.displayName;
-	}
-	return merged;
+  if (incoming === undefined) return existing;
+  if (existing === undefined) return incoming;
+  const merged: UserNameResponse = { ...existing };
+  for (const [key, value] of Object.entries(incoming)) {
+    if (key === 'displayName') continue;
+    if (isMeaningful(value)) merged[key] = value;
+  }
+  // Never let an empty / `'Unknown user'` displayName overwrite a real one.
+  if (isMeaningfulDisplayName(incoming.displayName)) {
+    merged.displayName = incoming.displayName;
+  }
+  return merged;
 }
 
 /** Merge `_count` field-by-field so a partial count never replaces a fuller one. */
 function mergeCount(
-	existing: CacheableUser["_count"],
-	incoming: CacheableUser["_count"],
-): CacheableUser["_count"] {
-	if (!isPlainObject(incoming)) return existing;
-	const merged: { followers?: number; following?: number } = {
-		...(isPlainObject(existing) ? existing : {}),
-	};
-	if (typeof incoming.followers === "number")
-		merged.followers = incoming.followers;
-	if (typeof incoming.following === "number")
-		merged.following = incoming.following;
-	return merged;
+  existing: CacheableUser['_count'],
+  incoming: CacheableUser['_count'],
+): CacheableUser['_count'] {
+  if (!isPlainObject(incoming)) return existing;
+  const merged: { followers?: number; following?: number } = { ...(isPlainObject(existing) ? existing : {}) };
+  if (typeof incoming.followers === 'number') merged.followers = incoming.followers;
+  if (typeof incoming.following === 'number') merged.following = incoming.following;
+  return merged;
 }
 
 /**
@@ -182,18 +172,16 @@ function mergeCount(
  * or an anon/self/bulk `null`) must NEVER strip an existing viewer relationship.
  */
 function mergeRelationship(
-	existing: CacheableUser["relationship"],
-	incoming: CacheableUser["relationship"],
-): CacheableUser["relationship"] {
-	if (!isPlainObject(incoming)) return existing;
-	const merged: { isFollowing?: boolean; followsYou?: boolean } = {
-		...(isPlainObject(existing) ? existing : {}),
-	};
-	if (typeof incoming.isFollowing === "boolean")
-		merged.isFollowing = incoming.isFollowing;
-	if (typeof incoming.followsYou === "boolean")
-		merged.followsYou = incoming.followsYou;
-	return merged;
+  existing: CacheableUser['relationship'],
+  incoming: CacheableUser['relationship'],
+): CacheableUser['relationship'] {
+  if (!isPlainObject(incoming)) return existing;
+  const merged: { isFollowing?: boolean; followsYou?: boolean } = {
+    ...(isPlainObject(existing) ? existing : {}),
+  };
+  if (typeof incoming.isFollowing === 'boolean') merged.isFollowing = incoming.isFollowing;
+  if (typeof incoming.followsYou === 'boolean') merged.followsYou = incoming.followsYou;
+  return merged;
 }
 
 /**
@@ -205,63 +193,54 @@ function mergeRelationship(
  * only the by-username key carries it (`useUserByUsername`).
  */
 function mergeUsers(
-	existing: CachedUser,
-	incoming: CachedUser,
-	options?: { includeRelationship?: boolean },
+  existing: CachedUser,
+  incoming: CachedUser,
+  options?: { includeRelationship?: boolean },
 ): CachedUser {
-	const includeRelationship = options?.includeRelationship ?? true;
-	const merged: CachedUser = { ...existing };
-	for (const [key, value] of Object.entries(incoming)) {
-		if (key === "name" || key === "_count" || key === "relationship") continue;
-		if (key === "id") {
-			merged.id = incoming.id;
-			continue;
-		}
-		if (isMeaningful(value)) merged[key] = value;
-	}
-	const name = mergeName(existing.name, incoming.name);
-	if (name !== undefined) merged.name = name;
-	const count = mergeCount(existing._count, incoming._count);
-	if (count !== undefined) merged._count = count;
-	if (includeRelationship) {
-		const relationship = mergeRelationship(
-			existing.relationship,
-			incoming.relationship,
-		);
-		if (relationship !== undefined) merged.relationship = relationship;
-	} else {
-		merged.relationship = undefined;
-	}
-	return merged;
+  const includeRelationship = options?.includeRelationship ?? true;
+  const merged: CachedUser = { ...existing };
+  for (const [key, value] of Object.entries(incoming)) {
+    if (key === 'name' || key === '_count' || key === 'relationship') continue;
+    if (key === 'id') {
+      merged.id = incoming.id;
+      continue;
+    }
+    if (isMeaningful(value)) merged[key] = value;
+  }
+  const name = mergeName(existing.name, incoming.name);
+  if (name !== undefined) merged.name = name;
+  const count = mergeCount(existing._count, incoming._count);
+  if (count !== undefined) merged._count = count;
+  if (includeRelationship) {
+    const relationship = mergeRelationship(existing.relationship, incoming.relationship);
+    if (relationship !== undefined) merged.relationship = relationship;
+  } else {
+    delete merged.relationship;
+  }
+  return merged;
 }
 
 /** Merge-upsert a normalized user into one cache key (see module docs for semantics). */
 function upsertOneKey(
-	queryClient: QueryClient,
-	key: readonly unknown[],
-	incoming: CachedUser,
-	options: { includeRelationship: boolean },
+  queryClient: QueryClient,
+  key: readonly unknown[],
+  incoming: CachedUser,
+  options: { includeRelationship: boolean },
 ): void {
-	const mergeOpts = { includeRelationship: options.includeRelationship };
-	const existing = queryClient.getQueryData<CacheableUser>(key);
-	if (existing === undefined) {
-		// Cold slot: seed the full incoming object, STALE, so react-query refetches
-		// the full authoritative profile (relationship, counts, createdAt, …).
-		const seeded = mergeUsers({ id: incoming.id }, incoming, mergeOpts);
-		queryClient.setQueryData<CachedUser>(key, seeded, { updatedAt: 0 });
-		return;
-	}
-	// Existing entry: merge and leave its freshness lifecycle untouched. The
-	// existing entry is keyed by `incoming.id`, so use it as the fallback id.
-	const merged = mergeUsers(
-		toCachedUser(existing, incoming.id),
-		incoming,
-		mergeOpts,
-	);
-	const dataUpdatedAt = queryClient.getQueryState(key)?.dataUpdatedAt ?? 0;
-	queryClient.setQueryData<CachedUser>(key, merged, {
-		updatedAt: dataUpdatedAt,
-	});
+  const mergeOpts = { includeRelationship: options.includeRelationship };
+  const existing = queryClient.getQueryData<CacheableUser>(key);
+  if (existing === undefined) {
+    // Cold slot: seed the full incoming object, STALE, so react-query refetches
+    // the full authoritative profile (relationship, counts, createdAt, …).
+    const seeded = mergeUsers({ id: incoming.id }, incoming, mergeOpts);
+    queryClient.setQueryData<CachedUser>(key, seeded, { updatedAt: 0 });
+    return;
+  }
+  // Existing entry: merge and leave its freshness lifecycle untouched. The
+  // existing entry is keyed by `incoming.id`, so use it as the fallback id.
+  const merged = mergeUsers(toCachedUser(existing, incoming.id), incoming, mergeOpts);
+  const dataUpdatedAt = queryClient.getQueryState(key)?.dataUpdatedAt ?? 0;
+  queryClient.setQueryData<CachedUser>(key, merged, { updatedAt: dataUpdatedAt });
 }
 
 /**
@@ -272,7 +251,7 @@ function upsertOneKey(
  * empty string is honoured (anonymous scope).
  */
 function resolveViewerId(viewerId?: string): string {
-	return viewerId ?? useAuthStore.getState().user?.id ?? "";
+  return viewerId ?? useAuthStore.getState().user?.id ?? '';
 }
 
 /**
@@ -286,29 +265,29 @@ function resolveViewerId(viewerId?: string): string {
  *                    the current auth-store user id.
  */
 export function upsertCachedUser(
-	queryClient: QueryClient,
-	user: CacheableUser,
-	viewerId?: string,
+  queryClient: QueryClient,
+  user: CacheableUser,
+  viewerId?: string,
 ): void {
-	const incoming = normalizeIncoming(user);
-	if (!incoming) return;
+  const incoming = normalizeIncoming(user);
+  if (!incoming) return;
 
-	// By-id identity entry (read by `useUserById`). Not viewer-scoped — never store
-	// the viewer-relative `relationship` here or one viewer's follow state leaks
-	// into every other viewer's by-id cache entry.
-	upsertOneKey(queryClient, queryKeys.users.detail(incoming.id), incoming, {
-		includeRelationship: false,
-	});
+  // By-id identity entry (read by `useUserById`). Not viewer-scoped — never store
+  // the viewer-relative `relationship` here or one viewer's follow state leaks
+  // into every other viewer's by-id cache entry.
+  upsertOneKey(queryClient, queryKeys.users.detail(incoming.id), incoming, {
+    includeRelationship: false,
+  });
 
-	const username = incoming.username;
-	if (typeof username === "string" && username.trim() !== "") {
-		// By-username entry (read by `useUserByUsername`). Viewer-scoped because the
-		// authenticated single-profile fetch embeds the viewer `relationship`. Build
-		// the key through the SAME helper the hook uses so username normalization
-		// (`trim().toLowerCase()`) matches byte-for-byte.
-		const key = queryKeys.users.byUsername(username, resolveViewerId(viewerId));
-		upsertOneKey(queryClient, key, incoming, { includeRelationship: true });
-	}
+  const username = incoming.username;
+  if (typeof username === 'string' && username.trim() !== '') {
+    // By-username entry (read by `useUserByUsername`). Viewer-scoped because the
+    // authenticated single-profile fetch embeds the viewer `relationship`. Build
+    // the key through the SAME helper the hook uses so username normalization
+    // (`trim().toLowerCase()`) matches byte-for-byte.
+    const key = queryKeys.users.byUsername(username, resolveViewerId(viewerId));
+    upsertOneKey(queryClient, key, incoming, { includeRelationship: true });
+  }
 }
 
 /**
@@ -317,13 +296,13 @@ export function upsertCachedUser(
  * appears twice merges both slices into the single cache entry.
  */
 export function upsertCachedUsers(
-	queryClient: QueryClient,
-	users: readonly CacheableUser[] | null | undefined,
-	viewerId?: string,
+  queryClient: QueryClient,
+  users: readonly CacheableUser[] | null | undefined,
+  viewerId?: string,
 ): void {
-	if (!Array.isArray(users) || users.length === 0) return;
-	const resolvedViewerId = resolveViewerId(viewerId);
-	for (const user of users) {
-		if (user) upsertCachedUser(queryClient, user, resolvedViewerId);
-	}
+  if (!Array.isArray(users) || users.length === 0) return;
+  const resolvedViewerId = resolveViewerId(viewerId);
+  for (const user of users) {
+    if (user) upsertCachedUser(queryClient, user, resolvedViewerId);
+  }
 }

package/src/ui/hooks/useAssets.ts

@@ -48,7 +48,7 @@ export const useAssets = () => {
   // Upload asset with progress tracking
   const upload = useCallback(async (
     file: File, 
-    metadata?: Record<string, unknown>
+    metadata?: Record<string, any>
   ): Promise<Asset | null> => {
     if (!oxyInstance) {
       throw new Error('OxyServices instance not configured. Call setOxyAssetInstance first.');

package/src/ui/hooks/useAsyncAction.ts

@@ -1,5 +1,5 @@
 import { useState, useCallback } from 'react';
-import { toast } from '@oxyhq/bloom/toast';
+import { toast } from '@oxyhq/bloom';
 
 interface UseAsyncActionOptions<T> {
     /** Function to execute */
@@ -7,11 +7,11 @@ interface UseAsyncActionOptions<T> {
     /** Success message to display */
     successMessage?: string;
     /** Error message to display (or function to get message from error) */
-    errorMessage?: string | ((error: unknown) => string);
+    errorMessage?: string | ((error: any) => string);
     /** Callback on success */
     onSuccess?: (result: T) => void;
     /** Callback on error */
-    onError?: (error: unknown) => void;
+    onError?: (error: any) => void;
     /** Show loading toast */
     showLoadingToast?: boolean;
     /** Loading message */

package/src/ui/hooks/useAuth.ts

@@ -17,10 +17,8 @@
  * }
  * ```
  *
- * Session restore (zero cookies):
- * - Web: this origin's own persisted `{deviceId, deviceSecret}` — a signed-out
- *   origin stays signed out until the user presses "Continue with Oxy". There is
- *   no cross-origin silent SSO: the SDK never navigates the tab on its own.
+ * Cross-domain session (zero cookies):
+ * - Web: silent OAuth (`prompt=none`) on cold boot; hub-ticket sync to auth.oxy.so after sign-in
  * - Native: shared Keychain / app-group identity (Commons)
  * - Realtime sync: Socket.IO `session_state` on `device:<deviceId>` once authenticated
  * - Manual sign-in: signIn() opens the in-app account dialog (web + native)

package/src/ui/hooks/useAvatarPicker.ts

@@ -24,7 +24,7 @@ import { useCallback } from 'react';
 import type { OxyServices } from '@oxyhq/core';
 import { translate, updateAvatarVisibility } from '@oxyhq/core';
 import type { QueryClient } from '@tanstack/react-query';
-import { toast } from '@oxyhq/bloom/toast';
+import { toast } from '@oxyhq/bloom';
 import { updateProfileWithAvatar } from '../utils/avatarUtils';
 import { openWithinOrPresent } from '../navigation/surfaces';
 import type { AvatarCropResult } from '../screens/AvatarCropScreen';

package/src/ui/hooks/useOnlineStatus.ts

@@ -2,9 +2,8 @@
  * useOnlineStatus
  *
  * Reactive boolean reflecting TanStack Query's `onlineManager` state.
- * Mirrors browser `online`/`offline` events on web and NetInfo reachability
- * updates on native (both wired up in `OxyProvider`, aligned with Bloom's
- * `ConnectionStatusToasts` semantics).
+ * Mirrors browser `online`/`offline` events on web and NetInfo updates on
+ * native (both wired up in `OxyProvider`).
  *
  * Use this for surfacing offline UI — an OfflineBanner, a disabled "Sync"
  * button, an inline "queued" badge on pending writes, etc. For pending /

package/src/ui/hooks/useSessionManagement.ts

@@ -9,6 +9,7 @@ import type { OxyServices } from '@oxyhq/core';
 import type { QueryClient } from '@tanstack/react-query';
 import { clearQueryCache } from './queryClient';
 import { isWebBrowser } from '../utils/isWebBrowser';
+import { clearCrossOriginRestoreGuards } from '../utils/crossOriginRestore';
 import { resetSessionScopedStores } from '../stores/resetSessionScopedStores';
 
 export interface UseSessionManagementOptions {
@@ -196,6 +197,7 @@ export const useSessionManagement = ({
     }
     
     await clearSessionStorage();
+    clearCrossOriginRestoreGuards();
     onAuthStateChange?.(null);
   }, [clearSessionStorage, logoutStore, onAuthStateChange, oxyServices, queryClient, storage, logger]);
 

package/src/ui/hooks/useSettingToggle.ts

@@ -1,5 +1,5 @@
 import { useState, useCallback, useEffect } from 'react';
-import { toast } from '@oxyhq/bloom/toast';
+import { toast } from '@oxyhq/bloom';
 
 interface UseSettingToggleOptions {
     /** Initial value of the setting */

package/src/ui/hooks/useSurfaceHeader.ts

@@ -10,13 +10,8 @@ import type { DialogHeaderConfig } from '@oxyhq/bloom/dialog';
  * design-system fields Bloom's nav header supports: the single trailing
  * `primaryAction` CTA (Upload / Save), a trailing icon `actions` row, a header
  * `search` / `segments` in the large-title zone, an `onImage` `tone` over media,
- * and a wizard `progress` bar.
- *
- * Only the NODE fields (`left`/`right`/`titleContent`, and an action's `icon`)
- * must be referentially stable — a node can only be compared by identity, so an
- * inline one thrashes the header. The rich OBJECT fields are compared by value
- * (see {@link surfaceHeaderContentEqual}), so an inline `primaryAction` /
- * `actions` / `search` / `segments` / `progress` is safe to pass.
+ * and a wizard `progress` bar. Object/slot fields MUST be referentially stable
+ * (memoize them with `useMemo`) so the header does not thrash.
  */
 export type SurfaceHeaderContent = Pick<
   DialogHeaderConfig,
@@ -47,86 +42,16 @@ interface SurfaceHeaderContextValue {
  */
 export const SurfaceHeaderContext = createContext<SurfaceHeaderContextValue | null>(null);
 
-type HeaderPrimaryAction = NonNullable<SurfaceHeaderContent['primaryAction']>;
-type HeaderAction = NonNullable<SurfaceHeaderContent['actions']>[number];
-type HeaderSearch = NonNullable<SurfaceHeaderContent['search']>;
-type HeaderSegments = NonNullable<SurfaceHeaderContent['segments']>;
-type HeaderProgress = NonNullable<SurfaceHeaderContent['progress']>;
-
-function primaryActionEqual(
-  a: HeaderPrimaryAction | undefined,
-  b: HeaderPrimaryAction | undefined,
-): boolean {
-  if (a === b) return true;
-  if (!a || !b) return false;
-  // `onPress` is a fresh closure each render — its identity never changes what
-  // the button renders, so compare only the render-affecting scalars.
-  return a.label === b.label && !!a.disabled === !!b.disabled && !!a.loading === !!b.loading;
-}
-
-function actionsEqual(a: HeaderAction[] | undefined, b: HeaderAction[] | undefined): boolean {
-  if (a === b) return true;
-  if (!a || !b || a.length !== b.length) return false;
-  for (let i = 0; i < a.length; i += 1) {
-    const x = a[i];
-    const y = b[i];
-    if (!x || !y) return false;
-    // `icon` is a node (identity); `onPress` is ignored, like `primaryAction`'s.
-    if (
-      x.accessibilityLabel !== y.accessibilityLabel ||
-      !!x.disabled !== !!y.disabled ||
-      x.icon !== y.icon
-    ) {
-      return false;
-    }
-  }
-  return true;
-}
-
-function searchEqual(a: HeaderSearch | undefined, b: HeaderSearch | undefined): boolean {
-  if (a === b) return true;
-  if (!a || !b) return false;
-  return a.value === b.value && a.placeholder === b.placeholder;
-}
-
-function segmentsEqual(a: HeaderSegments | undefined, b: HeaderSegments | undefined): boolean {
-  if (a === b) return true;
-  if (!a || !b || a.value !== b.value || a.items.length !== b.items.length) return false;
-  for (let i = 0; i < a.items.length; i += 1) {
-    const x = a.items[i];
-    const y = b.items[i];
-    if (!x || !y || x.key !== y.key || x.label !== y.label) return false;
-  }
-  return true;
-}
-
-function progressEqual(a: HeaderProgress | undefined, b: HeaderProgress | undefined): boolean {
-  if (a === b) return true;
-  if (!a || !b) return false;
-  return a.step === b.step && a.total === b.total;
-}
-
 /**
- * Value-equality for a surface's header contribution.
- *
- * This MIRRORS Bloom's own `configsEqual` (`@oxyhq/bloom/dialog`), which guards
- * the header store one layer down — deliberately field for field. The two must
- * not diverge: this comparator is the gate that decides whether the host's
- * `setContent` fires, so a comparator STRICTER than Bloom's re-introduces the
- * update loop Bloom's own guard was written to prevent.
- *
- * Scalars (`title`/`subtitle`/`largeTitle`/`tone`) compare by value. The rich
- * object fields (`primaryAction`/`actions`/`search`/`segments`/`progress`)
- * compare by their render-affecting scalars, so a screen may build them inline:
- * a fresh object with unchanged contents is NOT a change. Only the node fields
- * (`titleContent`/`left`/`right`, and an action's `icon`) compare by identity —
- * there is nothing else to compare a `ReactNode` by — so those, and only those,
- * carry the memoize-me contract.
+ * Shallow value-equality for a surface's header contribution.
  *
- * Function-typed affordances compare by PRESENCE, never identity: `onBack`
- * legitimately gets a fresh closure each render and its identity never changes
- * what the header renders, so it must not count as a change (that is exactly
- * what would drive the update loop).
+ * Scalars (`title`/`subtitle`/`largeTitle`/`tone`) compare by value; the object
+ * and node fields (`titleContent`/`left`/`right`/`primaryAction`/`actions`/
+ * `search`/`segments`/`progress`) compare by identity — callers memoize them, per
+ * this hook's contract. Function-typed affordances compare by PRESENCE, never
+ * identity: `onBack` legitimately gets a fresh closure each render, and its
+ * identity never changes what the header renders, so it must not count as a
+ * change (that is exactly what would drive the update loop).
  */
 function surfaceHeaderContentEqual(
   a: SurfaceHeaderContent | null,
@@ -142,12 +67,12 @@ function surfaceHeaderContentEqual(
     a.left === b.left &&
     a.right === b.right &&
     !!a.onBack === !!b.onBack &&
+    a.primaryAction === b.primaryAction &&
+    a.actions === b.actions &&
+    a.search === b.search &&
+    a.segments === b.segments &&
     a.tone === b.tone &&
-    primaryActionEqual(a.primaryAction, b.primaryAction) &&
-    actionsEqual(a.actions, b.actions) &&
-    searchEqual(a.search, b.search) &&
-    segmentsEqual(a.segments, b.segments) &&
-    progressEqual(a.progress, b.progress)
+    a.progress === b.progress
   );
 }