@bsv/wallet-toolbox-client 2.9.0 → 2.10.1

package/out/index.client.cjs

@@ -4081,7 +4081,7 @@ var EntitySyncState = class EntitySyncState extends EntityBase {
 		log += formatSyncSection("OUTPUTS", c.outputs, (r) => `${r.outputId} ${r.txid}.${r.vout} ${r.transactionId} ${r.spendable ? "spendable" : ""} sats:${r.satoshis}`);
 		return log;
 	}
-	async processSyncChunk(writer, args, chunk) {
+	async processSyncChunk(writer, args, chunk, trx) {
 		const mes = [
 			new MergeEntity(chunk.provenTxs, EntityProvenTx.mergeFind, this.syncMap.provenTx),
 			new MergeEntity(chunk.outputBaskets, EntityOutputBasket.mergeFind, this.syncMap.outputBasket),
@@ -4102,16 +4102,16 @@ var EntitySyncState = class EntitySyncState extends EntityBase {
 		let done = true;
 		if (chunk.user != null) {
 			const ei = chunk.user;
-			const { found, eo } = await EntityUser.mergeFind(writer, this.userId, ei);
+			const { found, eo } = await EntityUser.mergeFind(writer, this.userId, ei, trx);
 			if (found) {
-				if (await eo.mergeExisting(writer, args.since, ei)) {
+				if (await eo.mergeExisting(writer, args.since, ei, void 0, trx)) {
 					maxUpdated_at = maxDate(maxUpdated_at, ei.updated_at);
 					updates++;
 				}
 			}
 		}
 		for (const me of mes) {
-			const r = await me.merge(args.since, writer, this.userId, this.syncMap);
+			const r = await me.merge(args.since, writer, this.userId, this.syncMap, trx);
 			me.esm.count += me.stateArray?.length || 0;
 			updates += r.updates;
 			inserts += r.inserts;
@@ -4122,7 +4122,7 @@ var EntitySyncState = class EntitySyncState extends EntityBase {
 			this.when = maxUpdated_at;
 			for (const me of mes) me.esm.count = 0;
 		}
-		await this.updateStorage(writer, false);
+		await this.updateStorage(writer, false, trx);
 		return {
 			done,
 			maxUpdated_at,
@@ -7845,6 +7845,23 @@ function mergePriorOptions(caVargs, saArgs) {
 	return _bsv_sdk.Validation.validateSignActionArgs(saArgs);
 }
 //#endregion
+//#region ../src/utility/canonicalizeAtomicBeef.ts
+/**
+* Restricts an AtomicBEEF envelope to the transaction named by its BRC-95
+* prefix and that transaction's recursive dependency closure.
+*
+* Older senders could serialize unrelated, otherwise valid BEEF branches into
+* an AtomicBEEF envelope. Those branches are not part of the payment proof and
+* must not influence internalization. Proof and transaction validation still
+* run against the returned closure at each wallet trust boundary.
+*/
+function canonicalizeAtomicBeef(bytes) {
+	const received = bytes instanceof Uint8Array ? _bsv_sdk.Beef.fromBinaryView(bytes) : _bsv_sdk.Beef.fromBinary(bytes);
+	const txid = received.atomicTxid;
+	if (txid == null || received.findTxid(txid) == null || received.isAtomic(txid)) return received;
+	return _bsv_sdk.Beef.fromBinary(received.toBinaryAtomic(txid));
+}
+//#endregion
 //#region ../src/signer/methods/internalizeAction.ts
 /**
 * Internalize Action allows a wallet to take ownership of outputs in a pre-existing transaction.
@@ -7886,7 +7903,7 @@ function mergePriorOptions(caVargs, saArgs) {
 */
 async function internalizeAction$1(wallet, auth, args) {
 	const vargs = _bsv_sdk.Validation.validateInternalizeActionArgs(args);
-	const { tx } = await validateAtomicBeef();
+	const { ab, tx, txid } = await validateAtomicBeef();
 	const brc29ProtocolID = [2, "3241645161d8"];
 	for (const o of vargs.outputs) {
 		if (o.outputIndex < 0 || o.outputIndex >= tx.outputs.length) throw new WERR_INVALID_PARAMETER("outputIndex", `a valid output index in range 0 to ${tx.outputs.length - 1}`);
@@ -7900,7 +7917,10 @@ async function internalizeAction$1(wallet, auth, args) {
 			default: throw new WERR_INTERNAL(`unexpected protocol ${o.protocol}`);
 		}
 	}
-	return await wallet.storage.internalizeAction(args);
+	return await wallet.storage.internalizeAction({
+		...args,
+		tx: ab.toBinaryAtomic(txid)
+	});
 	function setupWalletPaymentForOutput(o, _dargs) {
 		const p = o.paymentRemittance;
 		const output = tx.outputs[o.outputIndex];
@@ -7923,7 +7943,7 @@ async function internalizeAction$1(wallet, auth, args) {
 	* 2. That the proofs are for the same block as recorded in the wallet's configured storage in the event of a reorg.
 	*/
 	async function validateAtomicBeef() {
-		const ab = _bsv_sdk.Beef.fromBinary(vargs.tx);
+		const ab = canonicalizeAtomicBeef(vargs.tx);
 		if (!await ab.verify(await wallet.getServices().getChainTracker(), false) || !ab.atomicTxid) {
 			console.log(`internalizeAction beef is invalid: ${ab.toLogString()}`);
 			throw new WERR_INVALID_PARAMETER("tx", "valid AtomicBEEF");
@@ -8254,28 +8274,70 @@ function verifyActionBatchManifestDigest(manifest) {
 //#endregion
 //#region ../src/utility/beefForTxids.ts
 /**
-* Return the minimal subgraph needed to prove the requested transactions.
+* Return a minimal BEEF when the source contains data outside the requested
+* transaction dependency closure. Return undefined when no pruning is needed.
+*
+* This form lets forwarding clients retain the caller's original bytes in the
+* common no-op case instead of rebuilding and reserializing an equivalent BEEF.
+*/
+function pruneBeefForTxids(source, txids) {
+	const selection = selectTransactions(source, txids);
+	if (selection.transactions.size === source.txs.length && selection.bumpIndexes.size === source.bumps.length) return;
+	return copySelection(source, selection);
+}
+/**
+* Return an independent minimal BEEF needed to prove the requested transactions.
 *
-* Parents are added before children so the resulting BEEF preserves dependency
-* order. Shared ancestors and bumps are merged only once.
+* Transactions remain in source order and are sorted by Beef when serialized.
+* The source is indexed and walked once, using an explicit stack so a hostile
+* dependency depth cannot exhaust the JavaScript call stack.
 */
 function beefForTxids(source, txids) {
-	const beef = new _bsv_sdk.Beef();
+	return copySelection(source, selectTransactions(source, txids));
+}
+function selectTransactions(source, txids) {
+	const byTxid = /* @__PURE__ */ new Map();
+	for (const tx of source.txs) byTxid.set(tx.txid, tx);
+	const transactions = /* @__PURE__ */ new Set();
+	const bumpIndexes = /* @__PURE__ */ new Set();
 	const visited = /* @__PURE__ */ new Set();
-	const visit = (txid) => {
-		if (visited.has(txid)) return;
+	const stack = [...txids];
+	while (stack.length > 0) {
+		const txid = stack.pop();
+		if (txid == null || visited.has(txid)) continue;
 		visited.add(txid);
-		const sourceTx = source.findTxid(txid);
-		if (sourceTx == null) return;
-		if (sourceTx.tx != null) {
-			for (const input of sourceTx.tx.inputs) if (input.sourceTXID != null) visit(input.sourceTXID);
-		}
-		if (sourceTx.bumpIndex != null) beef.mergeBump(source.bumps[sourceTx.bumpIndex]);
-		beef.mergeBeefTx(sourceTx);
+		const tx = byTxid.get(txid);
+		if (tx == null) continue;
+		transactions.add(tx);
+		const bumpIndex = tx.bumpIndex;
+		if (bumpIndex != null && Number.isSafeInteger(bumpIndex) && bumpIndex >= 0 && bumpIndex < source.bumps.length) bumpIndexes.add(bumpIndex);
+		for (const inputTxid of tx.inputTxids) if (!visited.has(inputTxid)) stack.push(inputTxid);
+	}
+	return {
+		transactions,
+		bumpIndexes
 	};
-	for (const txid of txids) visit(txid);
+}
+function copySelection(source, selection) {
+	const beef = new _bsv_sdk.Beef(source.version);
+	const bumpIndexMap = /* @__PURE__ */ new Map();
+	for (let index = 0; index < source.bumps.length; index++) {
+		if (!selection.bumpIndexes.has(index)) continue;
+		bumpIndexMap.set(index, beef.bumps.length);
+		beef.bumps.push(cloneMerklePath(source.bumps[index]));
+	}
+	for (const sourceTx of source.txs) {
+		if (!selection.transactions.has(sourceTx)) continue;
+		const bumpIndex = sourceTx.bumpIndex == null ? void 0 : bumpIndexMap.get(sourceTx.bumpIndex);
+		const rawTx = sourceTx.rawTxUint8Array;
+		const copy = rawTx == null ? _bsv_sdk.BeefTx.fromTxid(sourceTx.txid, bumpIndex) : new _bsv_sdk.BeefTx(Uint8Array.from(rawTx), bumpIndex, Array.from(sourceTx.inputTxids));
+		beef.txs.push(copy);
+	}
 	return beef;
 }
+function cloneMerklePath(source) {
+	return new _bsv_sdk.MerklePath(source.blockHeight, source.path.map((level) => level.map((leaf) => ({ ...leaf }))), false, false);
+}
 //#endregion
 //#region ../src/storage/methods/offsetKey.ts
 function keyOffsetToHashedSecret(pub, keyOffset) {
@@ -10973,7 +11035,7 @@ function validateRequiredOutputs(storage, userId, vargs) {
 * @returns {xinputs} extended validated required inputs.
 */
 async function validateRequiredInputs(storage, userId, vargs) {
-	const beef = new _bsv_sdk.Beef();
+	let beef = new _bsv_sdk.Beef();
 	if (vargs.inputs.length === 0) return {
 		storageBeef: beef,
 		beef,
@@ -10999,6 +11061,7 @@ async function validateRequiredInputs(storage, userId, vargs) {
 		inputsByTxid[input.outpoint.txid] ||= [];
 		inputsByTxid[input.outpoint.txid].push(input);
 	}
+	beef = beefForTxids(beef, Object.keys(inputsByTxid));
 	const localKnownInputTxids = {};
 	for (const [txid, txInputs] of Object.entries(inputsByTxid)) localKnownInputTxids[txid] = txInputs.every((input) => {
 		const output = preloadedOutputsByOutpoint[`${input.outpoint.txid}.${input.outpoint.vout}`];
@@ -12413,7 +12476,7 @@ var InternalizeActionContext = class {
 	* @returns
 	*/
 	async validateAtomicBeef(atomicBeef) {
-		const ab = atomicBeef instanceof Uint8Array ? _bsv_sdk.Beef.fromBinaryView(atomicBeef) : _bsv_sdk.Beef.fromBinary(atomicBeef);
+		const ab = canonicalizeAtomicBeef(atomicBeef);
 		if (!await ab.verify(await this.storage.getServices().getChainTracker(), false) || !ab.atomicTxid) throw new WERR_INVALID_PARAMETER("tx", "valid AtomicBEEF");
 		const txid = ab.atomicTxid;
 		const btx = ab.findTxid(txid);
@@ -15260,11 +15323,19 @@ var StorageProvider = class StorageProvider extends StorageReaderWriter {
 		return await this.updateOutput(output.outputId, { basketId: void 0 });
 	}
 	async processSyncChunk(args, chunk) {
-		const user = verifyTruthy(await this.findUserByIdentityKey(args.identityKey));
-		return await new EntitySyncState(verifyOne(await this.findSyncStates({ partial: {
-			storageIdentityKey: args.fromStorageIdentityKey,
-			userId: user.userId
-		} }))).processSyncChunk(this, args, chunk);
+		return await this.transaction(async (trx) => {
+			const user = verifyTruthy(verifyOneOrNone(await this.findUsers({
+				partial: { identityKey: args.identityKey },
+				trx
+			})));
+			return await new EntitySyncState(verifyOne(await this.findSyncStates({
+				partial: {
+					storageIdentityKey: args.fromStorageIdentityKey,
+					userId: user.userId
+				},
+				trx
+			}))).processSyncChunk(this, args, chunk, trx);
+		});
 	}
 	/**
 	* Handles storage changes when a valid MerklePath and mined block header are found for a ProvenTxReq txid.
@@ -17329,8 +17400,10 @@ var StorageIdb = class extends StorageProvider {
 			await tx.done;
 			return r;
 		} catch (err) {
-			tx.abort();
-			await tx.done;
+			try {
+				tx.abort();
+				await tx.done;
+			} catch {}
 			throw err;
 		}
 	}
@@ -18297,6 +18370,25 @@ var StorageClientBase = class {
 	* @returns `StorageCreateActionResults` supporting additional wallet processing to yield `createAction` results.
 	*/
 	async createAction(auth, args) {
+		if (args.inputBEEF != null) if (args.inputs.length === 0) args = {
+			...args,
+			inputBEEF: void 0
+		};
+		else {
+			let source;
+			try {
+				source = _bsv_sdk.Beef.fromBinary(args.inputBEEF);
+			} catch {
+				source = void 0;
+			}
+			if (source != null) {
+				const pruned = pruneBeefForTxids(source, args.inputs.map((input) => input.outpoint.txid));
+				if (pruned != null) args = {
+					...args,
+					inputBEEF: pruned.toBinary()
+				};
+			}
+		}
 		return await this.rpcCall("createAction", [auth, args]);
 	}
 	/**
@@ -30967,6 +31059,7 @@ var SetupClient = class SetupClient {
 };
 //#endregion
 //#region ../src/CWIStyleWalletManager.ts
+const CWI_COMPONENT = "wallet-toolbox.cwi-manager";
 /**
 * Number of rounds used in PBKDF2 for deriving password keys.
 */
@@ -31199,11 +31292,11 @@ var OverlayUMPTokenInteractor = class {
 	* @param hash The 32-byte SHA-256 hash of the presentation key.
 	* @returns A UMPToken object (including currentOutpoint) if found, otherwise undefined.
 	*/
-	async findByPresentationKeyHash(hash) {
-		return await this.findToken({
+	async findByPresentationKeyHash(hash, options) {
+		return this.findToken({
 			service: "ls_users",
 			query: { presentationHash: _bsv_sdk.Utils.toHex(hash) }
-		}, "presentation");
+		}, "presentation", options);
 	}
 	/**
 	* Finds a UMP token on-chain by the given recovery key hash, if it exists.
@@ -31212,13 +31305,13 @@ var OverlayUMPTokenInteractor = class {
 	* @param hash The 32-byte SHA-256 hash of the recovery key.
 	* @returns A UMPToken object (including currentOutpoint) if found, otherwise undefined.
 	*/
-	async findByRecoveryKeyHash(hash) {
-		return await this.findToken({
+	async findByRecoveryKeyHash(hash, options) {
+		return this.findToken({
 			service: "ls_users",
 			query: { recoveryHash: _bsv_sdk.Utils.toHex(hash) }
-		}, "recovery");
+		}, "recovery", options);
 	}
-	async findToken(question, lookupKind) {
+	async findToken(question, lookupKind, options) {
 		const correlationId = this.telemetry.enabled === true ? this.telemetry.createCorrelationId() : void 0;
 		const startedAt = Date.now();
 		this.telemetry.capture({
@@ -31235,34 +31328,39 @@ var OverlayUMPTokenInteractor = class {
 				correlationId
 			});
 		} catch (error) {
-			const diagnostics = this.emptyLookupDiagnostics(correlationId);
-			this.captureLookupFailure(lookupKind, "lookup-unavailable", diagnostics, startedAt, error);
+			const diagnostics = this.emptyStats(correlationId);
+			this.lookupFailed(lookupKind, "lookup-unavailable", diagnostics, startedAt, error);
 			throw new UMPTokenLookupError("lookup-unavailable", diagnostics, { cause: error });
 		}
-		const diagnostics = this.toLookupDiagnostics(resolution);
+		const diagnostics = this.diagnosticsFor(resolution);
 		const tokens = this.parseLookupAnswers(resolution.answer);
 		const expectedHash = question.query[lookupKind === "presentation" ? "presentationHash" : "recoveryHash"].toLowerCase();
 		const matchingTokens = tokens.filter((token) => _bsv_sdk.Utils.toHex(lookupKind === "presentation" ? token.presentationHash : token.recoveryHash).toLowerCase() === expectedHash);
 		if (matchingTokens.length > 1) {
 			const newest = this.resolveNewestToken(matchingTokens, resolution.answer.outputs);
 			if (newest != null) {
-				this.captureLookupCompleted(lookupKind, "found", diagnostics, startedAt, { supersededTokens: matchingTokens.length - 1 });
+				this.lookupDone(lookupKind, "found", diagnostics, startedAt, { supersededTokens: matchingTokens.length - 1 });
 				return newest;
 			}
+			const pinned = options?.pinnedOutpoint ? matchingTokens.find((token) => token.currentOutpoint === options.pinnedOutpoint) : void 0;
+			if (pinned != null) {
+				this.lookupDone(lookupKind, "found", diagnostics, startedAt);
+				return pinned;
+			}
 			const reason = "token-ambiguous";
-			this.captureLookupFailure(lookupKind, reason, diagnostics, startedAt);
+			this.lookupFailed(lookupKind, reason, diagnostics, startedAt);
 			throw new UMPTokenLookupError(reason, diagnostics);
 		}
 		if (matchingTokens.length === 1) {
-			this.captureLookupCompleted(lookupKind, "found", diagnostics, startedAt);
+			this.lookupDone(lookupKind, "found", diagnostics, startedAt);
 			return matchingTokens[0];
 		}
 		if (resolution.progress.emptyHosts > 0) {
-			this.captureLookupCompleted(lookupKind, "not-found", diagnostics, startedAt);
+			this.lookupDone(lookupKind, "not-found", diagnostics, startedAt);
 			return;
 		}
 		const reason = resolution.answer.outputs.length > 0 ? "token-malformed" : "lookup-incomplete";
-		this.captureLookupFailure(lookupKind, reason, diagnostics, startedAt);
+		this.lookupFailed(lookupKind, reason, diagnostics, startedAt);
 		throw new UMPTokenLookupError(reason, diagnostics);
 	}
 	/**
@@ -31293,7 +31391,7 @@ var OverlayUMPTokenInteractor = class {
 				spent: /* @__PURE__ */ new Set()
 			};
 			evidence.txs.push(tx);
-			this.collectSpentOutpoints(tx, evidence.spent, /* @__PURE__ */ new Set());
+			this.collectSpends(tx, evidence.spent, /* @__PURE__ */ new Set());
 			evidenceByCandidate.set(outpoint, evidence);
 		} catch {}
 		if (evidenceByCandidate.size !== candidates.size) return void 0;
@@ -31302,7 +31400,7 @@ var OverlayUMPTokenInteractor = class {
 		const provenContinuations = survivors.filter((outpoint) => {
 			const evidence = evidenceByCandidate.get(outpoint);
 			const token = candidates.get(outpoint);
-			return evidence != null && token != null && evidence.txs.some((tx) => this.consumesSameIdentityToken(tx, token));
+			return evidence != null && token != null && evidence.txs.some((tx) => this.consumesIdentity(tx, token));
 		});
 		if (provenContinuations.length !== 1) return void 0;
 		return candidates.get(provenContinuations[0]);
@@ -31313,7 +31411,7 @@ var OverlayUMPTokenInteractor = class {
 	* hash — on-chain proof that the candidate is an update of a same-identity
 	* predecessor rather than an independently minted token.
 	*/
-	consumesSameIdentityToken(tx, token) {
+	consumesIdentity(tx, token) {
 		const presentationHash = _bsv_sdk.Utils.toHex(token.presentationHash);
 		const recoveryHash = _bsv_sdk.Utils.toHex(token.recoveryHash);
 		for (const input of tx.inputs) {
@@ -31339,7 +31437,7 @@ var OverlayUMPTokenInteractor = class {
 	* renditions are absent from the lookup answer. Iterative so arbitrarily
 	* long update chains cannot exhaust the call stack.
 	*/
-	collectSpentOutpoints(tx, spent, visited) {
+	collectSpends(tx, spent, visited) {
 		const pending = [tx];
 		while (pending.length > 0) {
 			const current = pending.pop();
@@ -31354,7 +31452,7 @@ var OverlayUMPTokenInteractor = class {
 			}
 		}
 	}
-	emptyLookupDiagnostics(correlationId) {
+	emptyStats(correlationId) {
 		return {
 			hostCount: 0,
 			completedHosts: 0,
@@ -31367,7 +31465,7 @@ var OverlayUMPTokenInteractor = class {
 			...correlationId !== void 0 ? { correlationId } : {}
 		};
 	}
-	toLookupDiagnostics(resolution) {
+	diagnosticsFor(resolution) {
 		const progress = resolution.progress;
 		return {
 			hostCount: progress.hostCount,
@@ -31381,7 +31479,7 @@ var OverlayUMPTokenInteractor = class {
 			...progress.correlationId !== void 0 ? { correlationId: progress.correlationId } : {}
 		};
 	}
-	lookupDiagnosticAttributes(diagnostics) {
+	lookupAttrs(diagnostics) {
 		return {
 			hostCount: diagnostics.hostCount,
 			completedHosts: diagnostics.completedHosts,
@@ -31393,7 +31491,7 @@ var OverlayUMPTokenInteractor = class {
 			outputCount: diagnostics.outputCount
 		};
 	}
-	captureLookupCompleted(lookupKind, result, diagnostics, startedAt, extraAttributes = {}) {
+	lookupDone(lookupKind, result, diagnostics, startedAt, extraAttributes = {}) {
 		this.telemetry.capture({
 			name: "wallet-toolbox.ump.lookup.completed",
 			component: "wallet-toolbox.ump",
@@ -31403,12 +31501,12 @@ var OverlayUMPTokenInteractor = class {
 				lookupKind,
 				result,
 				durationMs: Date.now() - startedAt,
-				...this.lookupDiagnosticAttributes(diagnostics),
+				...this.lookupAttrs(diagnostics),
 				...extraAttributes
 			}
 		});
 	}
-	captureLookupFailure(lookupKind, reason, diagnostics, startedAt, error) {
+	lookupFailed(lookupKind, reason, diagnostics, startedAt, error) {
 		this.telemetry.capture({
 			name: "wallet-toolbox.ump.lookup.indeterminate",
 			component: "wallet-toolbox.ump",
@@ -31418,7 +31516,7 @@ var OverlayUMPTokenInteractor = class {
 				lookupKind,
 				reason,
 				durationMs: Date.now() - startedAt,
-				...this.lookupDiagnosticAttributes(diagnostics)
+				...this.lookupAttrs(diagnostics)
 			},
 			error
 		});
@@ -31436,27 +31534,27 @@ var OverlayUMPTokenInteractor = class {
 	* @returns The outpoint of the newly created UMP token (e.g. "abcd1234...ef.0").
 	*/
 	async buildAndSend(wallet, adminOriginator, token, oldTokenToConsume) {
-		const fields = this.buildUMPTokenFields(token);
+		const fields = this.tokenFields(token);
 		const tokenOutput = [{
 			lockingScript: (await new _bsv_sdk.PushDrop(wallet, adminOriginator).lock(fields, [2, "admin user management token"], "1", "self", true, true)).toHex(),
 			satoshis: 1,
 			outputDescription: "New UMP token output"
 		}];
-		const { resolvedOldToken, inputToken } = await this.resolveOldTokenInput(oldTokenToConsume);
+		const { resolvedOldToken, inputToken } = await this.resolveOldInput(oldTokenToConsume);
 		const inputs = resolvedOldToken?.currentOutpoint ? [{
 			outpoint: resolvedOldToken.currentOutpoint,
 			unlockingScriptLength: 73,
 			inputDescription: "Consume old UMP token"
 		}] : [];
-		const createResult = await this.createUMPAction(wallet, adminOriginator, inputs, tokenOutput, inputToken, resolvedOldToken);
-		if (!createResult.signableTransaction) return await this.broadcastFinishedUMPAction(createResult);
+		const createResult = await this.createAction(wallet, adminOriginator, inputs, tokenOutput, inputToken, resolvedOldToken);
+		if (!createResult.signableTransaction) return this.broadcastFinal(createResult);
 		const reference = createResult.signableTransaction.reference;
 		const partialTx = _bsv_sdk.Transaction.fromBEEF(createResult.signableTransaction.tx);
-		if (resolvedOldToken?.currentOutpoint) return await this.signAndBroadcastWithOldToken(wallet, adminOriginator, reference, partialTx);
-		return await this.signAndBroadcastNewToken(wallet, adminOriginator, reference);
+		if (resolvedOldToken?.currentOutpoint) return this.renewToken(wallet, adminOriginator, reference, partialTx);
+		return this.broadcastNew(wallet, adminOriginator, reference);
 	}
 	/** Assembles the ordered number[][] fields array from a UMPToken. */
-	buildUMPTokenFields(token) {
+	tokenFields(token) {
 		const fields = [];
 		fields[0] = token.passwordSalt;
 		fields[1] = token.passwordPresentationPrimary;
@@ -31483,20 +31581,20 @@ var OverlayUMPTokenInteractor = class {
 		return fields;
 	}
 	/** Looks up the old token on the overlay; returns undefined resolved token if not found. */
-	async resolveOldTokenInput(oldTokenToConsume) {
+	async resolveOldInput(oldTokenToConsume) {
 		if (!oldTokenToConsume?.currentOutpoint) return {
 			resolvedOldToken: void 0,
 			inputToken: void 0
 		};
 		const inputToken = await this.findByOutpoint(oldTokenToConsume.currentOutpoint);
-		if (inputToken == null) throw new Error("The previous UMP token could not be resolved; refusing to publish a duplicate token.");
+		if (inputToken == null) throw new Error("Previous UMP token unavailable; update refused.");
 		return {
 			resolvedOldToken: oldTokenToConsume,
 			inputToken
 		};
 	}
 	/** Creates the UMP action without dropping a required old-token input on failure. */
-	async createUMPAction(wallet, adminOriginator, inputs, outputs, inputToken, resolvedOldToken) {
+	async createAction(wallet, adminOriginator, inputs, outputs, inputToken, resolvedOldToken) {
 		try {
 			return await wallet.createAction({
 				description: resolvedOldToken == null ? "Create new UMP token" : "Renew UMP token (consume old, create new)",
@@ -31523,43 +31621,43 @@ var OverlayUMPTokenInteractor = class {
 		}
 	}
 	/** Handles a fully-finalized (no signable tx) createAction result — broadcasts and returns outpoint. */
-	async broadcastFinishedUMPAction(createResult) {
+	async broadcastFinal(createResult) {
 		const finalTxid = createResult.txid || (createResult.tx != null ? _bsv_sdk.Transaction.fromAtomicBEEF(createResult.tx).id("hex") : void 0);
-		if (!finalTxid) throw new Error("No signableTransaction and no final TX found.");
-		if (createResult.tx == null) throw new Error("No final TX data to broadcast.");
+		if (!finalTxid) throw new Error("UMP transaction was not finalized.");
+		if (createResult.tx == null) throw new Error("UMP transaction data missing.");
 		const broadcastTx = _bsv_sdk.Transaction.fromAtomicBEEF(createResult.tx);
 		const result = await this.broadcaster.broadcast(broadcastTx);
-		this.assertSuccessfulBroadcast(result, "create-finalized");
+		this.assertBroadcast(result, "create-finalized");
 		return `${finalTxid}.0`;
 	}
 	/** Signs the old-token input and broadcasts — used during UMP token renewal. */
-	async signAndBroadcastWithOldToken(wallet, adminOriginator, reference, partialTx) {
+	async renewToken(wallet, adminOriginator, reference, partialTx) {
 		const unlockingScript = await new _bsv_sdk.PushDrop(wallet, adminOriginator).unlock([2, "admin user management token"], "1", "self").sign(partialTx, 0);
 		const signResult = await wallet.signAction({
 			reference,
 			spends: { 0: { unlockingScript: unlockingScript.toHex() } }
 		}, adminOriginator);
 		const finalTxid = signResult.txid || (signResult.tx == null ? "" : _bsv_sdk.Transaction.fromAtomicBEEF(signResult.tx).id("hex"));
-		if (!finalTxid) throw new Error("Could not finalize transaction for renewed UMP token.");
-		if (signResult.tx == null) throw new Error("Final transaction data missing after signing renewed UMP token.");
+		if (!finalTxid) throw new Error("Could not finalize renewed UMP token.");
+		if (signResult.tx == null) throw new Error("Renewed UMP token transaction data missing.");
 		const result = await this.broadcaster.broadcast(_bsv_sdk.Transaction.fromAtomicBEEF(signResult.tx));
-		this.assertSuccessfulBroadcast(result, "renew");
+		this.assertBroadcast(result, "renew");
 		return `${finalTxid}.0`;
 	}
 	/** Signs without input spending and broadcasts — used when creating a brand-new UMP token. */
-	async signAndBroadcastNewToken(wallet, adminOriginator, reference) {
+	async broadcastNew(wallet, adminOriginator, reference) {
 		const signResult = await wallet.signAction({
 			reference,
 			spends: {}
 		}, adminOriginator);
 		const finalTxid = signResult.txid || (signResult.tx == null ? "" : _bsv_sdk.Transaction.fromAtomicBEEF(signResult.tx).id("hex"));
-		if (!finalTxid) throw new Error("Failed to finalize new UMP token transaction.");
-		if (signResult.tx == null) throw new Error("Final transaction data missing after signing new UMP token.");
+		if (!finalTxid) throw new Error("Could not finalize new UMP token.");
+		if (signResult.tx == null) throw new Error("New UMP token transaction data missing.");
 		const result = await this.broadcaster.broadcast(_bsv_sdk.Transaction.fromAtomicBEEF(signResult.tx));
-		this.assertSuccessfulBroadcast(result, "create");
+		this.assertBroadcast(result, "create");
 		return `${finalTxid}.0`;
 	}
-	assertSuccessfulBroadcast(result, operation) {
+	assertBroadcast(result, operation) {
 		const succeeded = result.status === "success";
 		this.telemetry.capture({
 			name: succeeded ? "wallet-toolbox.ump.broadcast.completed" : "wallet-toolbox.ump.broadcast.failed",
@@ -31588,12 +31686,12 @@ var OverlayUMPTokenInteractor = class {
 		if (answer.type !== "output-list" || answer.outputs.length === 0) return [];
 		const tokens = [];
 		for (const output of answer.outputs) {
-			const token = this.parseLookupOutput(output);
+			const token = this.parseOutput(output);
 			if (token != null) tokens.push(token);
 		}
 		return tokens;
 	}
-	parseLookupOutput(output) {
+	parseOutput(output) {
 		try {
 			const tx = _bsv_sdk.Transaction.fromBEEF(output.beef);
 			const txOutput = tx.outputs[output.outputIndex];
@@ -31643,14 +31741,14 @@ var OverlayUMPTokenInteractor = class {
 				correlationId
 			});
 		} catch (error) {
-			const diagnostics = this.emptyLookupDiagnostics(correlationId);
-			this.captureLookupFailure("outpoint", "lookup-unavailable", diagnostics, startedAt, error);
+			const diagnostics = this.emptyStats(correlationId);
+			this.lookupFailed("outpoint", "lookup-unavailable", diagnostics, startedAt, error);
 			throw new UMPTokenLookupError("lookup-unavailable", diagnostics, { cause: error });
 		}
 		if (resolution.answer.outputs.length === 0) {
 			if (resolution.progress.emptyHosts === 0) {
-				const diagnostics = this.toLookupDiagnostics(resolution);
-				this.captureLookupFailure("outpoint", "lookup-incomplete", diagnostics, startedAt);
+				const diagnostics = this.diagnosticsFor(resolution);
+				this.lookupFailed("outpoint", "lookup-incomplete", diagnostics, startedAt);
 				throw new UMPTokenLookupError("lookup-incomplete", diagnostics);
 			}
 			return;
@@ -31792,20 +31890,20 @@ var CWIStyleWalletManager = class {
 		if (this._initSnapshot !== void 0) {
 			this.telemetry.capture({
 				name: "wallet-toolbox.snapshot.initialization.started",
-				component: "wallet-toolbox.cwi-manager",
+				component: CWI_COMPONENT,
 				severity: "debug"
 			});
 			try {
 				await this.loadSnapshot(this._initSnapshot);
 				this.telemetry.capture({
 					name: "wallet-toolbox.snapshot.initialization.completed",
-					component: "wallet-toolbox.cwi-manager",
+					component: CWI_COMPONENT,
 					severity: "info"
 				});
 			} catch (error) {
 				this.telemetry.capture({
 					name: "wallet-toolbox.snapshot.initialization.failed",
-					component: "wallet-toolbox.cwi-manager",
+					component: CWI_COMPONENT,
 					severity: "error",
 					error
 				});
@@ -31814,9 +31912,11 @@ var CWIStyleWalletManager = class {
 		}
 	}
 	/**
-	* Provides the presentation key.
+	* Provides the presentation key. A WAB operator pin may be supplied by the
+	* authentication manager; normal lookup and lineage resolution always run
+	* before this ambiguity-only fallback.
 	*/
-	async providePresentationKey(key) {
+	async providePresentationKey(key, lookupOptions) {
 		if (this.authenticated) throw new Error("User is already authenticated");
 		if (this.authenticationMode === "recovery-key-and-password") throw new Error("Presentation key is not needed in this mode");
 		if (key.length !== 32 || key.some((byte) => !Number.isInteger(byte) || byte < 0 || byte > 255)) throw new TypeError("Presentation key must contain exactly 32 bytes.");
@@ -31825,17 +31925,17 @@ var CWIStyleWalletManager = class {
 		const startedAt = Date.now();
 		this.telemetry.capture({
 			name: "wallet-toolbox.authentication.account-lookup.started",
-			component: "wallet-toolbox.cwi-manager",
+			component: CWI_COMPONENT,
 			severity: "debug",
 			attributes: { lookupKind: "presentation" }
 		});
 		let token;
 		try {
-			token = await this.UMPTokenInteractor.findByPresentationKeyHash(hash);
+			token = await this.UMPTokenInteractor.findByPresentationKeyHash(hash, lookupOptions);
 		} catch (error) {
 			this.telemetry.capture({
 				name: "wallet-toolbox.authentication.account-lookup.failed",
-				component: "wallet-toolbox.cwi-manager",
+				component: CWI_COMPONENT,
 				severity: "warn",
 				attributes: {
 					lookupKind: "presentation",
@@ -31855,7 +31955,7 @@ var CWIStyleWalletManager = class {
 		}
 		this.telemetry.capture({
 			name: "wallet-toolbox.authentication.account-lookup.completed",
-			component: "wallet-toolbox.cwi-manager",
+			component: CWI_COMPONENT,
 			severity: "info",
 			attributes: {
 				lookupKind: "presentation",
@@ -31871,11 +31971,11 @@ var CWIStyleWalletManager = class {
 		if (this.authenticated) throw new Error("User is already authenticated");
 		if (this.authenticationMode === "presentation-key-and-recovery-key") throw new Error("Password is not needed in this mode");
 		if (this.authenticationFlow === "unknown") throw new Error("Determine account status with a presentation or recovery key before providing a password.");
-		if (this.authenticationFlow === "existing-user") await this.handleExistingUserPassword(password);
-		else await this.handleNewUserPassword(password);
+		if (this.authenticationFlow === "existing-user") await this.unlockExisting(password);
+		else await this.createNewUser(password);
 	}
 	/** Handles the password step for an existing user — derives keys, sets up infrastructure. */
-	async handleExistingUserPassword(password) {
+	async unlockExisting(password) {
 		if (this.currentUMPToken == null) throw new Error("Provide presentation or recovery key first.");
 		const derivedPasswordKey = await derivePasswordKey(this.currentUMPToken, _bsv_sdk.Utils.toArray(password, "utf8"));
 		let rootPrimaryKey;
@@ -31888,11 +31988,11 @@ var CWIStyleWalletManager = class {
 			rootPrimaryKey = new _bsv_sdk.SymmetricKey(this.XOR(this.recoveryKey, derivedPasswordKey)).decrypt(this.currentUMPToken.passwordRecoveryPrimary);
 			rootPrivilegedKey = new _bsv_sdk.SymmetricKey(this.XOR(rootPrimaryKey, derivedPasswordKey)).decrypt(this.currentUMPToken.passwordPrimaryPrivileged);
 		}
-		await this.setupRootInfrastructure(rootPrimaryKey, rootPrivilegedKey);
+		await this.setupRoot(rootPrimaryKey, rootPrivilegedKey);
 		await this.switchProfile(this.activeProfileId);
 	}
 	/** Handles the password step for a new user — generates keys, builds UMP token, publishes on-chain. */
-	async handleNewUserPassword(password) {
+	async createNewUser(password) {
 		if (this.authenticationMode !== "presentation-key-and-password") throw new Error("New-user flow requires presentation key and password mode.");
 		if (this.presentationKey == null) throw new Error("No presentation key provided for new-user flow.");
 		const recoveryKey = (0, _bsv_sdk.Random)(32);
@@ -31931,14 +32031,14 @@ var CWIStyleWalletManager = class {
 			passwordKdf: this.kdfConfig
 		};
 		this.currentUMPToken = newToken;
-		await this.setupRootInfrastructure(rootPrimaryKey);
+		await this.setupRoot(rootPrimaryKey);
 		await this.switchProfile(DEFAULT_PROFILE_ID);
 		if (this.newWalletFunder != null && this.underlying != null) try {
 			await this.newWalletFunder(this.presentationKey, this.underlying, this.adminOriginator);
 		} catch (error) {
 			this.telemetry.capture({
 				name: "wallet-toolbox.authentication.new-wallet-funding.failed",
-				component: "wallet-toolbox.cwi-manager",
+				component: CWI_COMPONENT,
 				severity: "error",
 				error: /* @__PURE__ */ new Error("New wallet funding failed.")
 			});
@@ -31969,7 +32069,7 @@ var CWIStyleWalletManager = class {
 			const xorKey = this.XOR(this.presentationKey, recoveryKey);
 			const rootPrimaryKey = new _bsv_sdk.SymmetricKey(xorKey).decrypt(this.currentUMPToken.presentationRecoveryPrimary);
 			const rootPrivilegedKey = new _bsv_sdk.SymmetricKey(xorKey).decrypt(this.currentUMPToken.presentationRecoveryPrivileged);
-			await this.setupRootInfrastructure(rootPrimaryKey, rootPrivilegedKey);
+			await this.setupRoot(rootPrimaryKey, rootPrivilegedKey);
 			await this.switchProfile(this.activeProfileId);
 		}
 	}
@@ -32000,7 +32100,7 @@ var CWIStyleWalletManager = class {
 		if (snapshot.length > 16777216) throw new Error("Snapshot exceeds the maximum supported size.");
 		this.telemetry.capture({
 			name: "wallet-toolbox.snapshot.saved",
-			component: "wallet-toolbox.cwi-manager",
+			component: CWI_COMPONENT,
 			severity: "info",
 			attributes: {
 				formatVersion: 2,
@@ -32038,12 +32138,12 @@ var CWIStyleWalletManager = class {
 			const tokenBytes = payloadReader.read(tokenLen);
 			const token = this.deserializeUMPToken(tokenBytes);
 			this.currentUMPToken = token;
-			await this.setupRootInfrastructure(rootPrimaryKey);
+			await this.setupRoot(rootPrimaryKey);
 			await this.switchProfile(activeProfileId);
 			this.authenticationFlow = "existing-user";
 			this.telemetry.capture({
 				name: "wallet-toolbox.snapshot.loaded",
-				component: "wallet-toolbox.cwi-manager",
+				component: CWI_COMPONENT,
 				severity: "info",
 				attributes: {
 					formatVersion: version,
@@ -32054,7 +32154,7 @@ var CWIStyleWalletManager = class {
 			this.destroy();
 			this.telemetry.capture({
 				name: "wallet-toolbox.snapshot.load-failed",
-				component: "wallet-toolbox.cwi-manager",
+				component: CWI_COMPONENT,
 				severity: "error",
 				error
 			});
@@ -32071,7 +32171,7 @@ var CWIStyleWalletManager = class {
 		if (refreshed == null) return false;
 		if (refreshed.currentOutpoint && currentToken.currentOutpoint && refreshed.currentOutpoint === currentToken.currentOutpoint) return false;
 		this.currentUMPToken = refreshed;
-		await this.setupRootInfrastructure(this.rootPrimaryKey);
+		await this.setupRoot(this.rootPrimaryKey);
 		this.saveSnapshot();
 		return true;
 	}
@@ -32130,7 +32230,7 @@ var CWIStyleWalletManager = class {
 			createdAt: Math.floor(Date.now() / 1e3)
 		};
 		this.profiles.push(newProfile);
-		await this.updateAuthFactors(this.currentUMPToken.passwordSalt, await this.getFactor("passwordKey"), await this.getFactor("presentationKey"), await this.getFactor("recoveryKey"), this.rootPrimaryKey, await this.getFactor("privilegedKey"), this.profiles);
+		await this.updateFactors(this.currentUMPToken.passwordSalt, await this.getFactor("passwordKey"), await this.getFactor("presentationKey"), await this.getFactor("recoveryKey"), this.rootPrimaryKey, await this.getFactor("privilegedKey"), this.profiles);
 		return newProfile.id;
 	}
 	/**
@@ -32147,7 +32247,7 @@ var CWIStyleWalletManager = class {
 		if (profileIndex === -1) throw new Error("Profile not found.");
 		this.profiles.splice(profileIndex, 1);
 		if (this.activeProfileId.every((x, i) => x === profileId[i])) await this.switchProfile(DEFAULT_PROFILE_ID);
-		await this.updateAuthFactors(this.currentUMPToken.passwordSalt, await this.getFactor("passwordKey"), await this.getFactor("presentationKey"), await this.getFactor("recoveryKey"), this.rootPrimaryKey, await this.getFactor("privilegedKey"), this.profiles);
+		await this.updateFactors(this.currentUMPToken.passwordSalt, await this.getFactor("passwordKey"), await this.getFactor("presentationKey"), await this.getFactor("recoveryKey"), this.rootPrimaryKey, await this.getFactor("privilegedKey"), this.profiles);
 	}
 	/**
 	* Switches the active profile. This re-derives keys and rebuilds the underlying wallet.
@@ -32188,14 +32288,14 @@ var CWIStyleWalletManager = class {
 		const recoveryKey = await this.getFactor("recoveryKey");
 		const presentationKey = await this.getFactor("presentationKey");
 		const rootPrivilegedKey = await this.getFactor("privilegedKey");
-		await this.updateAuthFactors(passwordSalt, newPasswordKey, presentationKey, recoveryKey, this.rootPrimaryKey, rootPrivilegedKey, this.profiles);
+		await this.updateFactors(passwordSalt, newPasswordKey, presentationKey, recoveryKey, this.rootPrimaryKey, rootPrivilegedKey, this.profiles);
 	}
 	/**
 	* Retrieves the current recovery key. Requires privileged access.
 	*/
 	async getRecoveryKey() {
 		if (!this.authenticated || this.currentUMPToken == null || this.rootPrivilegedKeyManager == null) throw new Error("Not authenticated or missing required data.");
-		return await this.getFactor("recoveryKey");
+		return this.getFactor("recoveryKey");
 	}
 	/**
 	* Changes the user's recovery key. Prompts user to save the new key.
@@ -32207,7 +32307,7 @@ var CWIStyleWalletManager = class {
 		const rootPrivilegedKey = await this.getFactor("privilegedKey");
 		const newRecoveryKey = (0, _bsv_sdk.Random)(32);
 		await this.recoveryKeySaver(newRecoveryKey);
-		await this.updateAuthFactors(this.currentUMPToken.passwordSalt, passwordKey, presentationKey, newRecoveryKey, this.rootPrimaryKey, rootPrivilegedKey, this.profiles);
+		await this.updateFactors(this.currentUMPToken.passwordSalt, passwordKey, presentationKey, newRecoveryKey, this.rootPrimaryKey, rootPrivilegedKey, this.profiles);
 	}
 	/**
 	* Changes the user's presentation key.
@@ -32218,7 +32318,7 @@ var CWIStyleWalletManager = class {
 		const recoveryKey = await this.getFactor("recoveryKey");
 		const passwordKey = await this.getFactor("passwordKey");
 		const rootPrivilegedKey = await this.getFactor("privilegedKey");
-		await this.updateAuthFactors(this.currentUMPToken.passwordSalt, passwordKey, newPresentationKey, recoveryKey, this.rootPrimaryKey, rootPrivilegedKey, this.profiles);
+		await this.updateFactors(this.currentUMPToken.passwordSalt, passwordKey, newPresentationKey, recoveryKey, this.rootPrimaryKey, rootPrivilegedKey, this.profiles);
 		if (this.presentationKey != null) this.presentationKey = newPresentationKey;
 	}
 	/**
@@ -32264,7 +32364,7 @@ var CWIStyleWalletManager = class {
 		} catch (error) {
 			this.telemetry.capture({
 				name: "wallet-toolbox.authentication.factor-decryption.failed",
-				component: "wallet-toolbox.cwi-manager",
+				component: CWI_COMPONENT,
 				severity: "error",
 				attributes: { factor: factorName },
 				error
@@ -32277,7 +32377,7 @@ var CWIStyleWalletManager = class {
 	* Recomputes UMP token fields with updated factors and profiles, then publishes the update.
 	* This operation requires the *root* privileged key and the *default* profile wallet.
 	*/
-	async updateAuthFactors(passwordSalt, passwordKey, presentationKey, recoveryKey, rootPrimaryKey, rootPrivilegedKey, profiles) {
+	async updateFactors(passwordSalt, passwordKey, presentationKey, recoveryKey, rootPrimaryKey, rootPrivilegedKey, profiles) {
 		if (!this.authenticated || this.rootPrimaryKey == null || this.currentUMPToken == null) throw new Error("Wallet is not properly authenticated or missing data for update.");
 		const oldTokenToConsume = { ...this.currentUMPToken };
 		if (!oldTokenToConsume.currentOutpoint) throw new Error("Cannot update UMP token: Old token has no outpoint.");
@@ -32328,7 +32428,7 @@ var CWIStyleWalletManager = class {
 		if (!currentActiveId.every((x) => x === 0)) {
 			this.telemetry.capture({
 				name: "wallet-toolbox.ump.profile-switch.started",
-				component: "wallet-toolbox.cwi-manager",
+				component: CWI_COMPONENT,
 				severity: "debug",
 				attributes: { reason: "token-update" }
 			});
@@ -32344,7 +32444,7 @@ var CWIStyleWalletManager = class {
 				await this.switchProfile(currentActiveId);
 				this.telemetry.capture({
 					name: "wallet-toolbox.ump.profile-switch.completed",
-					component: "wallet-toolbox.cwi-manager",
+					component: CWI_COMPONENT,
 					severity: "debug",
 					attributes: { reason: "token-update" }
 				});
@@ -32471,9 +32571,9 @@ var CWIStyleWalletManager = class {
 	* @param rootPrimaryKey      The user's root primary key (32 bytes).
 	* @param ephemeralRootPrivilegedKey Optional root privileged key (e.g., during recovery flows).
 	*/
-	async setupRootInfrastructure(rootPrimaryKey, ephemeralRootPrivilegedKey) {
+	async setupRoot(rootKey, ephemeralRootPrivilegedKey) {
 		if (this.currentUMPToken == null) throw new Error("A UMP token must exist before setting up root infrastructure!");
-		this.rootPrimaryKey = rootPrimaryKey;
+		this.rootPrimaryKey = rootKey;
 		let oneTimePrivilegedKey = ephemeralRootPrivilegedKey == null ? void 0 : new _bsv_sdk.PrivateKey(ephemeralRootPrivilegedKey);
 		this.rootPrivilegedKeyManager = new PrivilegedKeyManager(async (reason) => {
 			if (oneTimePrivilegedKey != null) {
@@ -32494,7 +32594,7 @@ var CWIStyleWalletManager = class {
 		});
 		this.profiles = [];
 		if (this.currentUMPToken.profilesEncrypted != null && this.currentUMPToken.profilesEncrypted.length > 0) try {
-			const decryptedProfileBytes = new _bsv_sdk.SymmetricKey(rootPrimaryKey).decrypt(this.currentUMPToken.profilesEncrypted);
+			const decryptedProfileBytes = new _bsv_sdk.SymmetricKey(rootKey).decrypt(this.currentUMPToken.profilesEncrypted);
 			const profilesJson = _bsv_sdk.Utils.toUTF8(decryptedProfileBytes);
 			const profiles = JSON.parse(profilesJson);
 			if (!Array.isArray(profiles) || profiles.length > 1e3 || !profiles.every(isValidProfile)) throw new Error("Decrypted profile data is invalid or exceeds supported bounds.");
@@ -32503,7 +32603,7 @@ var CWIStyleWalletManager = class {
 			this.profiles = [];
 			this.telemetry.capture({
 				name: "wallet-toolbox.profile.load-failed",
-				component: "wallet-toolbox.cwi-manager",
+				component: CWI_COMPONENT,
 				severity: "error",
 				error
 			});
@@ -32512,98 +32612,98 @@ var CWIStyleWalletManager = class {
 		}
 		this.authenticated = true;
 	}
-	checkAuthAndUnderlying(originator) {
+	assertReady(originator) {
 		if (!this.authenticated) throw new Error("User is not authenticated.");
 		if (this.underlying == null) throw new Error("Underlying wallet for the active profile is not initialized.");
 		if (originator === this.adminOriginator) throw new Error("External applications are not allowed to use the admin originator.");
 	}
 	async getPublicKey(args, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.getPublicKey(args, originator);
+		this.assertReady(originator);
+		return this.underlying.getPublicKey(args, originator);
 	}
 	async revealCounterpartyKeyLinkage(args, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.revealCounterpartyKeyLinkage(args, originator);
+		this.assertReady(originator);
+		return this.underlying.revealCounterpartyKeyLinkage(args, originator);
 	}
 	async revealSpecificKeyLinkage(args, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.revealSpecificKeyLinkage(args, originator);
+		this.assertReady(originator);
+		return this.underlying.revealSpecificKeyLinkage(args, originator);
 	}
 	async encrypt(args, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.encrypt(args, originator);
+		this.assertReady(originator);
+		return this.underlying.encrypt(args, originator);
 	}
 	async decrypt(args, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.decrypt(args, originator);
+		this.assertReady(originator);
+		return this.underlying.decrypt(args, originator);
 	}
 	async createHmac(args, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.createHmac(args, originator);
+		this.assertReady(originator);
+		return this.underlying.createHmac(args, originator);
 	}
 	async verifyHmac(args, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.verifyHmac(args, originator);
+		this.assertReady(originator);
+		return this.underlying.verifyHmac(args, originator);
 	}
 	async createSignature(args, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.createSignature(args, originator);
+		this.assertReady(originator);
+		return this.underlying.createSignature(args, originator);
 	}
 	async verifySignature(args, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.verifySignature(args, originator);
+		this.assertReady(originator);
+		return this.underlying.verifySignature(args, originator);
 	}
 	async createAction(args, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.createAction(args, originator);
+		this.assertReady(originator);
+		return this.underlying.createAction(args, originator);
 	}
 	async signAction(args, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.signAction(args, originator);
+		this.assertReady(originator);
+		return this.underlying.signAction(args, originator);
 	}
 	async abortAction(args, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.abortAction(args, originator);
+		this.assertReady(originator);
+		return this.underlying.abortAction(args, originator);
 	}
 	async listActions(args, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.listActions(args, originator);
+		this.assertReady(originator);
+		return this.underlying.listActions(args, originator);
 	}
 	async internalizeAction(args, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.internalizeAction(args, originator);
+		this.assertReady(originator);
+		return this.underlying.internalizeAction(args, originator);
 	}
 	async listOutputs(args, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.listOutputs(args, originator);
+		this.assertReady(originator);
+		return this.underlying.listOutputs(args, originator);
 	}
 	async relinquishOutput(args, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.relinquishOutput(args, originator);
+		this.assertReady(originator);
+		return this.underlying.relinquishOutput(args, originator);
 	}
 	async acquireCertificate(args, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.acquireCertificate(args, originator);
+		this.assertReady(originator);
+		return this.underlying.acquireCertificate(args, originator);
 	}
 	async listCertificates(args, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.listCertificates(args, originator);
+		this.assertReady(originator);
+		return this.underlying.listCertificates(args, originator);
 	}
 	async proveCertificate(args, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.proveCertificate(args, originator);
+		this.assertReady(originator);
+		return this.underlying.proveCertificate(args, originator);
 	}
 	async relinquishCertificate(args, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.relinquishCertificate(args, originator);
+		this.assertReady(originator);
+		return this.underlying.relinquishCertificate(args, originator);
 	}
 	async discoverByIdentityKey(args, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.discoverByIdentityKey(args, originator);
+		this.assertReady(originator);
+		return this.underlying.discoverByIdentityKey(args, originator);
 	}
 	async discoverByAttributes(args, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.discoverByAttributes(args, originator);
+		this.assertReady(originator);
+		return this.underlying.discoverByAttributes(args, originator);
 	}
 	async isAuthenticated(_, originator) {
 		if (!this.authenticated) throw new Error("User is not authenticated.");
@@ -32613,23 +32713,23 @@ var CWIStyleWalletManager = class {
 	async waitForAuthentication(_, originator) {
 		if (originator === this.adminOriginator) throw new Error("External applications are not allowed to use the admin originator.");
 		while (!this.authenticated || this.underlying == null) await new Promise((resolve) => setTimeout(resolve, 100));
-		return await this.underlying.waitForAuthentication({}, originator);
+		return this.underlying.waitForAuthentication({}, originator);
 	}
 	async getHeight(_, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.getHeight({}, originator);
+		this.assertReady(originator);
+		return this.underlying.getHeight({}, originator);
 	}
 	async getHeaderForHeight(args, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.getHeaderForHeight(args, originator);
+		this.assertReady(originator);
+		return this.underlying.getHeaderForHeight(args, originator);
 	}
 	async getNetwork(_, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.getNetwork({}, originator);
+		this.assertReady(originator);
+		return this.underlying.getNetwork({}, originator);
 	}
 	async getVersion(_, originator) {
-		this.checkAuthAndUnderlying(originator);
-		return await this.underlying.getVersion({}, originator);
+		this.assertReady(originator);
+		return this.underlying.getVersion({}, originator);
 	}
 };
 //#endregion
@@ -32973,6 +33073,8 @@ const DEFAULT_MAX_RESPONSE_BYTES = 1024 * 1024;
 const MAX_CONFIGURED_TIMEOUT_MS = 12e4;
 const MAX_CONFIGURED_REQUEST_BYTES = 10 * 1024 * 1024;
 const MAX_CONFIGURED_RESPONSE_BYTES = 10 * 1024 * 1024;
+const WAB_COMPONENT = "wallet-toolbox.wab-transport";
+const WAB_REQUEST_EVENT = "wallet-toolbox.wab.request.";
 const defaultFetch = typeof globalThis !== "undefined" && typeof globalThis.fetch === "function" ? globalThis.fetch.bind(globalThis) : void 0;
 /**
 * A privacy-safe WAB transport failure. Response bodies and request payloads
@@ -33011,8 +33113,8 @@ function normalizeServerUrl(serverUrl) {
 	} catch {
 		throw new WABClientError("WAB_INVALID_CONFIGURATION", "WAB server URL must be an absolute URL.", false);
 	}
-	if (parsed.username !== "" || parsed.password !== "" || parsed.search !== "" || parsed.hash !== "") throw new WABClientError("WAB_INVALID_CONFIGURATION", "WAB server URL must not contain credentials, a query, or a fragment.", false);
-	if (parsed.protocol !== "https:" && !(parsed.protocol === "http:" && isLocalHostname(parsed.hostname))) throw new WABClientError("WAB_INVALID_CONFIGURATION", "WAB server URL must use HTTPS. Plain HTTP is allowed only for localhost development.", false);
+	if (parsed.username !== "" || parsed.password !== "" || parsed.search !== "" || parsed.hash !== "") throw new WABClientError("WAB_INVALID_CONFIGURATION", "WAB URL cannot include credentials, query, or fragment.", false);
+	if (parsed.protocol !== "https:" && !(parsed.protocol === "http:" && isLocalHostname(parsed.hostname))) throw new WABClientError("WAB_INVALID_CONFIGURATION", "WAB URL requires HTTPS except on localhost.", false);
 	let pathname = parsed.pathname;
 	while (pathname.endsWith("/")) pathname = pathname.slice(0, -1);
 	return {
@@ -33022,7 +33124,7 @@ function normalizeServerUrl(serverUrl) {
 }
 function normalizePositiveInteger(value, fallback, maximum, name) {
 	const resolved = value ?? fallback;
-	if (!Number.isInteger(resolved) || resolved <= 0 || resolved > maximum) throw new WABClientError("WAB_INVALID_CONFIGURATION", `${name} must be a positive integer no greater than ${maximum}.`, false);
+	if (!Number.isInteger(resolved) || resolved <= 0 || resolved > maximum) throw new WABClientError("WAB_INVALID_CONFIGURATION", `${name} must be an integer from 1 to ${maximum}.`, false);
 	return resolved;
 }
 function assertSafePath(path) {
@@ -33047,20 +33149,20 @@ var WABTransport = class {
 	serverUrl;
 	serverOrigin;
 	telemetry;
-	fetchClient;
-	timeoutMs;
-	maxRequestBytes;
-	maxResponseBytes;
+	fetcher;
+	timeout;
+	requestLimit;
+	responseLimit;
 	constructor(serverUrl, options = {}) {
 		const normalized = normalizeServerUrl(serverUrl);
 		this.serverUrl = normalized.baseUrl;
 		this.serverOrigin = normalized.origin;
-		const fetchClient = options.fetch ?? defaultFetch;
-		if (typeof fetchClient !== "function") throw new WABClientError("WAB_INVALID_CONFIGURATION", "WABClient requires a fetch implementation.", false);
-		this.fetchClient = fetchClient;
-		this.timeoutMs = normalizePositiveInteger(options.timeoutMs, DEFAULT_TIMEOUT_MS, MAX_CONFIGURED_TIMEOUT_MS, "timeoutMs");
-		this.maxRequestBytes = normalizePositiveInteger(options.maxRequestBytes, DEFAULT_MAX_REQUEST_BYTES, MAX_CONFIGURED_REQUEST_BYTES, "maxRequestBytes");
-		this.maxResponseBytes = normalizePositiveInteger(options.maxResponseBytes, DEFAULT_MAX_RESPONSE_BYTES, MAX_CONFIGURED_RESPONSE_BYTES, "maxResponseBytes");
+		const fetcher = options.fetch ?? defaultFetch;
+		if (typeof fetcher !== "function") throw new WABClientError("WAB_INVALID_CONFIGURATION", "WABClient requires a fetch implementation.", false);
+		this.fetcher = fetcher;
+		this.timeout = normalizePositiveInteger(options.timeoutMs, DEFAULT_TIMEOUT_MS, MAX_CONFIGURED_TIMEOUT_MS, "timeoutMs");
+		this.requestLimit = normalizePositiveInteger(options.maxRequestBytes, DEFAULT_MAX_REQUEST_BYTES, MAX_CONFIGURED_REQUEST_BYTES, "maxRequestBytes");
+		this.responseLimit = normalizePositiveInteger(options.maxResponseBytes, DEFAULT_MAX_RESPONSE_BYTES, MAX_CONFIGURED_RESPONSE_BYTES, "maxResponseBytes");
 		this.telemetry = new _bsv_sdk.Telemetry(options.telemetry);
 	}
 	createCorrelationId() {
@@ -33068,38 +33170,9 @@ var WABTransport = class {
 		return isSafeCorrelationId(correlationId) ? correlationId : new _bsv_sdk.Telemetry().createCorrelationId();
 	}
 	async request(path, options) {
-		const metadata = this.createRequestMetadata(path, options);
-		this.captureRequestStarted(metadata);
-		const body = this.encodeRequestBody(options, metadata);
-		const timeout = this.startRequestTimeout(metadata.errorContext);
-		const response = await this.fetchResponse(metadata, body, timeout);
-		const responseContext = this.createResponseContext(response, metadata);
-		this.assertSuccessfulResponse(response, responseContext, metadata, timeout);
-		const responseText = await this.readResponseText(response, responseContext, metadata, timeout);
-		const parsed = this.parseResponseObject(responseText, response, responseContext, metadata);
-		this.telemetry.capture({
-			name: "wallet-toolbox.wab.request.completed",
-			component: "wallet-toolbox.wab-transport",
-			severity: "info",
-			correlationId: metadata.correlationId,
-			attributes: {
-				operation: metadata.operation,
-				method: metadata.method,
-				route: metadata.path,
-				serverOrigin: this.serverOrigin,
-				status: response.status,
-				endpointMarkerPresent: responseContext.endpointMarkerPresent,
-				responseCorrelationMatched: responseContext.responseCorrelationMatched,
-				responseBytes: new TextEncoder().encode(responseText).byteLength,
-				durationMs: Date.now() - metadata.startedAt
-			}
-		});
-		return parsed;
-	}
-	createRequestMetadata(path, options) {
 		assertSafePath(path);
 		const correlationId = options.correlationId != null && isSafeCorrelationId(options.correlationId) ? options.correlationId : this.createCorrelationId();
-		return {
+		const metadata = {
 			method: options.method ?? "POST",
 			path,
 			operation: options.operation,
@@ -33111,46 +33184,73 @@ var WABTransport = class {
 				route: path
 			}
 		};
-	}
-	captureRequestStarted(metadata) {
 		this.telemetry.capture({
-			name: "wallet-toolbox.wab.request.started",
-			component: "wallet-toolbox.wab-transport",
+			name: `${WAB_REQUEST_EVENT}started`,
+			component: WAB_COMPONENT,
 			severity: "debug",
+			correlationId,
+			attributes: {
+				operation: metadata.operation,
+				method: metadata.method,
+				route: path,
+				serverOrigin: this.serverOrigin
+			}
+		});
+		const body = this.bodyFor(options, metadata);
+		const timeout = this.startTimer(metadata.errorContext);
+		const response = await this.fetch(metadata, body, timeout);
+		const responseContext = {
+			...metadata.errorContext,
+			endpointMarkerPresent: isWabResponse(response),
+			responseCorrelationMatched: response.headers.get("X-Correlation-ID") === correlationId
+		};
+		this.checkResponse(response, responseContext, metadata, timeout);
+		const responseText = await this.readText(response, responseContext, metadata, timeout);
+		const parsed = this.parse(responseText, response, responseContext, metadata);
+		this.telemetry.capture({
+			name: `${WAB_REQUEST_EVENT}completed`,
+			component: WAB_COMPONENT,
+			severity: "info",
 			correlationId: metadata.correlationId,
 			attributes: {
 				operation: metadata.operation,
 				method: metadata.method,
 				route: metadata.path,
-				serverOrigin: this.serverOrigin
+				serverOrigin: this.serverOrigin,
+				status: response.status,
+				endpointMarkerPresent: responseContext.endpointMarkerPresent,
+				responseCorrelationMatched: responseContext.responseCorrelationMatched,
+				responseBytes: new TextEncoder().encode(responseText).byteLength,
+				durationMs: Date.now() - metadata.startedAt
 			}
 		});
+		return parsed;
 	}
-	encodeRequestBody(options, metadata) {
+	bodyFor(options, metadata) {
 		let body;
 		try {
 			body = options.body === void 0 ? void 0 : JSON.stringify(options.body);
 		} catch (cause) {
-			const error = new WABClientError("WAB_INVALID_REQUEST", "WAB request payload could not be encoded.", false, void 0, {
+			const error = new WABClientError("WAB_INVALID_REQUEST", "WAB request encoding failed.", false, void 0, {
 				...metadata.errorContext,
 				cause
 			});
-			this.captureRequestFailure(metadata, error);
+			this.report(metadata, error);
 			throw error;
 		}
 		if (options.body !== void 0 && body === void 0) {
-			const error = new WABClientError("WAB_INVALID_REQUEST", "WAB request payload must be JSON-serializable.", false, void 0, metadata.errorContext);
-			this.captureRequestFailure(metadata, error);
+			const error = new WABClientError("WAB_INVALID_REQUEST", "WAB request is not JSON-serializable.", false, void 0, metadata.errorContext);
+			this.report(metadata, error);
 			throw error;
 		}
-		if (body != null && new TextEncoder().encode(body).byteLength > this.maxRequestBytes) {
-			const error = new WABClientError("WAB_REQUEST_TOO_LARGE", "WAB request exceeded the configured size limit.", false, void 0, metadata.errorContext);
-			this.captureRequestFailure(metadata, error);
+		if (body != null && new TextEncoder().encode(body).byteLength > this.requestLimit) {
+			const error = new WABClientError("WAB_REQUEST_TOO_LARGE", "WAB request exceeds its size limit.", false, void 0, metadata.errorContext);
+			this.report(metadata, error);
 			throw error;
 		}
 		return body;
 	}
-	startRequestTimeout(errorContext) {
+	startTimer(errorContext) {
 		const timeout = {
 			controller: new AbortController(),
 			timedOut: false
@@ -33160,12 +33260,12 @@ var WABTransport = class {
 				timeout.timedOut = true;
 				timeout.controller.abort();
 				reject(new WABClientError("WAB_TIMEOUT", "WAB request timed out.", true, void 0, errorContext));
-			}, this.timeoutMs);
+			}, this.timeout);
 		});
 		return timeout;
 	}
-	async fetchResponse(metadata, body, timeout) {
-		const requestPromise = Promise.resolve().then(() => this.fetchClient(`${this.serverUrl}${metadata.path}`, {
+	async fetch(metadata, body, timeout) {
+		const requestPromise = Promise.resolve().then(() => this.fetcher(`${this.serverUrl}${metadata.path}`, {
 			method: metadata.method,
 			headers: {
 				Accept: "application/json",
@@ -33189,33 +33289,26 @@ var WABTransport = class {
 				...metadata.errorContext,
 				cause
 			});
-			else error = new WABClientError("WAB_NETWORK_ERROR", "WAB request failed before receiving a response.", true, void 0, {
+			else error = new WABClientError("WAB_NETWORK_ERROR", "WAB request failed before response.", true, void 0, {
 				...metadata.errorContext,
 				cause
 			});
-			this.captureRequestFailure(metadata, error);
+			this.report(metadata, error);
 			throw error;
 		}
 	}
-	createResponseContext(response, metadata) {
-		return {
-			...metadata.errorContext,
-			endpointMarkerPresent: isWabResponse(response),
-			responseCorrelationMatched: response.headers.get("X-Correlation-ID") === metadata.correlationId
-		};
-	}
-	assertSuccessfulResponse(response, responseContext, metadata, timeout) {
+	checkResponse(response, responseContext, metadata, timeout) {
 		if (response.ok) return;
 		if (timeout.timer !== void 0) clearTimeout(timeout.timer);
 		const endpointMismatch = response.status === 404 && responseContext.endpointMarkerPresent !== true;
-		const error = new WABClientError(endpointMismatch ? "WAB_ENDPOINT_MISMATCH" : "WAB_HTTP_ERROR", endpointMismatch ? "Configured WAB endpoint did not return a compatible WAB response." : `WAB request failed with HTTP status ${response.status}.`, isRetryableStatus(response.status), response.status, responseContext);
-		this.captureRequestFailure(metadata, error);
+		const error = new WABClientError(endpointMismatch ? "WAB_ENDPOINT_MISMATCH" : "WAB_HTTP_ERROR", endpointMismatch ? "WAB endpoint is incompatible." : `WAB request failed with HTTP status ${response.status}.`, isRetryableStatus(response.status), response.status, responseContext);
+		this.report(metadata, error);
 		response.body?.cancel().catch(() => {});
 		throw error;
 	}
-	async readResponseText(response, responseContext, metadata, timeout) {
+	async readText(response, responseContext, metadata, timeout) {
 		try {
-			return await Promise.race([this.readBoundedResponse(response, responseContext), timeout.promise]);
+			return await Promise.race([this.read(response, responseContext), timeout.promise]);
 		} catch (cause) {
 			let error;
 			if (cause instanceof WABClientError) error = cause;
@@ -33223,17 +33316,17 @@ var WABTransport = class {
 				...responseContext,
 				cause
 			});
-			else error = new WABClientError("WAB_INVALID_RESPONSE", "WAB response could not be read.", true, response.status, {
+			else error = new WABClientError("WAB_INVALID_RESPONSE", "WAB response read failed.", true, response.status, {
 				...responseContext,
 				cause
 			});
-			this.captureRequestFailure(metadata, error);
+			this.report(metadata, error);
 			throw error;
 		} finally {
 			if (timeout.timer !== void 0) clearTimeout(timeout.timer);
 		}
 	}
-	parseResponseObject(responseText, response, responseContext, metadata) {
+	parse(responseText, response, responseContext, metadata) {
 		let parsed;
 		try {
 			parsed = JSON.parse(responseText);
@@ -33242,37 +33335,32 @@ var WABTransport = class {
 				...responseContext,
 				cause
 			});
-			this.captureRequestFailure(metadata, error);
+			this.report(metadata, error);
 			throw error;
 		}
 		if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
 			const error = new WABClientError("WAB_INVALID_RESPONSE", "WAB response must be a JSON object.", true, response.status, responseContext);
-			this.captureRequestFailure(metadata, error);
+			this.report(metadata, error);
 			throw error;
 		}
 		return parsed;
 	}
-	captureRequestFailure(metadata, error) {
-		this.captureFailure(metadata.operation, metadata.method, metadata.path, metadata.correlationId, metadata.startedAt, error);
-	}
-	async readBoundedResponse(response, responseContext) {
-		await this.rejectOversizedDeclaredResponse(response, responseContext);
-		const reader = response.body?.getReader();
-		if (reader == null) return await this.readBoundedArrayBuffer(response, responseContext);
-		return await this.readBoundedStream(reader, response, responseContext);
-	}
-	async rejectOversizedDeclaredResponse(response, responseContext) {
+	async read(response, responseContext) {
 		const contentLength = Number(response.headers.get("content-length"));
-		if (!Number.isFinite(contentLength) || contentLength <= this.maxResponseBytes) return;
-		await this.cancelResponseBody(response);
-		throw this.responseTooLargeError(response, responseContext);
+		if (Number.isFinite(contentLength) && contentLength > this.responseLimit) {
+			await this.stopBody(response);
+			throw this.sizeError(response, responseContext);
+		}
+		const reader = response.body?.getReader();
+		if (reader == null) return this.readBuffer(response, responseContext);
+		return this.readStream(reader, response, responseContext);
 	}
-	async readBoundedArrayBuffer(response, responseContext) {
+	async readBuffer(response, responseContext) {
 		const bytes = new Uint8Array(await response.arrayBuffer());
-		if (bytes.byteLength > this.maxResponseBytes) throw this.responseTooLargeError(response, responseContext);
+		if (bytes.byteLength > this.responseLimit) throw this.sizeError(response, responseContext);
 		return new TextDecoder().decode(bytes);
 	}
-	async readBoundedStream(reader, response, responseContext) {
+	async readStream(reader, response, responseContext) {
 		const chunks = [];
 		let total = 0;
 		while (true) {
@@ -33280,15 +33368,12 @@ var WABTransport = class {
 			if (done) break;
 			if (value == null) continue;
 			total += value.byteLength;
-			if (total > this.maxResponseBytes) {
-				await this.cancelResponseReader(reader);
-				throw this.responseTooLargeError(response, responseContext);
+			if (total > this.responseLimit) {
+				await this.stopReader(reader);
+				throw this.sizeError(response, responseContext);
 			}
 			chunks.push(value);
 		}
-		return this.decodeChunks(chunks, total);
-	}
-	decodeChunks(chunks, total) {
 		const bytes = new Uint8Array(total);
 		let offset = 0;
 		for (const chunk of chunks) {
@@ -33297,35 +33382,35 @@ var WABTransport = class {
 		}
 		return new TextDecoder().decode(bytes);
 	}
-	responseTooLargeError(response, responseContext) {
-		return new WABClientError("WAB_RESPONSE_TOO_LARGE", "WAB response exceeded the configured size limit.", false, response.status, responseContext);
+	sizeError(response, responseContext) {
+		return new WABClientError("WAB_RESPONSE_TOO_LARGE", "WAB response exceeds its size limit.", false, response.status, responseContext);
 	}
-	async cancelResponseBody(response) {
+	async stopBody(response) {
 		try {
 			await response.body?.cancel();
 		} catch {}
 	}
-	async cancelResponseReader(reader) {
+	async stopReader(reader) {
 		try {
 			await reader.cancel();
 		} catch {}
 	}
-	captureFailure(operation, method, path, correlationId, startedAt, error) {
+	report(metadata, error) {
 		this.telemetry.capture({
-			name: "wallet-toolbox.wab.request.failed",
-			component: "wallet-toolbox.wab-transport",
+			name: `${WAB_REQUEST_EVENT}failed`,
+			component: WAB_COMPONENT,
 			severity: error.retryable ? "warn" : "error",
-			correlationId,
+			correlationId: metadata.correlationId,
 			attributes: {
-				operation,
-				method,
-				route: path,
+				operation: metadata.operation,
+				method: metadata.method,
+				route: metadata.path,
 				serverOrigin: this.serverOrigin,
 				retryable: error.retryable,
 				...error.status !== void 0 ? { status: error.status } : {},
 				...error.endpointMarkerPresent !== void 0 ? { endpointMarkerPresent: error.endpointMarkerPresent } : {},
 				...error.responseCorrelationMatched !== void 0 ? { responseCorrelationMatched: error.responseCorrelationMatched } : {},
-				durationMs: Date.now() - startedAt
+				durationMs: Date.now() - metadata.startedAt
 			},
 			error
 		});
@@ -33434,8 +33519,8 @@ var WABClient = class {
 	constructor(serverUrl, options = {}) {
 		this.transport = new WABTransport(serverUrl, options);
 	}
-	async getInfo() {
-		return await this.transport.request("/info", {
+	getInfo() {
+		return this.transport.request("/info", {
 			method: "GET",
 			operation: "get-info"
 		});
@@ -33445,15 +33530,15 @@ var WABClient = class {
 	}
 	async startAuthMethod(authMethod, presentationKey, payload, correlationId) {
 		assertHexIdentifier(presentationKey, "presentationKey");
-		return await authMethod.startAuth(this.transport.serverUrl, presentationKey, payload, this.transport, correlationId);
+		return authMethod.startAuth(this.transport.serverUrl, presentationKey, payload, this.transport, correlationId);
 	}
 	async completeAuthMethod(authMethod, presentationKey, payload, correlationId) {
 		assertHexIdentifier(presentationKey, "presentationKey");
-		return await authMethod.completeAuth(this.transport.serverUrl, presentationKey, payload, this.transport, correlationId);
+		return authMethod.completeAuth(this.transport.serverUrl, presentationKey, payload, this.transport, correlationId);
 	}
 	async listLinkedMethods(presentationKey) {
 		assertHexIdentifier(presentationKey, "presentationKey");
-		return await this.transport.request("/user/linkedMethods", {
+		return this.transport.request("/user/linkedMethods", {
 			operation: "list-linked-methods",
 			body: { presentationKey }
 		});
@@ -33461,7 +33546,7 @@ var WABClient = class {
 	async unlinkMethod(presentationKey, authMethodId) {
 		assertHexIdentifier(presentationKey, "presentationKey");
 		if (!Number.isSafeInteger(authMethodId) || authMethodId <= 0) throw new TypeError("authMethodId must be a positive safe integer.");
-		return await this.transport.request("/user/unlinkMethod", {
+		return this.transport.request("/user/unlinkMethod", {
 			operation: "unlink-method",
 			body: {
 				presentationKey,
@@ -33471,14 +33556,14 @@ var WABClient = class {
 	}
 	async requestFaucet(presentationKey) {
 		assertHexIdentifier(presentationKey, "presentationKey");
-		return await this.transport.request("/faucet/request", {
+		return this.transport.request("/faucet/request", {
 			operation: "request-faucet",
 			body: { presentationKey }
 		});
 	}
 	async deleteUser(presentationKey) {
 		assertHexIdentifier(presentationKey, "presentationKey");
-		return await this.transport.request("/user/delete", {
+		return this.transport.request("/user/delete", {
 			operation: "delete-user",
 			body: { presentationKey }
 		});
@@ -33487,7 +33572,7 @@ var WABClient = class {
 		assertMethodType(methodType);
 		assertHexIdentifier(userIdHash, "userIdHash");
 		const normalizedPayload = normalizeAuthPayload(methodType, payload);
-		return await this.transport.request("/auth/start", {
+		return this.transport.request("/auth/start", {
 			operation: "start-share-auth",
 			body: {
 				methodType,
@@ -33500,7 +33585,7 @@ var WABClient = class {
 		assertMethodType(methodType);
 		assertHexIdentifier(userIdHash, "userIdHash");
 		const normalizedPayload = normalizeAuthPayload(methodType, payload);
-		return await this.transport.request("/share/store", {
+		return this.transport.request("/share/store", {
 			operation: "store-share",
 			body: {
 				methodType,
@@ -33514,7 +33599,7 @@ var WABClient = class {
 		assertMethodType(methodType);
 		assertHexIdentifier(userIdHash, "userIdHash");
 		const normalizedPayload = normalizeAuthPayload(methodType, payload);
-		return await this.transport.request("/share/retrieve", {
+		return this.transport.request("/share/retrieve", {
 			operation: "retrieve-share",
 			body: {
 				methodType,
@@ -33527,7 +33612,7 @@ var WABClient = class {
 		assertMethodType(methodType);
 		assertHexIdentifier(userIdHash, "userIdHash");
 		const normalizedPayload = normalizeAuthPayload(methodType, payload);
-		return await this.transport.request("/share/update", {
+		return this.transport.request("/share/update", {
 			operation: "update-share",
 			body: {
 				methodType,
@@ -33541,7 +33626,7 @@ var WABClient = class {
 		assertMethodType(methodType);
 		assertHexIdentifier(userIdHash, "userIdHash");
 		const normalizedPayload = normalizeAuthPayload(methodType, payload);
-		return await this.transport.request("/share/delete", {
+		return this.transport.request("/share/delete", {
 			operation: "delete-share-user",
 			body: {
 				methodType,
@@ -33555,9 +33640,13 @@ var WABClient = class {
 //#region ../src/WalletAuthenticationManager.ts
 const DEFAULT_AUTH_SESSION_TTL_MS = 600 * 1e3;
 const MAX_AUTH_SESSION_TTL_MS = 3600 * 1e3;
+const AUTH_COMPONENT = "wallet-toolbox.authentication-manager";
+const AUTH_EVENT = "wallet-toolbox.authentication.";
+const EXISTING_USER = "existing-user";
+const NEW_USER = "new-user";
 var WABAccountContinuityError = class extends Error {
 	code = "WERR_WAB_ACCOUNT_CONTINUITY";
-	constructor(message = "WAB and UMP account state did not agree. Retry or use account recovery.") {
+	constructor(message = "WAB and UMP accounts disagree; retry or recover.") {
 		super(message);
 		this.name = "WABAccountContinuityError";
 	}
@@ -33572,6 +33661,7 @@ var WalletAuthenticationManager = class extends CWIStyleWalletManager {
 	wabClient;
 	authMethod;
 	authSession;
+	phoneChangeSession;
 	authSessionTtlMs;
 	constructor(...[adminOriginator, walletBuilder, interactor, recoveryKeySaver, passwordRetriever, wabClient, authMethod, stateSnapshot, options = {}]) {
 		super(adminOriginator, walletBuilder, interactor, recoveryKeySaver, passwordRetriever, async (presentationKey, wallet, adminOriginator) => {
@@ -33594,7 +33684,7 @@ var WalletAuthenticationManager = class extends CWIStyleWalletManager {
 					description: "Fund wallet",
 					options: { acceptDelayedBroadcast: false }
 				}, adminOriginator);
-				if (faucetRedeemTXCreationResult.signableTransaction == null) throw new Error("Faucet redemption did not return a signableTransaction");
+				if (faucetRedeemTXCreationResult.signableTransaction == null) throw new Error("Faucet redemption was not signable.");
 				const faucetRedeemTX = _bsv_sdk.Transaction.fromAtomicBEEF(faucetRedeemTXCreationResult.signableTransaction.tx);
 				const faucetRedemptionPuzzle = new _bsv_sdk.RPuzzle();
 				const randomRedemptionPrivateKey = _bsv_sdk.PrivateKey.fromRandom();
@@ -33627,7 +33717,7 @@ var WalletAuthenticationManager = class extends CWIStyleWalletManager {
 	* using the chosen AuthMethodInteractor.
 	*/
 	async startAuth(payload) {
-		if (this.authMethod == null) throw new Error("No AuthMethod selected in WalletAuthenticationManager");
+		if (this.authMethod == null) throw new Error("No WAB authentication method selected.");
 		const authMethod = this.authMethod;
 		if (this.authenticated) throw new Error("User is already authenticated");
 		this.cancelAuth();
@@ -33640,8 +33730,8 @@ var WalletAuthenticationManager = class extends CWIStyleWalletManager {
 			...correlationId !== void 0 ? { correlationId } : {}
 		};
 		this.telemetry.capture({
-			name: "wallet-toolbox.authentication.wab-start.started",
-			component: "wallet-toolbox.authentication-manager",
+			name: `${AUTH_EVENT}wab-start.started`,
+			component: AUTH_COMPONENT,
 			severity: "debug",
 			correlationId,
 			attributes: { methodType: authMethod.methodType }
@@ -33653,8 +33743,8 @@ var WalletAuthenticationManager = class extends CWIStyleWalletManager {
 				throw new Error(message);
 			}
 			this.telemetry.capture({
-				name: "wallet-toolbox.authentication.wab-start.completed",
-				component: "wallet-toolbox.authentication-manager",
+				name: `${AUTH_EVENT}wab-start.completed`,
+				component: AUTH_COMPONENT,
 				severity: "info",
 				correlationId,
 				attributes: { methodType: authMethod.methodType }
@@ -33662,8 +33752,8 @@ var WalletAuthenticationManager = class extends CWIStyleWalletManager {
 		} catch (error) {
 			this.cancelAuth();
 			this.telemetry.capture({
-				name: "wallet-toolbox.authentication.wab-start.failed",
-				component: "wallet-toolbox.authentication-manager",
+				name: `${AUTH_EVENT}wab-start.failed`,
+				component: AUTH_COMPONENT,
 				severity: "warn",
 				correlationId,
 				attributes: { methodType: authMethod.methodType },
@@ -33676,22 +33766,22 @@ var WalletAuthenticationManager = class extends CWIStyleWalletManager {
 	* Completes the WAB-based flow, retrieving the final presentationKey from WAB if successful.
 	*/
 	async completeAuth(payload) {
-		if (this.authMethod == null || this.authSession == null) throw new Error("No AuthMethod selected in WalletAuthenticationManager or startAuth has yet to be called.");
+		if (this.authMethod == null || this.authSession == null) throw new Error("Start WAB authentication first.");
 		const authMethod = this.authMethod;
 		if (this.authSession.methodType !== authMethod.methodType) {
 			this.cancelAuth();
-			throw new Error("The selected authentication method changed. Start authentication again.");
+			throw new Error("WAB authentication method changed; restart.");
 		}
 		if (Date.now() >= this.authSession.expiresAt) {
 			this.cancelAuth();
-			throw new Error("The WAB authentication session expired. Start authentication again.");
+			throw new Error("WAB authentication expired; restart.");
 		}
 		const session = this.authSession;
 		const result = await this.wabClient.completeAuthMethod(authMethod, session.presentationKey, payload, session.correlationId);
 		if (result.success !== true || result.presentationKey == null || result.presentationKey.length === 0) {
 			this.telemetry.capture({
-				name: "wallet-toolbox.authentication.wab-complete.rejected",
-				component: "wallet-toolbox.authentication-manager",
+				name: `${AUTH_EVENT}wab-complete.rejected`,
+				component: AUTH_COMPONENT,
 				severity: "warn",
 				correlationId: session.correlationId,
 				attributes: { methodType: session.methodType }
@@ -33706,11 +33796,11 @@ var WalletAuthenticationManager = class extends CWIStyleWalletManager {
 		this.cancelAuth();
 		const wabAccountStatus = this.inferAccountStatus(result, session.presentationKey);
 		try {
-			await this.providePresentationKey(_bsv_sdk.Utils.toArray(result.presentationKey, "hex"));
+			await this.provideWABPresentationKey(result, wabAccountStatus);
 		} catch (error) {
 			this.telemetry.capture({
-				name: "wallet-toolbox.authentication.ump-continuity.failed",
-				component: "wallet-toolbox.authentication-manager",
+				name: `${AUTH_EVENT}ump-continuity.failed`,
+				component: AUTH_COMPONENT,
 				severity: "warn",
 				correlationId: session.correlationId,
 				attributes: {
@@ -33721,18 +33811,18 @@ var WalletAuthenticationManager = class extends CWIStyleWalletManager {
 			});
 			throw error;
 		}
-		if (wabAccountStatus === "existing-user" && this.authenticationFlow !== "existing-user") {
+		if (wabAccountStatus === EXISTING_USER && this.authenticationFlow !== EXISTING_USER) {
 			super.destroy();
 			const error = new WABAccountContinuityError();
 			this.telemetry.capture({
-				name: "wallet-toolbox.authentication.account-continuity.mismatch",
-				component: "wallet-toolbox.authentication-manager",
+				name: `${AUTH_EVENT}account-continuity.mismatch`,
+				component: AUTH_COMPONENT,
 				severity: "error",
 				correlationId: session.correlationId,
 				attributes: {
 					methodType: session.methodType,
 					wabAccountStatus,
-					umpAccountStatus: "new-user"
+					umpAccountStatus: NEW_USER
 				},
 				error
 			});
@@ -33740,8 +33830,8 @@ var WalletAuthenticationManager = class extends CWIStyleWalletManager {
 		}
 		const continuity = wabAccountStatus === this.authenticationFlow ? "matched" : "ump-existing";
 		this.telemetry.capture({
-			name: "wallet-toolbox.authentication.completed",
-			component: "wallet-toolbox.authentication-manager",
+			name: `${AUTH_EVENT}completed`,
+			component: AUTH_COMPONENT,
 			severity: continuity === "matched" ? "info" : "warn",
 			correlationId: session.correlationId,
 			attributes: {
@@ -33755,23 +33845,131 @@ var WalletAuthenticationManager = class extends CWIStyleWalletManager {
 	cancelAuth() {
 		this.authSession = void 0;
 	}
+	readPendingPhoneChange(result) {
+		const presentationKey = result.pendingPresentationKey;
+		const changeId = result.pendingPhoneChangeId;
+		if (presentationKey === void 0 && changeId === void 0) return void 0;
+		if (!/^[0-9a-fA-F]{64}$/.test(presentationKey ?? "") || !Number.isSafeInteger(changeId) || changeId <= 0) throw new WABAccountContinuityError("WAB returned invalid pending phone-change data.");
+		return {
+			presentationKey,
+			changeId
+		};
+	}
+	async provideWABPresentationKey(result, wabAccountStatus) {
+		const umpTokenOutpoint = typeof result.umpTokenOutpoint === "string" ? result.umpTokenOutpoint : void 0;
+		const lookupOptions = umpTokenOutpoint == null ? void 0 : { pinnedOutpoint: umpTokenOutpoint };
+		const pending = this.readPendingPhoneChange(result);
+		let usePending = false;
+		try {
+			await this.providePresentationKey(_bsv_sdk.Utils.toArray(result.presentationKey, "hex"), lookupOptions);
+		} catch (error) {
+			if (pending == null) throw error;
+			usePending = true;
+		}
+		if (pending != null && (usePending || wabAccountStatus === EXISTING_USER && this.authenticationFlow !== EXISTING_USER)) {
+			await this.providePresentationKey(_bsv_sdk.Utils.toArray(pending.presentationKey, "hex"), lookupOptions);
+			if (this.authenticationFlow === EXISTING_USER) await this.finalizePendingPhoneChange(result.presentationKey, pending);
+		}
+	}
+	async finalizePendingPhoneChange(currentPresentationKey, pending) {
+		const finalized = await this.phoneChange("finalize", {
+			changeId: pending.changeId,
+			presentationKey: currentPresentationKey,
+			newPresentationKey: pending.presentationKey
+		});
+		if (finalized.success !== true || finalized.changeId !== pending.changeId) throw new WABAccountContinuityError(finalized.message || "WAB could not finalize the pending phone change.");
+	}
+	/**
+	* Starts OTP verification for a replacement phone number. The same number
+	* is valid and intentionally produces a fresh presentation key/hash.
+	*/
+	async startPhoneNumberChange(phoneNumber) {
+		if (!this.authenticated) throw new Error("Not authenticated");
+		const normalizedPhone = phoneNumber.trim();
+		const currentPresentationKey = _bsv_sdk.Utils.toHex(await this.getFactor("presentationKey"));
+		const response = await this.phoneChange("start", {
+			presentationKey: currentPresentationKey,
+			phoneNumber: normalizedPhone
+		});
+		if (response.success !== true) throw new Error(response.message || "Phone change failed");
+		this.phoneChangeSession = {
+			phoneNumber: normalizedPhone,
+			presentationKey: currentPresentationKey
+		};
+	}
+	/**
+	* Completes phone verification and stages the WAB association before
+	* publishing the UMP key rotation. WAB retains both the current and pending
+	* presentation keys until finalization, so either side of an interrupted
+	* transition remains recoverable on the next verified login.
+	*/
+	async completePhoneNumberChange(otp) {
+		const session = this.phoneChangeSession;
+		if (session == null) throw new Error("No phone change");
+		if (session.changeToken == null) {
+			const authorization = await this.phoneChange("complete", {
+				presentationKey: session.presentationKey,
+				phoneNumber: session.phoneNumber,
+				otp: otp.trim()
+			});
+			if (authorization.success !== true) throw new Error(authorization.message || "Phone change failed");
+			if (/^[0-9a-fA-F]{64}$/.test(authorization.pendingPresentationKey ?? "") && Number.isSafeInteger(authorization.pendingPhoneChangeId) && authorization.pendingPhoneChangeId > 0) {
+				session.newKey = _bsv_sdk.Utils.toArray(authorization.pendingPresentationKey, "hex");
+				session.changeId = authorization.pendingPhoneChangeId;
+			} else if (typeof authorization.changeToken === "string" && authorization.changeToken.length > 0) session.changeToken = authorization.changeToken;
+			else throw new Error(authorization.message || "Phone change failed");
+		}
+		session.newKey ??= (0, _bsv_sdk.Random)(32);
+		if (session.changeId == null) {
+			const committed = await this.phoneChange("commit", {
+				changeToken: session.changeToken,
+				presentationKey: session.presentationKey,
+				newPresentationKey: _bsv_sdk.Utils.toHex(session.newKey)
+			});
+			if (committed.success !== true || !Number.isSafeInteger(committed.changeId) || committed.changeId <= 0) throw new Error(committed.message || "Phone change failed");
+			session.changeId = committed.changeId;
+		}
+		const changeId = session.changeId;
+		if (session.umpUpdated !== true) {
+			await this.changePresentationKey(session.newKey);
+			session.umpUpdated = true;
+		}
+		const finalized = await this.phoneChange("finalize", {
+			changeId,
+			presentationKey: session.presentationKey,
+			newPresentationKey: _bsv_sdk.Utils.toHex(session.newKey)
+		});
+		if (finalized.success !== true || finalized.changeId !== changeId) throw new Error(finalized.message || "Phone change failed");
+		this.phoneChangeSession = void 0;
+		return { changeId };
+	}
+	cancelPhoneNumberChange() {
+		this.phoneChangeSession = void 0;
+	}
 	destroy() {
 		this.cancelAuth();
+		this.cancelPhoneNumberChange();
 		super.destroy();
 	}
+	phoneChange(phase, body) {
+		return this.wabClient.transport.request(`/auth/phone-change/${phase}`, {
+			operation: "phone-change",
+			body
+		});
+	}
 	inferAccountStatus(result, temporaryPresentationKey) {
 		if (result.presentationKey == null) throw new WABAccountContinuityError("WAB did not return a presentation key.");
 		const keyMatchesTemporary = this.constantTimeHexEqual(result.presentationKey, temporaryPresentationKey);
 		const rawAccountStatus = result.accountStatus;
-		if (rawAccountStatus !== void 0 && rawAccountStatus !== "new-user" && rawAccountStatus !== "existing-user") throw new WABAccountContinuityError("WAB returned an invalid account-continuity status.");
+		if (rawAccountStatus !== void 0 && rawAccountStatus !== NEW_USER && rawAccountStatus !== EXISTING_USER) throw new WABAccountContinuityError("WAB returned an invalid account status.");
 		const rawExistingUser = result.existingUser;
-		if (rawExistingUser !== void 0 && typeof rawExistingUser !== "boolean") throw new WABAccountContinuityError("WAB returned an invalid existing-user status.");
-		if (rawAccountStatus !== void 0 && rawExistingUser !== void 0 && rawAccountStatus === "existing-user" !== rawExistingUser) throw new WABAccountContinuityError("WAB returned contradictory account-continuity statuses.");
+		if (rawExistingUser !== void 0 && typeof rawExistingUser !== "boolean") throw new WABAccountContinuityError("WAB returned invalid existing-user data.");
+		if (rawAccountStatus !== void 0 && rawExistingUser !== void 0 && rawAccountStatus === EXISTING_USER !== rawExistingUser) throw new WABAccountContinuityError("WAB returned conflicting account status.");
 		let compatibilityStatus;
-		if (typeof rawExistingUser === "boolean") compatibilityStatus = rawExistingUser ? "existing-user" : "new-user";
+		if (typeof rawExistingUser === "boolean") compatibilityStatus = rawExistingUser ? EXISTING_USER : NEW_USER;
 		const explicitStatus = rawAccountStatus ?? compatibilityStatus;
-		if (explicitStatus === "new-user" && !keyMatchesTemporary || explicitStatus === "existing-user" && keyMatchesTemporary) throw new WABAccountContinuityError("WAB returned contradictory account-continuity data.");
-		return explicitStatus ?? (keyMatchesTemporary ? "new-user" : "existing-user");
+		if (explicitStatus === NEW_USER && !keyMatchesTemporary || explicitStatus === EXISTING_USER && keyMatchesTemporary) throw new WABAccountContinuityError("WAB returned conflicting account status.");
+		return explicitStatus ?? (keyMatchesTemporary ? NEW_USER : EXISTING_USER);
 	}
 	constantTimeHexEqual(left, right) {
 		if (left.length !== right.length) return false;