@capxul/sdk 1.0.0-alpha.20 → 1.0.0-alpha.21

package/dist/index.mjs

@@ -376,6 +376,45 @@ function captureExceptionSync(telemetry, error, context) {
 	} catch {}
 }
 //#endregion
+//#region src/internal/invocation-observation.ts
+const INVOCATION_OBSERVATION = Symbol("capxul.invocation-observation");
+const FAILURE_INVOCATION_SNAPSHOT = Symbol("capxul.failure-invocation-snapshot");
+/** @internal Attach one immutable, non-wire invocation snapshot to an SDK-owned object. */
+function attachInvocationObservation(target, context) {
+	const snapshot = Object.freeze(context === void 0 ? {} : { context: Object.freeze({ ...context }) });
+	Object.defineProperty(target, INVOCATION_OBSERVATION, {
+		configurable: false,
+		enumerable: false,
+		value: snapshot,
+		writable: false
+	});
+	return target;
+}
+/** @internal Read the snapshot without exposing its symbol or adding a wire field. */
+function readInvocationObservation(source) {
+	if (typeof source !== "object" || source === null) return void 0;
+	return source[INVOCATION_OBSERVATION];
+}
+/** @internal Carry a snapshot across an SDK adapter projection without resolving again. */
+function copyInvocationObservation(source, target) {
+	const snapshot = readInvocationObservation(source);
+	return snapshot === void 0 ? target : attachInvocationObservation(target, snapshot.context);
+}
+/** @internal Mark a failure envelope as already resolved at the public invocation boundary. */
+function markFailureInvocationSnapshot(failure) {
+	Object.defineProperty(failure, FAILURE_INVOCATION_SNAPSHOT, {
+		configurable: false,
+		enumerable: false,
+		value: true,
+		writable: false
+	});
+	return failure;
+}
+/** @internal Distinguish public-boundary failures from direct adapter calls. */
+function hasFailureInvocationSnapshot(failure) {
+	return typeof failure === "object" && failure !== null && failure[FAILURE_INVOCATION_SNAPSHOT] === true;
+}
+//#endregion
 //#region src/client/_shared/effect-actor-bridge.ts
 /**
 * Bridge an Effect whose typed failure carries `{ publicError: CapxulError }`
@@ -1221,7 +1260,7 @@ function makeAccountMethods(deps) {
 		};
 	};
 	const deployMutex = /* @__PURE__ */ new Map();
