@tatchi-xyz/sdk 0.21.0 → 0.31.0

package/dist/esm/core/WalletIframe/client/router.js

@@ -1,36 +1,39 @@
-import { extractBorshBytesFromPlainSignedTx, init_validation, isBoolean, isObject, isPlainSignedTransactionLike, stripFunctionsShallow } from "../validation.js";
-import { init_errors, toError } from "../../../utils/errors.js";
-import { AccountRecoveryPhase, ActionPhase, DeviceLinkingPhase, EmailRecoveryPhase, LoginPhase, RegistrationPhase, init_sdkSentEvents } from "../../types/sdkSentEvents.js";
+import { extractBorshBytesFromPlainSignedTx, isBoolean, isObject, isPlainSignedTransactionLike, stripFunctionsShallow, toBasePath } from "../../../utils/validation.js";
+import { mergeSignerMode } from "../../types/signer-worker.js";
+import { toError } from "../../../utils/errors.js";
+import { PASSKEY_MANAGER_DEFAULT_CONFIGS } from "../../defaultConfigs.js";
 import { SignedTransaction } from "../../NearClient.js";
+import { ActionPhase, DeviceLinkingPhase, EmailRecoveryPhase, LoginPhase, RegistrationPhase, SyncAccountPhase } from "../../types/sdkSentEvents.js";
 import { openOfflineExportWindow } from "../../OfflineExport/overlay.js";
 import { OnEventsProgressBus, defaultPhaseHeuristics } from "./on-events-progress-bus.js";
 import { IframeTransport } from "./IframeTransport.js";
 import overlay_controller_default from "./overlay-controller.js";
 
 //#region src/core/WalletIframe/client/router.ts
-init_sdkSentEvents();
-init_validation();
-init_errors();
 var WalletIframeRouter = class {
 	opts;
 	transport;
-	port = null;
-	ready = false;
-	initInFlight = null;
-	pending = /* @__PURE__ */ new Map();
-	reqCounter = 0;
-	readyListeners = /* @__PURE__ */ new Set();
-	vrfStatusListeners = /* @__PURE__ */ new Set();
-	preferencesChangedListeners = /* @__PURE__ */ new Set();
-	device2StartPromise = null;
+	state = {
+		port: null,
+		ready: false,
+		initInFlight: null,
+		pending: /* @__PURE__ */ new Map(),
+		reqCounter: 0,
+		signerModePreference: null,
+		device2StartPromise: null
+	};
+	listeners = {
+		ready: /* @__PURE__ */ new Set(),
+		vrfStatus: /* @__PURE__ */ new Set(),
+		preferencesChanged: /* @__PURE__ */ new Set(),
+		registerOverlayResult: /* @__PURE__ */ new Set(),
+		registerOverlaySubmit: /* @__PURE__ */ new Set()
+	};
 	progressBus;
 	debug = false;
 	walletOriginUrl;
 	walletOriginOrigin;
-	overlay;
-	overlayForceFullscreen = false;
-	registerOverlayResultListeners = /* @__PURE__ */ new Set();
-	registerOverlaySubmitListeners = /* @__PURE__ */ new Set();
+	overlayState;
 	windowMsgHandlerBound;
 	constructor(options) {
 		if (!options?.walletOrigin) throw new Error("[WalletIframeRouter] walletOrigin is required when using the wallet iframe");
@@ -51,13 +54,22 @@ var WalletIframeRouter = class {
 			autoMount: true,
 			...options?.testOptions || {}
 		};
+		const normalizedServicePath = (() => {
+			const p = toBasePath(options?.servicePath, "/wallet-service");
+			return p === "/" ? "/wallet-service" : p;
+		})();
+		const normalizedSdkBasePath = (() => {
+			const p = toBasePath(options?.sdkBasePath, "/sdk");
+			return p === "/" ? "/sdk" : p;
+		})();
 		this.opts = {
 			connectTimeoutMs: 8e3,
 			requestTimeoutMs: 2e4,
-			servicePath: "/wallet-service",
-			sdkBasePath: "/sdk",
+			...options,
+			servicePath: normalizedServicePath,
+			sdkBasePath: normalizedSdkBasePath,
 			testOptions,
-			...options
+			signerMode: options.signerMode ?? PASSKEY_MANAGER_DEFAULT_CONFIGS.signerMode
 		};
 		this.walletOriginUrl = parsedOrigin;
 		this.walletOriginOrigin = parsedOrigin.origin;
@@ -66,12 +78,16 @@ var WalletIframeRouter = class {
 			walletOrigin: this.opts.walletOrigin,
 			servicePath: this.opts.servicePath,
 			connectTimeoutMs: this.opts.connectTimeoutMs,
+			debug: this.debug,
 			testOptions: {
 				routerId: this.opts.testOptions.routerId,
 				ownerTag: this.opts.testOptions.ownerTag
 			}
 		});
-		this.overlay = new overlay_controller_default({ ensureIframe: () => this.transport.ensureIframeMounted() });
+		this.overlayState = {
+			controller: new overlay_controller_default({ ensureIframe: () => this.transport.ensureIframeMounted() }),
+			forceFullscreen: false
+		};
 		this.progressBus = new OnEventsProgressBus({
 			show: () => this.showFrameForActivation(),
 			hide: () => this.hideFrameForActivation()
@@ -84,10 +100,10 @@ var WalletIframeRouter = class {
 			if (!data || typeof data !== "object") return;
 			const type = data.type;
 			if (type === "REGISTER_BUTTON_SUBMIT") {
-				this.overlayForceFullscreen = true;
-				this.overlay.setSticky(true);
-				this.overlay.showFullscreen();
-				for (const cb of Array.from(this.registerOverlaySubmitListeners)) try {
+				this.overlayState.forceFullscreen = true;
+				this.overlayState.controller.setSticky(true);
+				this.overlayState.controller.showFullscreen();
+				for (const cb of Array.from(this.listeners.registerOverlaySubmit)) try {
 					cb();
 				} catch {}
 				return;
@@ -95,14 +111,14 @@ var WalletIframeRouter = class {
 			if (type === "REGISTER_BUTTON_RESULT") {
 				const payload = data.payload;
 				const ok = !!payload?.ok;
-				for (const cb of Array.from(this.registerOverlayResultListeners)) cb({
+				for (const cb of Array.from(this.listeners.registerOverlayResult)) cb({
 					ok,
 					result: payload?.result,
 					cancelled: payload?.cancelled,
 					error: payload?.error
 				});
-				this.overlayForceFullscreen = false;
-				this.overlay.setSticky(false);
+				this.overlayState.forceFullscreen = false;
+				this.overlayState.controller.setSticky(false);
 				this.hideFrameForActivation();
 				if (ok) {
 					const acct = payload?.result?.nearAccountId;
@@ -124,7 +140,7 @@ var WalletIframeRouter = class {
 			if (ev.origin !== walletOrigin) return;
 			const data = ev.data;
 			if (!data || data.type !== "WALLET_UI_CLOSED") return;
-			this.overlay.setSticky(false);
+			this.overlayState.controller.setSticky(false);
 			this.hideFrameForActivation();
 			globalThis.removeEventListener?.("message", onUiClosed);
 		};
@@ -139,7 +155,7 @@ var WalletIframeRouter = class {
 			const data = ev.data;
 			if (!data || data.type !== "OFFLINE_EXPORT_FALLBACK") return;
 			globalThis.removeEventListener?.("message", onFallback);
-			this.overlay.setSticky(false);
+			this.overlayState.controller.setSticky(false);
 			this.hideFrameForActivation();
 			await this.openOfflineExport({ accountId });
 		};
@@ -153,40 +169,45 @@ var WalletIframeRouter = class {
 	* If already ready, the listener is invoked on next microtask.
 	*/
 	onReady(listener) {
-		if (this.ready) {
+		if (this.state.ready) {
 			Promise.resolve().then(() => {
 				listener();
 			});
 			return () => {};
 		}
-		this.readyListeners.add(listener);
+		this.listeners.ready.add(listener);
 		return () => {
-			this.readyListeners.delete(listener);
+			this.listeners.ready.delete(listener);
 		};
 	}
 	emitReady() {
-		if (!this.readyListeners.size) return;
-		for (const cb of Array.from(this.readyListeners)) cb();
+		if (!this.listeners.ready.size) return;
+		for (const cb of Array.from(this.listeners.ready)) cb();
+	}
+	resolveSignerMode(input) {
+		const base = this.state.signerModePreference ?? this.opts.signerMode;
+		return mergeSignerMode(base, input ?? null);
 	}
 	/**
 	* Initialize the transport and configure the wallet host.
 	* Safe to call multiple times; concurrent calls deduplicate via initInFlight.
 	*/
 	async init() {
-		if (this.ready) return;
-		if (this.initInFlight) return this.initInFlight;
-		this.initInFlight = (async () => {
+		if (this.state.ready) return;
+		if (this.state.initInFlight) return this.state.initInFlight;
+		this.state.initInFlight = (async () => {
 			if (this.opts.testOptions.autoMount !== false) {
-				this.port = await this.transport.connect();
-				this.port.onmessage = (ev) => this.onPortMessage(ev);
-				this.port.start?.();
-				this.ready = true;
+				this.state.port = await this.transport.connect();
+				this.state.port.onmessage = (ev) => this.onPortMessage(ev);
+				this.state.port.start?.();
+				this.state.ready = true;
 			}
-			console.debug("[WalletIframeRouter] init: %s", this.ready ? "connected" : "deferred (autoMount=false)");
+			console.debug("[WalletIframeRouter] init: %s", this.state.ready ? "connected" : "deferred (autoMount=false)");
 			await this.post({
 				type: "PM_SET_CONFIG",
 				payload: {
 					theme: this.opts.theme,
+					signerMode: this.opts.signerMode,
 					nearRpcUrl: this.opts.nearRpcUrl,
 					nearNetwork: this.opts.nearNetwork,
 					contractId: this.opts.contractId,
@@ -211,13 +232,13 @@ var WalletIframeRouter = class {
 			this.emitReady();
 		})();
 		try {
-			await this.initInFlight;
+			await this.state.initInFlight;
 		} finally {
-			this.initInFlight = null;
+			this.state.initInFlight = null;
 		}
 	}
 	isReady() {
-		return this.ready;
+		return this.state.ready;
 	}
 	registerUiTypes(registry) {
 		const iframe = this.transport.ensureIframeMounted();
@@ -260,76 +281,78 @@ var WalletIframeRouter = class {
 		}, target);
 	}
 	onVrfStatusChanged(listener) {
-		this.vrfStatusListeners.add(listener);
+		this.listeners.vrfStatus.add(listener);
 		return () => {
-			this.vrfStatusListeners.delete(listener);
+			this.listeners.vrfStatus.delete(listener);
 		};
 	}
 	onPreferencesChanged(listener) {
-		this.preferencesChangedListeners.add(listener);
+		this.listeners.preferencesChanged.add(listener);
 		return () => {
-			this.preferencesChangedListeners.delete(listener);
+			this.listeners.preferencesChanged.delete(listener);
 		};
 	}
 	emitVrfStatusChanged(status) {
-		for (const cb of Array.from(this.vrfStatusListeners)) try {
+		for (const cb of Array.from(this.listeners.vrfStatus)) try {
 			cb(status);
 		} catch {}
 	}
 	emitPreferencesChanged(payload) {
-		if (!this.preferencesChangedListeners.size) return;
-		for (const cb of Array.from(this.preferencesChangedListeners)) try {
+		if (!this.listeners.preferencesChanged.size) return;
+		for (const cb of Array.from(this.listeners.preferencesChanged)) try {
 			cb(payload);
 		} catch {}
 	}
 	onRegisterOverlayResult(listener) {
-		this.registerOverlayResultListeners.add(listener);
+		this.listeners.registerOverlayResult.add(listener);
 		return () => {
-			this.registerOverlayResultListeners.delete(listener);
+			this.listeners.registerOverlayResult.delete(listener);
 		};
 	}
 	onRegisterOverlaySubmit(listener) {
-		this.registerOverlaySubmitListeners.add(listener);
+		this.listeners.registerOverlaySubmit.add(listener);
 		return () => {
-			this.registerOverlaySubmitListeners.delete(listener);
+			this.listeners.registerOverlaySubmit.delete(listener);
 		};
 	}
 	async signTransactionsWithActions(payload) {
-		const safeOptions = payload.options ? {
+		const safeOptions = {
+			signerMode: this.resolveSignerMode(payload.options.signerMode),
 			...payload.options.confirmationConfig ? { confirmationConfig: payload.options.confirmationConfig } : {},
 			...payload.options.confirmerText ? { confirmerText: payload.options.confirmerText } : {}
-		} : void 0;
+		};
 		const res = await this.post({
 			type: "PM_SIGN_TXS_WITH_ACTIONS",
 			payload: {
 				nearAccountId: payload.nearAccountId,
 				transactions: payload.transactions,
-				options: safeOptions && Object.keys(safeOptions).length > 0 ? safeOptions : void 0
+				options: safeOptions
 			},
 			options: { onProgress: this.wrapOnEvent(payload.options?.onEvent, isActionSSEEvent) }
 		});
 		return normalizeSignedTransactionObject(res.result);
 	}
 	async signDelegateAction(payload) {
-		const safeOptions = payload.options ? {
+		const safeOptions = {
+			signerMode: this.resolveSignerMode(payload.options.signerMode),
 			...payload.options.confirmationConfig ? { confirmationConfig: payload.options.confirmationConfig } : {},
 			...payload.options.confirmerText ? { confirmerText: payload.options.confirmerText } : {}
-		} : void 0;
+		};
 		const res = await this.post({
 			type: "PM_SIGN_DELEGATE_ACTION",
 			payload: {
 				nearAccountId: payload.nearAccountId,
 				delegate: payload.delegate,
-				options: safeOptions && Object.keys(safeOptions).length > 0 ? safeOptions : void 0
+				options: safeOptions
 			},
 			options: { onProgress: this.wrapOnEvent(payload.options?.onEvent, isActionSSEEvent) }
 		});
 		return res.result;
 	}
 	async registerPasskey(payload) {
-		this.overlayForceFullscreen = true;
-		this.overlay.setSticky(true);
-		this.overlay.showFullscreen();
+		this.overlayState.forceFullscreen = true;
+		this.overlayState.controller.setSticky(true);
+		this.overlayState.controller.showFullscreen();
 		try {
 			if (payload.confirmationConfig) {
 				const base = await this.getConfirmationConfig();
@@ -356,8 +379,40 @@ var WalletIframeRouter = class {
 			});
 			return res?.result;
 		} finally {
-			this.overlayForceFullscreen = false;
-			this.overlay.setSticky(false);
+			this.overlayState.forceFullscreen = false;
+			this.overlayState.controller.setSticky(false);
+			this.hideFrameForActivation();
+		}
+	}
+	async enrollThresholdEd25519Key(payload) {
+		this.showFrameForActivation();
+		try {
+			const safeOptions = removeFunctionsFromOptions(payload.options);
+			const res = await this.post({
+				type: "PM_ENROLL_THRESHOLD_ED25519_KEY",
+				payload: {
+					nearAccountId: payload.nearAccountId,
+					options: safeOptions
+				}
+			});
+			return res.result;
+		} finally {
+			this.hideFrameForActivation();
+		}
+	}
+	async rotateThresholdEd25519Key(payload) {
+		this.showFrameForActivation();
+		try {
+			const safeOptions = removeFunctionsFromOptions(payload.options);
+			const res = await this.post({
+				type: "PM_ROTATE_THRESHOLD_ED25519_KEY",
+				payload: {
+					nearAccountId: payload.nearAccountId,
+					options: safeOptions
+				}
+			});
+			return res.result;
+		} finally {
 			this.hideFrameForActivation();
 		}
 	}
@@ -414,10 +469,11 @@ var WalletIframeRouter = class {
 		};
 	}
 	async signNep413Message(payload) {
-		const safeOptions = payload.options ? {
+		const safeOptions = {
+			signerMode: this.resolveSignerMode(payload.options.signerMode),
 			...payload.options.confirmerText ? { confirmerText: payload.options.confirmerText } : {},
 			...payload.options.confirmationConfig ? { confirmationConfig: payload.options.confirmationConfig } : {}
-		} : void 0;
+		};
 		const res = await this.post({
 			type: "PM_SIGN_NEP413",
 			payload: {
@@ -427,7 +483,7 @@ var WalletIframeRouter = class {
 					recipient: payload.recipient,
 					state: payload.state
 				},
-				options: safeOptions && Object.keys(safeOptions).length > 0 ? safeOptions : void 0
+				options: safeOptions
 			},
 			options: { onProgress: this.wrapOnEvent(payload.options?.onEvent, isActionSSEEvent) }
 		});
@@ -447,15 +503,18 @@ var WalletIframeRouter = class {
 	}
 	async executeAction(payload) {
 		const { options } = payload;
-		const safeOptions = options ? {
+		const safeOptions = {
+			signerMode: this.resolveSignerMode(options.signerMode),
 			waitUntil: options.waitUntil,
 			confirmationConfig: options.confirmationConfig,
 			...options.confirmerText ? { confirmerText: options.confirmerText } : {}
-		} : void 0;
+		};
 		const res = await this.post({
 			type: "PM_EXECUTE_ACTION",
 			payload: {
-				...payload,
+				nearAccountId: payload.nearAccountId,
+				receiverId: payload.receiverId,
+				actionArgs: payload.actionArgs,
 				options: safeOptions
 			},
 			options: { onProgress: this.wrapOnEvent(options?.onEvent, isActionSSEEvent) }
@@ -486,6 +545,16 @@ var WalletIframeRouter = class {
 		const res = await this.post({ type: "PM_GET_CONFIRMATION_CONFIG" });
 		return res.result;
 	}
+	async setSignerMode(signerMode) {
+		await this.post({
+			type: "PM_SET_SIGNER_MODE",
+			payload: { signerMode }
+		});
+	}
+	async getSignerMode(opts) {
+		const res = await this.post({ type: "PM_GET_SIGNER_MODE" }, opts);
+		return res.result;
+	}
 	async setTheme(theme) {
 		await this.post({
 			type: "PM_SET_THEME",
@@ -528,10 +597,11 @@ var WalletIframeRouter = class {
 	}
 	async setRecoveryEmails(payload) {
 		const { options } = payload;
-		const safeOptions = options ? {
+		const safeOptions = {
+			signerMode: this.resolveSignerMode(options.signerMode),
 			waitUntil: options.waitUntil,
 			confirmationConfig: options.confirmationConfig
-		} : void 0;
+		};
 		const res = await this.post({
 			type: "PM_SET_RECOVERY_EMAILS",
 			payload: {
@@ -553,12 +623,13 @@ var WalletIframeRouter = class {
 	}
 	async signAndSendTransactions(payload) {
 		const { options } = payload;
-		const safeOptions = options ? {
+		const safeOptions = {
+			signerMode: this.resolveSignerMode(options.signerMode),
 			waitUntil: options.waitUntil,
 			executionWait: options.executionWait,
 			confirmationConfig: options.confirmationConfig,
 			...options.confirmerText ? { confirmerText: options.confirmerText } : {}
-		} : void 0;
+		};
 		const res = await this.post({
 			type: "PM_SIGN_AND_SEND_TXS",
 			payload: {
@@ -584,14 +655,15 @@ var WalletIframeRouter = class {
 		});
 		return res.result;
 	}
-	async deleteDeviceKey(accountId, publicKeyToDelete, options) {
+	async deleteDeviceKey(payload) {
 		const res = await this.post({
 			type: "PM_DELETE_DEVICE_KEY",
 			payload: {
-				accountId,
-				publicKeyToDelete
+				accountId: payload.accountId,
+				publicKeyToDelete: payload.publicKeyToDelete,
+				options: { signerMode: this.resolveSignerMode(payload.options.signerMode) }
 			},
-			options: { onProgress: this.wrapOnEvent(options?.onEvent, isActionSSEEvent) }
+			options: { onProgress: this.wrapOnEvent(payload.options?.onEvent, isActionSSEEvent) }
 		});
 		return res.result;
 	}
@@ -641,11 +713,11 @@ var WalletIframeRouter = class {
 		});
 		return Promise.resolve();
 	}
-	async recoverAccountFlow(payload) {
+	async syncAccount(payload) {
 		const res = await this.post({
-			type: "PM_RECOVER_ACCOUNT_FLOW",
+			type: "PM_SYNC_ACCOUNT_FLOW",
 			payload: { accountId: payload.accountId },
-			options: { onProgress: this.wrapOnEvent(payload.onEvent, isAccountRecoverySSEEvent) }
+			options: { onProgress: this.wrapOnEvent(payload.onEvent, isSyncAccountSSEEvent) }
 		});
 		return res.result;
 	}
@@ -658,7 +730,6 @@ var WalletIframeRouter = class {
 			type: "PM_START_EMAIL_RECOVERY",
 			payload: {
 				accountId: payload.accountId,
-				...payload.recoveryEmail ? { recoveryEmail: payload.recoveryEmail } : {},
 				options: safeOptions && Object.keys(safeOptions).length > 0 ? safeOptions : void 0
 			},
 			options: { onProgress: this.wrapOnEvent(payload.onEvent, isEmailRecoverySSEEvent) }
@@ -706,7 +777,7 @@ var WalletIframeRouter = class {
 		}
 	}
 	async startDevice2LinkingFlow(payload) {
-		if (this.device2StartPromise) return this.device2StartPromise;
+		if (this.state.device2StartPromise) return this.state.device2StartPromise;
 		const options = payload?.options;
 		const safeOptions = options ? {
 			...options.confirmationConfig ? { confirmationConfig: options.confirmationConfig } : {},
@@ -724,9 +795,9 @@ var WalletIframeRouter = class {
 				sticky: true
 			}
 		}).then((res) => res.result).finally(() => {
-			this.device2StartPromise = null;
+			this.state.device2StartPromise = null;
 		});
-		this.device2StartPromise = p;
+		this.state.device2StartPromise = p;
 		return p;
 	}
 	async stopDevice2LinkingFlow() {
@@ -752,7 +823,11 @@ var WalletIframeRouter = class {
 	onPortMessage(e) {
 		const msg = e.data;
 		if (msg.type === "PREFERENCES_CHANGED") {
-			this.emitPreferencesChanged(msg.payload);
+			const payload = msg.payload;
+			try {
+				this.state.signerModePreference = payload?.signerMode ?? this.state.signerModePreference;
+			} catch {}
+			this.emitPreferencesChanged(payload);
 			return;
 		}
 		const requestId = msg.requestId;
@@ -763,17 +838,17 @@ var WalletIframeRouter = class {
 				requestId,
 				payload
 			});
-			const pend = this.pending.get(requestId);
+			const pend = this.state.pending.get(requestId);
 			if (pend) {
 				if (pend.timer) window.clearTimeout(pend.timer);
 				pend.timer = window.setTimeout(() => {
 					const err = pend.onTimeout();
 					pend.reject(err);
-				}, this.opts.requestTimeoutMs);
+				}, pend.timeoutMs);
 			}
 			return;
 		}
-		const pending = this.pending.get(requestId);
+		const pending = this.state.pending.get(requestId);
 		if (!this.progressBus.isSticky(requestId)) {
 			if (!this.progressBus.wantsVisible()) this.hideFrameForActivation();
 		}
@@ -785,7 +860,7 @@ var WalletIframeRouter = class {
 			this.progressBus.unregister(requestId);
 			return;
 		}
-		this.pending.delete(requestId);
+		this.state.pending.delete(requestId);
 		if (pending.timer) window.clearTimeout(pending.timer);
 		if (msg.type === "ERROR") {
 			const err = new Error(msg.payload?.message || "Wallet error");
@@ -819,21 +894,22 @@ var WalletIframeRouter = class {
 	* 5. Wait for response (PM_RESULT or ERROR)
 	* 6. Clean up on completion or timeout
 	*/
-	async post(envelope) {
-		if (!this.ready || !this.port) await this.init();
-		const requestId = `${Date.now()}-${++this.reqCounter}`;
+	async post(envelope, postOpts) {
+		if (!this.state.ready || !this.state.port) await this.init();
+		const requestId = `${Date.now()}-${++this.state.reqCounter}`;
 		const full = {
 			...envelope,
 			requestId
 		};
 		const { options } = full;
+		const timeoutMs = postOpts?.timeoutMs ?? this.opts.requestTimeoutMs;
 		return new Promise((resolve, reject) => {
 			const onTimeout = () => {
-				const pending = this.pending.get(requestId);
+				const pending = this.state.pending.get(requestId);
 				if (pending?.timer !== void 0) window.clearTimeout(pending.timer);
-				this.pending.delete(requestId);
+				this.state.pending.delete(requestId);
 				this.progressBus.unregister(requestId);
-				this.overlay.setSticky(false);
+				this.overlayState.controller.setSticky(false);
 				if (!this.progressBus.wantsVisible()) this.hideFrameForActivation();
 				this.sendBestEffortCancel(requestId);
 				return /* @__PURE__ */ new Error(`Wallet request timeout for ${envelope.type}`);
@@ -841,11 +917,12 @@ var WalletIframeRouter = class {
 			const timer = window.setTimeout(() => {
 				const err = onTimeout();
 				reject(err);
-			}, this.opts.requestTimeoutMs);
-			this.pending.set(requestId, {
+			}, timeoutMs);
+			this.state.pending.set(requestId, {
 				resolve: (v) => resolve(v),
 				reject,
 				timer,
+				timeoutMs,
 				onProgress: options?.onProgress,
 				onTimeout
 			});
@@ -859,10 +936,8 @@ var WalletIframeRouter = class {
 				}
 			});
 			try {
-				const wireOptions = options && isObject(options) ? (() => {
-					const stickyVal = options.sticky;
-					return isBoolean(stickyVal) ? { sticky: stickyVal } : void 0;
-				})() : void 0;
+				const stickyVal = isObject(options) ? options.sticky : void 0;
+				const wireOptions = isBoolean(stickyVal) ? { sticky: stickyVal } : void 0;
 				const serializableFull = wireOptions ? {
 					...full,
 					options: wireOptions
@@ -870,17 +945,17 @@ var WalletIframeRouter = class {
 					...full,
 					options: void 0
 				};
-				this.overlay.setSticky(!!(wireOptions && wireOptions.sticky));
-				if (!this.overlay.getState().visible) {
+				this.overlayState.controller.setSticky(!!(wireOptions && wireOptions.sticky));
+				if (!this.overlayState.controller.getState().visible) {
 					const intent = this.computeOverlayIntent(serializableFull.type);
 					if (intent.mode === "fullscreen") {
-						this.overlay.setSticky(!!(wireOptions && wireOptions.sticky));
-						this.overlay.showFullscreen();
+						this.overlayState.controller.setSticky(!!(wireOptions && wireOptions.sticky));
+						this.overlayState.controller.showFullscreen();
 					}
 				}
-				this.port.postMessage(serializableFull);
+				this.state.port.postMessage(serializableFull);
 			} catch (err) {
-				this.pending.delete(requestId);
+				this.state.pending.delete(requestId);
 				window.clearTimeout(timer);
 				this.progressBus.unregister(requestId);
 				reject(toError(err));
@@ -888,56 +963,16 @@ var WalletIframeRouter = class {
 		});
 	}
 	/**
-	* computeOverlayIntent - Preflight "Show" Decision
-	*
-	* This method makes the initial decision about whether to show the overlay
-	* BEFORE sending the request to the iframe. It's a conservative preflight
-	* check that ensures the iframe is visible in time for user activation.
-	*
-	* Key Responsibilities:
-	* - Preflight Decision: Determines overlay visibility before request is sent
-	* - User Activation Timing: Ensures iframe is visible when WebAuthn prompts appear
-	* - Conservative Approach: Only shows overlay if not already visible
-	* - Request Type Mapping: Maps message types to overlay requirements
-	*
-	* How it differs from other components:
-	*
-	* vs OnEventsProgressBus (lifecycle and close decision):
-	* - computeOverlayIntent: "SHOW" decision - runs before sending request
-	* - OnEventsProgressBus: "CLOSE" decision - runs during operation lifecycle
-	* - OnEventsProgressBus drives ongoing UI phases and manages sticky behavior
-	* - OnEventsProgressBus handles PM_RESULT/ERROR and decides when to hide overlay
-	*
-	* vs OverlayController (single executor):
-	* - computeOverlayIntent: DECIDES what to do (show/hide decision logic)
-	* - OverlayController: EXECUTES the decision (actual CSS manipulation)
-	* - OverlayController receives commands from both intent and ProgressBus
-	* - OverlayController keeps all style mutations in one place
-	*
-	* Architecture Flow:
-	* 1. computeOverlayIntent() → decides to show overlay
-	* 2. OverlayController.showFullscreen() → executes the decision
-	* 3. Request sent to iframe → operation begins
-	* 4. OnEventsProgressBus manages lifecycle → handles progress events
-	* 5. OnEventsProgressBus decides to hide → when operation completes
-	* 6. OverlayController.hide() → executes the hide decision
-	*
-	* Special Cases:
-	* - Anchored flows (UI registry with viewportRect) are message-driven
-	* - Parent sets bounds and sticky via registry messages
-	* - computeOverlayIntent returns 'hidden' for these (don't pre-show)
-	* - Some legacy paths still call showFrameForActivation() directly
-	*
-	* Future Evolution:
-	* - If host always emits early PROGRESS for a type, this can be reduced
-	* - Intent is to move toward OnEventsProgressBus-driven lifecycle management
-	* - This provides predictable, glitch-free activation without hardcoding
+	* Preflight overlay decision before sending the request.
+	* - This decides whether to show fullscreen early for user activation.
+	* - ProgressBus handles hide timing; OverlayController just executes the decision.
 	*/
 	computeOverlayIntent(type) {
 		switch (type) {
 			case "PM_EXPORT_NEAR_KEYPAIR_UI":
 			case "PM_REGISTER":
 			case "PM_LOGIN":
+			case "PM_SYNC_ACCOUNT_FLOW":
 			case "PM_LINK_DEVICE_WITH_SCANNED_QR_DATA":
 			case "PM_SIGN_AND_SEND_TXS":
 			case "PM_EXECUTE_ACTION":
@@ -948,15 +983,15 @@ var WalletIframeRouter = class {
 	}
 	showFrameForActivation() {
 		this.transport.ensureIframeMounted();
-		if (this.overlayForceFullscreen) this.overlay.showFullscreen();
-		else this.overlay.showFullscreen();
+		if (this.overlayState.forceFullscreen) this.overlayState.controller.showFullscreen();
+		else this.overlayState.controller.showFullscreen();
 	}
 	hideFrameForActivation() {
-		if (!this.overlay.getState().visible) return;
-		this.overlay.hide();
+		if (!this.overlayState.controller.getState().visible) return;
+		this.overlayState.controller.hide();
 	}
 	sendBestEffortCancel(targetRequestId) {
-		const port = this.port;
+		const port = this.state.port;
 		if (!port) return;
 		const cancelEnvelope = {
 			type: "PM_CANCEL",
@@ -970,7 +1005,7 @@ var WalletIframeRouter = class {
 	* Useful when mounting inline UI components that require direct user clicks.
 	*/
 	setOverlayVisible(visible) {
-		if (visible) if (this.overlayForceFullscreen) this.overlay.showFullscreen();
+		if (visible) if (this.overlayState.forceFullscreen) this.overlayState.controller.showFullscreen();
 		else this.showFrameForActivation();
 		else this.hideFrameForActivation();
 	}
@@ -980,7 +1015,7 @@ var WalletIframeRouter = class {
 	}
 	/** Public helper for tests/tools: inspect current overlay state. */
 	getOverlayState() {
-		return this.overlay.getState();
+		return this.overlayState.controller.getState();
 	}
 	/**
 	* Position and show the wallet iframe as an anchored overlay matching a DOMRect.
@@ -992,9 +1027,9 @@ var WalletIframeRouter = class {
 	* overlay using absolute positioning in document coordinates.
 	*/
 	setOverlayBounds(rect) {
-		if (this.overlayForceFullscreen) return;
+		if (this.overlayState.forceFullscreen) return;
 		this.transport.ensureIframeMounted();
-		this.overlay.showAnchored(rect);
+		this.overlayState.controller.showAnchored(rect);
 	}
 	postWindowMessage(w, data, target) {
 		try {
@@ -1011,7 +1046,7 @@ const REGISTRATION_PHASES = new Set(Object.values(RegistrationPhase));
 const LOGIN_PHASES = new Set(Object.values(LoginPhase));
 const ACTION_PHASES = new Set(Object.values(ActionPhase));
 const DEVICE_LINKING_PHASES = new Set(Object.values(DeviceLinkingPhase));
-const ACCOUNT_RECOVERY_PHASES = new Set(Object.values(AccountRecoveryPhase));
+const SYNC_ACCOUNT_PHASES = new Set(Object.values(SyncAccountPhase));
 const EMAIL_RECOVERY_PHASES = new Set(Object.values(EmailRecoveryPhase));
 function phaseOf(progress) {
 	return String(progress?.phase ?? "");
@@ -1028,8 +1063,8 @@ function isActionSSEEvent(p) {
 function isDeviceLinkingSSEEvent(p) {
 	return DEVICE_LINKING_PHASES.has(phaseOf(p));
 }
-function isAccountRecoverySSEEvent(p) {
-	return ACCOUNT_RECOVERY_PHASES.has(phaseOf(p));
+function isSyncAccountSSEEvent(p) {
+	return SYNC_ACCOUNT_PHASES.has(phaseOf(p));
 }
 function isEmailRecoverySSEEvent(p) {
 	return EMAIL_RECOVERY_PHASES.has(phaseOf(p));