-	const deploySafeImpl = async () => {
+	const deploySafeImpl = async (observationSource) => {
 		const session = await currentSession(deps.actor, deps.authCache);
 		if (session === null) return {
 			ok: false,
@@ -1249,7 +1288,8 @@ function makeAccountMethods(deps) {
 			authUserId: session.authUserId,
 			chainId: deps.chainId,
 			signer,
-			smartAccountPort: deps.smartAccountPort
+			smartAccountPort: deps.smartAccountPort,
+			observationSource
 		}).finally(() => {
 			deployMutex.delete(mutexKey);
 		});
@@ -1373,11 +1413,11 @@ async function runBackendClaim(input) {
 			error: Errors.providerError("signer", "getAddress", cause)
 		};
 	}
-	const claimed = await runPortEffect(input.smartAccountPort.claim({
+	const claimed = await runPortEffect(input.smartAccountPort.claim(copyInvocationObservation(input.observationSource, {
 		authUserId: input.authUserId,
 		chainId,
 		signerAddress
-	}));
+	})));
 	if (!claimed.ok) return claimed;
 	return {
 		ok: true,
@@ -1652,7 +1692,7 @@ async function recoverRawDigestSigner(input) {
 }
 //#endregion
 //#region package.json
-var version = "1.0.0-alpha.20";
+var version = "1.0.0-alpha.21";
 //#endregion
 //#region src/ports/auth-client.ts
 var AuthClientError = class extends Data.TaggedError("AuthClientError") {};
@@ -1738,6 +1778,10 @@ const FIELD_RULES = {
 		maxLength: 128,
 		pattern: /^[A-Za-z0-9][A-Za-z0-9._:-]*$/u
 	},
+	journeyId: {
+		maxLength: 128,
+		pattern: /^[A-Za-z0-9][A-Za-z0-9._:-]*$/u
+	},
 	correlationId: {
 		maxLength: 128,
 		pattern: /^[A-Za-z0-9][A-Za-z0-9._:-]*$/u
@@ -3011,48 +3055,10 @@ function convexCallErrorFromCapxul(operation, error) {
 }
 var ConvexCallPortTag = class extends Context.Tag("@capxul/sdk/ports/ConvexCallPort")() {};
 //#endregion
-//#region src/internal/invocation-observation.ts
-const INVOCATION_OBSERVATION = Symbol("capxul.invocation-observation");
-const FAILURE_INVOCATION_SNAPSHOT = Symbol("capxul.failure-invocation-snapshot");
-/** @internal Attach one immutable, non-wire invocation snapshot to an SDK-owned object. */
-function attachInvocationObservation(target, context) {
-	const snapshot = Object.freeze(context === void 0 ? {} : { context: Object.freeze({ ...context }) });
-	Object.defineProperty(target, INVOCATION_OBSERVATION, {
-		configurable: false,
-		enumerable: false,
-		value: snapshot,
-		writable: false
-	});
-	return target;
-}
-/** @internal Read the snapshot without exposing its symbol or adding a wire field. */
-function readInvocationObservation(source) {
-	if (typeof source !== "object" || source === null) return void 0;
-	return source[INVOCATION_OBSERVATION];
-}
-/** @internal Carry a snapshot across an SDK adapter projection without resolving again. */
-function copyInvocationObservation(source, target) {
-	const snapshot = readInvocationObservation(source);
-	return snapshot === void 0 ? target : attachInvocationObservation(target, snapshot.context);
-}
-/** @internal Mark a failure envelope as already resolved at the public invocation boundary. */
-function markFailureInvocationSnapshot(failure) {
-	Object.defineProperty(failure, FAILURE_INVOCATION_SNAPSHOT, {
-		configurable: false,
-		enumerable: false,
-		value: true,
-		writable: false
-	});
-	return failure;
-}
-/** @internal Distinguish public-boundary failures from direct adapter calls. */
-function hasFailureInvocationSnapshot(failure) {
-	return typeof failure === "object" && failure !== null && failure[FAILURE_INVOCATION_SNAPSHOT] === true;
-}
-//#endregion
 //#region src/adapters/convex-call/ConvexCallAdapter.ts
 /** Exact floor-first allowlist; every additional handler must migrate its validator first. */
-const OBSERVED_CONVEX_ACTIONS = new Set(["subAccount/actions:transfer"]);
+const OBSERVED_CONVEX_ACTIONS = new Set(["subAccount/actions:transfer", "smartAccount/actions:claim"]);
+const OBSERVED_CONVEX_MUTATIONS = new Set(["org/lifecycle:startOrResume", "org/lifecycle:retry"]);
 var ConvexCallAdapter = class {
 	#client;
 	#tokenProvider;
@@ -3075,20 +3081,21 @@ var ConvexCallAdapter = class {
 		});
 	}
 	mutation(fn, args) {
+		const path = getFunctionName(fn);
 		return Effect.tryPromise({
-			try: () => this.#client.mutation(fn, args),
-			catch: (cause) => mapToConvexCallError(getFunctionName(fn), cause)
+			try: () => this.#client.mutation(fn, this.#observedArgs(OBSERVED_CONVEX_MUTATIONS, path, args)),
+			catch: (cause) => mapToConvexCallError(path, cause)
 		});
 	}
 	action(fn, args) {
 		const path = getFunctionName(fn);
 		return Effect.tryPromise({
-			try: () => this.#client.action(fn, this.#observedActionArgs(path, args)),
+			try: () => this.#client.action(fn, this.#observedArgs(OBSERVED_CONVEX_ACTIONS, path, args)),
 			catch: (cause) => mapToConvexCallError(path, cause)
 		});
 	}
-	#observedActionArgs(path, args) {
-		if (!OBSERVED_CONVEX_ACTIONS.has(path)) return args;
+	#observedArgs(allowlist, path, args) {
+		if (!allowlist.has(path)) return args;
 		let hostContext;
 		const invocationSnapshot = readInvocationObservation(args);
 		if (invocationSnapshot !== void 0) hostContext = invocationSnapshot.context;
@@ -3678,6 +3685,8 @@ function brandProfile(raw) {
 		email: toEmail(raw.email),
 		displayName: raw.displayName,
 		country: raw.country === null ? null : toCountryCode(raw.country),
+		onboarded: raw.onboarded ?? false,
+		withdrawalAddress: raw.withdrawalAddress === null || raw.withdrawalAddress === void 0 ? null : toAddress(raw.withdrawalAddress),
 		kycTier: toKycTier(raw.kycTier),
 		createdAt: toEpochMs(raw.createdAt),
 		updatedAt: toEpochMs(raw.updatedAt)
@@ -3937,11 +3946,11 @@ var ConvexSmartAccountAdapter = class {
 		})), Effect.catchAllDefect((cause) => Effect.fail(smartAccountErrorFromUnknown("confirmDeployment", cause))));
 	}
 	claim(input) {
-		return this.#convex.action(this.#fns.claim, {
+		return this.#convex.action(this.#fns.claim, copyInvocationObservation(input, {
 			chainId: wireChainId(input.chainId),
 			signerAddress: input.signerAddress,
 			...input.telemetryRunId === void 0 ? {} : { telemetryRunId: input.telemetryRunId }
-		}).pipe(Effect.mapError((error) => smartAccountErrorFromCapxul("claim", error.publicError, error)), Effect.flatMap((row) => Effect.try({
+		})).pipe(Effect.mapError((error) => smartAccountErrorFromCapxul("claim", error.publicError, error)), Effect.flatMap((row) => Effect.try({
 			try: () => brandProvisionedSmartAccount(input.authUserId, row),
 			catch: (cause) => smartAccountErrorFromUnknown("claim", cause)
 		})), Effect.catchAllDefect((cause) => Effect.fail(smartAccountErrorFromUnknown("claim", cause))));
@@ -4203,14 +4212,19 @@ const DEFAULT_FUNCTIONS$1 = {
 var ConvexOrganizationSetupAdapter = class {
 	#convex;
 	#signer;
+	#chainId;
 	#fns;
 	constructor(input) {
 		this.#convex = input.convex;
 		this.#signer = input.signer;
+		this.#chainId = input.chainId;
 		this.#fns = input.functions ?? DEFAULT_FUNCTIONS$1;
 	}
 	async startOrResume(input) {
-		const result = await runCall("startOrResume", this.#convex.mutation(this.#fns.startOrResume, input));
+		const result = await runCall("startOrResume", this.#convex.mutation(this.#fns.startOrResume, copyInvocationObservation(input, {
+			...input,
+			chainId: this.#chainId
+		})));
 		if (!result.ok) return result;
 		const lifecycle = parseLifecycle("startOrResume", result.value.lifecycle);
 		if (!lifecycle.ok) return lifecycle;
@@ -4226,17 +4240,17 @@ var ConvexOrganizationSetupAdapter = class {
 		};
 	}
 	prepareFounderAccount(input) {
-		return this.#lifecycleAction("prepareFounderAccount", input, () => this.#convex.action(this.#fns.prepareFounderAccount, { orgId: input.orgId }));
+		return this.#lifecycleAction("prepareFounderAccount", input, () => this.#convex.action(this.#fns.prepareFounderAccount, copyInvocationObservation(input, { orgId: input.orgId })));
 	}
 	async authorizeAndSubmitBootstrap(input) {
 		const cancelled = cancellation(input.signal);
 		if (cancelled !== void 0) return cancelled;
 		const signerAddress = await signerResult("getAddress", () => this.#signer.getAddress());
 		if (!signerAddress.ok) return signerAddress;
-		const prepared = await runCall("prepareBootstrap", this.#convex.action(this.#fns.prepareBootstrap, {
+		const prepared = await runCall("prepareBootstrap", this.#convex.action(this.#fns.prepareBootstrap, copyInvocationObservation(input, {
 			orgId: input.orgId,
 			signerAddress: signerAddress.value
-		}));
+		})));
 		if (!prepared.ok) return prepared;
 		const authority = validatePreparedAuthorities(prepared.value, signerAddress.value);
 		if (!authority.ok) return authority;
@@ -4246,25 +4260,25 @@ var ConvexOrganizationSetupAdapter = class {
 		if (!signature.ok) return signature;
 		const cancelledAfterSign = cancellation(input.signal);
 		if (cancelledAfterSign !== void 0) return cancelledAfterSign;
-		const submitted = await runCall("submitBootstrap", this.#convex.action(this.#fns.submitBootstrap, {
+		const submitted = await runCall("submitBootstrap", this.#convex.action(this.#fns.submitBootstrap, copyInvocationObservation(input, {
 			orgId: input.orgId,
 			signerAddress: signerAddress.value,
 			signature: signature.value,
 			userOp: prepared.value.userOp
-		}));
+		})));
 		if (!submitted.ok) return submitted;
 		return parseLifecycle("submitBootstrap", submitted.value);
 	}
 	resumeSubmittedBootstrap(input) {
-		return this.#lifecycleAction("resumeBootstrapSubmission", input, () => this.#convex.action(this.#fns.resumeBootstrapSubmission, { orgId: input.orgId }));
+		return this.#lifecycleAction("resumeBootstrapSubmission", input, () => this.#convex.action(this.#fns.resumeBootstrapSubmission, copyInvocationObservation(input, { orgId: input.orgId })));
 	}
 	confirmSubmittedBootstrap(input) {
-		return this.#lifecycleAction("confirmBootstrap", input, () => this.#convex.action(this.#fns.confirmBootstrap, { orgId: input.orgId }));
+		return this.#lifecycleAction("confirmBootstrap", input, () => this.#convex.action(this.#fns.confirmBootstrap, copyInvocationObservation(input, { orgId: input.orgId })));
 	}
 	async recordFailure(input) {
 		const errorProvider = input.error.details?.provider;
 		const errorOperation = input.error.details?.operation;
-		const result = await runCall("recordFailure", this.#convex.mutation(this.#fns.recordFailure, {
+		const result = await runCall("recordFailure", this.#convex.mutation(this.#fns.recordFailure, copyInvocationObservation(input, {
 			orgId: input.orgId,
 			errorCode: input.error.code,
 			...typeof errorProvider === "string" && typeof errorOperation === "string" ? {
@@ -4272,7 +4286,7 @@ var ConvexOrganizationSetupAdapter = class {
 				errorOperation
 			} : {},
 			retryable: input.retryable
-		}));
+		})));
 		return result.ok ? parseLifecycle("recordFailure", result.value) : result;
 	}
 	async loadLifecycle(input) {
@@ -4290,7 +4304,7 @@ var ConvexOrganizationSetupAdapter = class {
 			const reset = resetSignerSession(this.#signer);
 			if (!reset.ok) return reset;
 		}
-		const result = await runCall("retry", this.#convex.mutation(this.#fns.retry, { orgId: input.orgId }));
+		const result = await runCall("retry", this.#convex.mutation(this.#fns.retry, copyInvocationObservation(input, { orgId: input.orgId })));
 		if (!result.ok) return result;
 		return parseLifecycle("retry", result.value);
 	}
@@ -4475,6 +4489,7 @@ const PayeeIdTelemetrySchema = Schema.String.pipe(Schema.filter((value) => PAYEE
 const DocumentHashSchema = Schema.String.pipe(Schema.filter((value) => BYTES32_RE.test(value), { message: () => "must be 0x + 64 hex chars" }));
 const TelemetryEnvelopeProps = {
 	capxul_e2e_run_id: OptionalString,
+	journeyId: OptionalString,
 	correlationId: OptionalString,
 	capxulEnv: OptionalString,
 	sdkVersion: OptionalString,
@@ -4606,6 +4621,46 @@ const TransferFailedProps = Schema.Struct({
 const ORG_ID_TELEMETRY_RE = /^org_[0-9A-Za-z]+$/;
 const OrgIdTelemetrySchema = Schema.String.pipe(Schema.filter((value) => ORG_ID_TELEMETRY_RE.test(value), { message: () => "must be org_ plus an alphanumeric id" }));
 const OptionalOrgId = Schema.optional(OrgIdTelemetrySchema);
+const AttemptNumberSchema = Schema.Number.pipe(Schema.filter((value) => Number.isSafeInteger(value) && value > 0, { message: () => "must be a positive safe integer" }));
+const OnboardingStageSchema = Schema.Literal("profile", "accountProvisioning", "accountClaim", "preparingFounderAccount", "awaitingFounderAuthorization", "submittingBootstrap", "confirmingBootstrap");
+const MemberActivationStartedProps = Schema.Struct({
+	$insert_id: Schema.String,
+	producer: Schema.Literal("server")
+});
+const MemberActivationReadyProps = Schema.Struct({
+	$insert_id: Schema.String,
+	duration_ms: DurationMsSchema,
+	producer: Schema.Literal("server")
+});
+const MemberActivationFailedProps = Schema.Struct({
+	$insert_id: Schema.String,
+	stage: OnboardingStageSchema,
+	error_code: Schema.String,
+	retryable: Schema.Boolean,
+	producer: Schema.Literal("server")
+});
+const OrganizationCreationStartedProps = Schema.Struct({
+	$insert_id: Schema.String,
+	organization_id: OrgIdTelemetrySchema,
+	attempt_number: AttemptNumberSchema,
+	producer: Schema.Literal("server")
+});
+const OrganizationCreationReadyProps = Schema.Struct({
+	$insert_id: Schema.String,
+	organization_id: OrgIdTelemetrySchema,
+	attempt_number: AttemptNumberSchema,
+	duration_ms: DurationMsSchema,
+	producer: Schema.Literal("server")
+});
+const OrganizationCreationFailedProps = Schema.Struct({
+	$insert_id: Schema.String,
+	organization_id: OrgIdTelemetrySchema,
+	attempt_number: AttemptNumberSchema,
+	stage: OnboardingStageSchema,
+	error_code: Schema.String,
+	retryable: Schema.Boolean,
+	producer: Schema.Literal("server")
+});
 const OrgCreateStartedProps = Schema.Struct({
 	...TelemetryEnvelopeProps,
 	org_id: OptionalOrgId,
@@ -4767,6 +4822,30 @@ Schema.Struct({
 	name: Schema.Literal("bootstrap_failed"),
 	props: Schema.optional(BootstrapFailedProps)
 });
+Schema.Struct({
+	name: Schema.Literal("member_activation_started"),
+	props: MemberActivationStartedProps
+});
+Schema.Struct({
+	name: Schema.Literal("member_activation_ready"),
+	props: MemberActivationReadyProps
+});
+Schema.Struct({
+	name: Schema.Literal("member_activation_failed"),
+	props: MemberActivationFailedProps
+});
+Schema.Struct({
+	name: Schema.Literal("organization_creation_started"),
+	props: OrganizationCreationStartedProps
+});
+Schema.Struct({
+	name: Schema.Literal("organization_creation_ready"),
+	props: OrganizationCreationReadyProps
+});
+Schema.Struct({
+	name: Schema.Literal("organization_creation_failed"),
+	props: OrganizationCreationFailedProps
+});
 Schema.Struct({
 	name: Schema.Literal("account_balance_read"),
 	props: Schema.optional(AccountBalanceReadProps)
@@ -8010,7 +8089,7 @@ function validateOrganizationLifecycleScope(orgId, lifecycle) {
 	};
 }
 /** Advance only the steps still required by one durable Organization lane. */
-async function advanceOrganizationSetup(setup, orgId, initial, signal) {
+async function advanceOrganizationSetup(setup, orgId, initial, signal, observationSource) {
 	const scopedInitial = validateOrganizationLifecycleScope(orgId, initial);
 	if (!scopedInitial.ok) return scopedInitial;
 	let lifecycle = scopedInitial.value;
@@ -8020,19 +8099,15 @@ async function advanceOrganizationSetup(setup, orgId, initial, signal) {
 			value: lifecycle
 		};
 		const currentStep = lifecycle.step;
-		if (signal?.aborted) return recordSetupFailure(setup, orgId, Errors.cancelled({ operation: "organization.setup" }), true);
-		const stepInput = {
+		if (signal?.aborted) return recordSetupFailure(setup, orgId, Errors.cancelled({ operation: "organization.setup" }), true, observationSource);
+		const stepInput = copyInvocationObservation(observationSource, {
 			orgId,
 			...signal === void 0 ? {} : { signal }
-		};
+		});
 		const next = lifecycle.step === "preparingFounderAccount" ? await setup.prepareFounderAccount(stepInput) : lifecycle.step === "awaitingFounderAuthorization" ? await setup.authorizeAndSubmitBootstrap(stepInput) : lifecycle.step === "submittingBootstrap" ? await setup.resumeSubmittedBootstrap(stepInput) : await setup.confirmSubmittedBootstrap(stepInput);
-		if (!next.ok) {
-			if (next.error.code === "CANCELLED") return recordSetupFailure(setup, orgId, next.error, true);
-			if (next.error.code === "PROVIDER_ERROR") return recordSetupFailure(setup, orgId, next.error, isRetryableProviderFailure(next.error));
-			return next;
-		}
+		if (!next.ok) return recordSetupFailure(setup, orgId, next.error, isRetryableOrganizationSetupFailure(next.error), observationSource);
 		const scopedNext = validateOrganizationLifecycleScope(orgId, next.value);
-		if (!scopedNext.ok) return scopedNext;
+		if (!scopedNext.ok) return recordSetupFailure(setup, orgId, scopedNext.error, false, observationSource);
 		lifecycle = scopedNext.value;
 		if (currentStep === "confirmingBootstrap") return {
 			ok: true,
@@ -8043,7 +8118,7 @@ async function advanceOrganizationSetup(setup, orgId, initial, signal) {
 		ok: true,
 		value: lifecycle
 	};
-	return fail$1(Errors.wrongState({
+	return recordSetupFailure(setup, orgId, Errors.wrongState({
 		method: "organization.setup",
 		currentState: lifecycle.step,
 		validStates: [
@@ -8051,23 +8126,28 @@ async function advanceOrganizationSetup(setup, orgId, initial, signal) {
 			"ready",
 			"failed"
 		]
-	}));
+	}), false, observationSource);
 }
-async function recordSetupFailure(setup, orgId, error, retryable) {
-	const recorded = await setup.recordFailure({
+async function recordSetupFailure(setup, orgId, error, retryable, observationSource) {
+	const recorded = await setup.recordFailure(copyInvocationObservation(observationSource, {
 		orgId,
 		error,
 		retryable
-	});
+	}));
 	if (!recorded.ok) return recorded;
 	const scopedRecorded = validateOrganizationLifecycleScope(orgId, recorded.value);
 	if (!scopedRecorded.ok) return scopedRecorded;
-	return fail$1(error);
+	return scopedRecorded;
 }
 function isRetryableProviderFailure(error) {
 	const mode = error.details?.failure_mode;
 	return mode !== "auth-origin-mismatch" && mode !== "app-env-allowlist" && mode !== "no-secure-context";
 }
+function isRetryableOrganizationSetupFailure(error) {
+	if (error.code === "CANCELLED" || error.code === "SIGNER_REJECTED") return true;
+	if (error.code === "PROVIDER_ERROR") return isRetryableProviderFailure(error);
+	return error.code === "NETWORK_ERROR" || error.code === "UNKNOWN";
+}
 //#endregion
 //#region src/client/org.ts
 /**
@@ -8140,12 +8220,12 @@ function makeOrgMethods(deps) {
 						ok: false,
 						error: Errors.notImplemented("organizationSetup", "retrySetup")
 					};
-					const retried = await setup.retry({
+					const retried = await setup.retry(copyInvocationObservation(options, {
 						orgId,
 						...options?.signal === void 0 ? {} : { signal: options.signal }
-					});
+					}));
 					if (!retried.ok) return retried;
-					return advanceOrganizationSetup(setup, orgId, retried.value, options?.signal);
+					return advanceOrganizationSetup(setup, orgId, retried.value, options?.signal, options);
 				},
 				profile: {
 					get(_options) {
@@ -8406,17 +8486,21 @@ async function runCompleteOrganizationOnboarding(ops, input, options) {
 	const written = await ops.completeIdentityOnboarding({
 		authUserId: session.authUserId,
 		email: session.email,
-		displayName: validated.value.ownerDisplayName,
-		country: validated.value.country
+		displayName: validated.value.profile.displayName,
+		country: validated.value.profile.country,
+		...validated.value.profile.withdrawalAddress === void 0 ? {} : { withdrawalAddress: validated.value.profile.withdrawalAddress }
 	});
 	if (!written.ok) return fail(written.error);
-	const started = await setup.startOrResume({
-		name: validated.value.organizationName,
-		handle: validated.value.handle,
-		country: validated.value.country
-	});
+	const founderAccount = await ops.ensureFounderAccountReady(input);
+	if (!founderAccount.ok) return fail(founderAccount.error);
+	if (options?.signal?.aborted === true) return fail(Errors.cancelled({ operation: "onboarding.completeOrganization" }));
+	const started = await setup.startOrResume(copyInvocationObservation(input, {
+		name: validated.value.organization.name,
+		handle: validated.value.organization.handle,
+		country: validated.value.organization.country
+	}));
 	if (!started.ok) return fail(started.error);
-	const lifecycle = await advanceOrganizationSetup(setup, started.value.orgId, started.value.lifecycle, options?.signal);
+	const lifecycle = await advanceOrganizationSetup(setup, started.value.orgId, started.value.lifecycle, options?.signal, input);
 	if (!lifecycle.ok) {
 		const error = lifecycle.error;
 		return fail(new CapxulError(error.code, error.message, {
@@ -8438,9 +8522,36 @@ async function runCompleteOrganizationOnboarding(ops, input, options) {
 	};
 }
 function validatePersonalInput(input) {
-	const displayName = requireNonEmpty(input.displayName, "displayName");
+	if (!isRecord(input) || !isRecord(input.profile)) return fail(Errors.invalidInput("profile", "must be an object"));
+	return validateProfileInput(input.profile);
+}
+function validateOrganizationInput(input) {
+	if (!isRecord(input) || !isRecord(input.profile)) return fail(Errors.invalidInput("profile", "must be an object"));
+	if (!isRecord(input.organization)) return fail(Errors.invalidInput("organization", "must be an object"));
+	const profile = validateProfileInput(input.profile);
+	if (!profile.ok) return profile;
+	const name = requireNonEmpty(input.organization.name, "organization.name");
+	if (!name.ok) return name;
+	const handle = requireNonEmpty(input.organization.handle, "organization.handle");
+	if (!handle.ok) return handle;
+	const country = parseCountry(input.organization.country, "organization.country");
+	if (!country.ok) return country;
+	return {
+		ok: true,
+		value: {
+			profile: profile.value,
+			organization: {
+				name: name.value,
+				handle: handle.value,
+				country: country.value
+			}
+		}
+	};
+}
+function validateProfileInput(input) {
+	const displayName = requireNonEmpty(input.displayName, "profile.displayName");
 	if (!displayName.ok) return displayName;
-	const country = parseCountry(input.country);
+	const country = parseCountry(input.country, "profile.country");
 	if (!country.ok) return country;
 	if (input.withdrawalAddress === void 0) return {
 		ok: true,
@@ -8449,7 +8560,7 @@ function validatePersonalInput(input) {
 			country: country.value
 		}
 	};
-	const withdrawalAddress = parseAddress(input.withdrawalAddress, "withdrawalAddress");
+	const withdrawalAddress = parseAddress(input.withdrawalAddress, "profile.withdrawalAddress");
 	if (!withdrawalAddress.ok) return withdrawalAddress;
 	return {
 		ok: true,
@@ -8460,25 +8571,6 @@ function validatePersonalInput(input) {
 		}
 	};
 }
-function validateOrganizationInput(input) {
-	const organizationName = requireNonEmpty(input.organizationName, "organizationName");
-	if (!organizationName.ok) return organizationName;
-	const handle = requireNonEmpty(input.handle, "handle");
-	if (!handle.ok) return handle;
-	const ownerDisplayName = requireNonEmpty(input.ownerDisplayName, "ownerDisplayName");
-	if (!ownerDisplayName.ok) return ownerDisplayName;
-	const country = parseCountry(input.country);
-	if (!country.ok) return country;
-	return {
-		ok: true,
-		value: {
-			organizationName: organizationName.value,
-			handle: handle.value,
-			country: country.value,
-			ownerDisplayName: ownerDisplayName.value
-		}
-	};
-}
 function requireNonEmpty(value, field) {
 	const trimmed = typeof value === "string" ? value.trim() : "";
 	if (trimmed.length === 0) return fail(Errors.invalidInput(field, "must be a non-empty string"));
@@ -8487,14 +8579,14 @@ function requireNonEmpty(value, field) {
 		value: trimmed
 	};
 }
-function parseCountry(value) {
+function parseCountry(value, field = "country") {
 	try {
 		return {
 			ok: true,
 			value: toCountryCode(value)
 		};
 	} catch (cause) {
-		return fail(invalidFrom("country", cause, "must be an ISO-3166 alpha-2 code"));
+		return fail(invalidFrom(field, cause, "must be an ISO-3166 alpha-2 code"));
 	}
 }
 function parseAddress(value, field) {
@@ -8511,6 +8603,9 @@ function invalidFrom(field, cause, fallback) {
 	const message = cause instanceof Error && cause.message.length > 0 ? cause.message : fallback;
 	return Errors.invalidInput(field, message);
 }
+function isRecord(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 function fail(error) {
 	return {
 		ok: false,
@@ -8640,6 +8735,22 @@ function assembleCapxulClient(input) {
 			};
 		},
 		completeIdentityOnboarding: (write) => runPortEffect(input.ports.identity.completeOnboarding(write)),
+		ensureFounderAccountReady: async (observationSource) => {
+			const deployed = await account._internal.deploySafe(observationSource);
+			if (!deployed.ok) return deployed;
+			if (deployed.value.deployedAt === null || deployed.value.claimedAt === null) return {
+				ok: false,
+				error: Errors.wrongState({
+					method: "onboarding.completeOrganization",
+					currentState: "founderAccountClaimPending",
+					validStates: ["founderAccountDeployedAndClaimed"]
+				})
+			};
+			return {
+				ok: true,
+				value: void 0
+			};
+		},
 		triggerProvisioning: () => account._internal.provision(),
 		kickProvisioning: () => kickProvisioning?.(),
 		readLifecycle: () => account.getLifecycle(),
@@ -8802,7 +8913,7 @@ function observeSdkClient(client, adapter) {
 			if (cached !== void 0) return cached;
 			const wrapped = new Proxy(callable, {
 				apply(currentTarget, _thisArg, args) {
-					const invocationContext = resolveAdapterContext(adapter);
+					const invocationContext = invocationObservationContext(resolveAdapterContext(adapter));
 					const invocationArgs = carryInvocationContext(operation, args, invocationContext);
 					let output;
 					try {
@@ -8839,9 +8950,23 @@ function observeSdkClient(client, adapter) {
 	return wrapObject(client, []);
 }
 function carryInvocationContext(operation, args, context) {
-	if (operation !== "subAccounts.transfer" || !isPlainObject(args[0])) return args;
+	if (!isPlainObject(args[0])) return args.length === 0 && operation === "org.retrySetup" ? [attachInvocationObservation({}, context)] : args;
 	return [attachInvocationObservation({ ...args[0] }, context), ...args.slice(1)];
 }
+/** One stable correlation id per public call; the next call is an explicit retry. */
+function invocationObservationContext(context) {
+	return {
+		...context,
+		correlationId: createInvocationCorrelationId()
+	};
+}
+function createInvocationCorrelationId() {
+	if (typeof globalThis.crypto?.randomUUID === "function") return `sdk_${globalThis.crypto.randomUUID()}`;
+	const bytes = new Uint8Array(16);
+	if (typeof globalThis.crypto?.getRandomValues === "function") globalThis.crypto.getRandomValues(bytes);
+	else for (let index = 0; index < bytes.length; index += 1) bytes[index] = Math.floor(Math.random() * 256);
+	return `sdk_${Array.from(bytes, (byte) => byte.toString(16).padStart(2, "0")).join("")}`;
+}
 /** @internal Reports a factory-level typed failure without changing its identity. */
 function observeFailedResult(result, adapter, operation) {
 	if (adapter !== void 0 && isFailedResult(result)) report(adapter, "operation", operation, result.error, resolveAdapterContext(adapter));
@@ -8890,6 +9015,7 @@ function observationContextProps(context) {
 	if (context?.release !== void 0) props.release = context.release;
 	if (context?.sessionId !== void 0) props.session_id = context.sessionId;
 	if (context?.organizationId !== void 0) props.organization_id = context.organizationId;
+	if (context?.journeyId !== void 0) props.journey_id = context.journeyId;
 	if (context?.correlationId !== void 0) props.correlation_id = context.correlationId;
 	if (context?.anonymousId !== void 0) props.anonymous_id = context.anonymousId;
 	return props;
@@ -9315,7 +9441,8 @@ async function createCapxulClient$1(input) {
 			orgPort: new ConvexOrganizationAdapter({ convex: adapters.value.ports.convexCall }),
 			...signer === void 0 ? {} : { organizationSetup: new ConvexOrganizationSetupAdapter({
 				convex: adapters.value.ports.convexCall,
-				signer
+				signer,
+				chainId: adapters.value.bootstrap.chainId
 			}) },
 			...input.signal === void 0 ? {} : { signal: input.signal },
 			...input.otpTtlMs === void 0 ? {} : { otpTtlMs: input.otpTtlMs },
@@ -9586,6 +9713,6 @@ function telemetryFromPostHog(client, options = {}) {
 	});
 }
 //#endregion
-export { CAPXUL_SDK_EXPECTED_OUTCOME_EVENT, CapxulError, captureException, captureExceptionSync, createCapxulClient, deriveDevPrivateKey, devPrivateKeySigner, eip1193AccountProvider, embeddedSigner, fromPostHog, injectedWalletSigner, isCapxulError, isSettingUpLifecycle, localPrivateKeyAccountProvider, openfortEmbeddedSigner, openfortEmbeddedSignerFromWallet, openfortEmbeddedWalletPort, telemetryFromPostHog };
+export { CAPXUL_SDK_EXPECTED_OUTCOME_EVENT, CapxulError, captureException, captureExceptionSync, createCapxulClient, deriveDevPrivateKey, devPrivateKeySigner, eip1193AccountProvider, embeddedSigner, fromPostHog, injectedWalletSigner, isCapxulError, isSettingUpLifecycle, localPrivateKeyAccountProvider, openfortEmbeddedSigner, openfortEmbeddedSignerFromWallet, openfortEmbeddedWalletPort, telemetryFromPostHog, toCountryCode, toAddress as toEvmAddress };
 
 //# sourceMappingURL=index.mjs.map