@capxul/cli 4.20.0-beta.12 → 4.20.0-beta.13

package/dist/main.mjs

@@ -16127,7 +16127,7 @@ function signerFailure(source, operation, cause) {
 }
 //#endregion
 //#region ../../packages/sdk/package.json
-var version$3 = "4.20.0-beta.12";
+var version$3 = "4.20.0-beta.13";
 //#endregion
 //#region ../../packages/sdk/src/telemetry/exception-projection.ts
 /** Fixed fallback for failures that have no safe message. */
@@ -68879,8 +68879,8 @@ function captureException(telemetry, error, context) {
 }
 //#endregion
 //#region src/runtime/version.ts
-const cliVersion = "4.20.0-beta.12";
-const sdkVersion = "4.20.0-beta.12";
+const cliVersion = "4.20.0-beta.13";
+const sdkVersion = "4.20.0-beta.13";
 const ReleaseVersion = Schema.String.check(Schema.isMaxLength(256), Schema.isPattern(/^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*)?$/u)).pipe(Schema.brand("CliReleaseVersion"));
 const parts = (version) => {
 	const [core = "", ...prerelease] = version.split("+")[0].split("-");
@@ -71669,7 +71669,11 @@ const restoreVerifiedClient = (config, opened, options) => Effect.gen(function*
 }).pipe(Effect.mapError((error) => authenticationFailure(error, opened.email)));
 const restoreAuthenticatedClient = (config, suppliedEmail, options) => Effect.gen(function* () {
 	const opened = yield* openAuthenticatedSession(config, suppliedEmail);
-	return yield* restoreVerifiedClient(config, opened, options);
+	const runtime = yield* CliRuntime;
+	return yield* withWaiting(restoreVerifiedClient(config, opened, options), {
+		...runtime,
+		label: "Session restoration"
+	});
 });
 const profileReport = (client, session, readProfile) => Effect.gen(function* () {
 	const profile = yield* call((signal) => readProfile === void 0 ? client.identity.loadCurrent({ signal }) : readProfile(signal));
@@ -71851,7 +71855,11 @@ const completeAccountSetup = (config, store, client, session, suppliedProfile, c
 //#region src/commands/account/subcommands/status/execute.ts
 const execute$77 = (config, email) => Effect.gen(function* () {
 	const { client, session } = yield* restoreAuthenticatedClient(config, email);
-	return yield* Effect.promise(() => client.account.getLifecycle()).pipe(Effect.flatMap(resultValue), Effect.map((lifecycle) => lifecycleResult(lifecycle, session.email)), Effect.mapError((error) => accountReadFailure(error, session.email)));
+	const runtime = yield* CliRuntime;
+	return yield* withWaiting(Effect.promise(() => client.account.getLifecycle()).pipe(Effect.flatMap(resultValue), Effect.map((lifecycle) => lifecycleResult(lifecycle, session.email)), Effect.mapError((error) => accountReadFailure(error, session.email))), {
+		...runtime,
+		label: "Account status"
+	});
 });
 //#endregion
 //#region src/commands/account/subcommands/status/command.ts
@@ -71860,10 +71868,14 @@ const command$79 = Command.make("status", { email: emailFlag$10 }, ({ email }) =
 //#region src/commands/account/subcommands/balance/execute.ts
 const execute$76 = (config, email) => Effect.gen(function* () {
 	const { client, session } = yield* restoreAuthenticatedClient(config, email);
-	return yield* Effect.promise((signal) => client.accounts.read({ signal })).pipe(Effect.flatMap(resultValue), Effect.map((account) => ({
+	const runtime = yield* CliRuntime;
+	return yield* withWaiting(Effect.promise((signal) => client.accounts.read({ signal })).pipe(Effect.flatMap(resultValue), Effect.map((account) => ({
 		data: { account },
 		lines: balanceLines(account)
-	})), Effect.mapError((error) => accountReadFailure(error, session.email)));
+	})), Effect.mapError((error) => accountReadFailure(error, session.email))), {
+		...runtime,
+		label: "Account balance"
+	});
 });
 //#endregion
 //#region src/commands/account/subcommands/balance/command.ts
@@ -71872,10 +71884,14 @@ const command$78 = Command.make("balance", { email: emailFlag$10 }, ({ email })
 //#region src/commands/account/subcommands/deposit/execute.ts
 const execute$75 = (config, email) => Effect.gen(function* () {
 	const { client, session } = yield* restoreAuthenticatedClient(config, email);
-	return yield* Effect.promise((signal) => client.account.profile.depositInstructions({ signal })).pipe(Effect.flatMap(resultValue), Effect.map((depositInstructions) => ({
+	const runtime = yield* CliRuntime;
+	return yield* withWaiting(Effect.promise((signal) => client.account.profile.depositInstructions({ signal })).pipe(Effect.flatMap(resultValue), Effect.map((depositInstructions) => ({
 		data: { depositInstructions },
 		lines: depositLines(depositInstructions)
-	})), Effect.mapError((error) => accountReadFailure(error, session.email)));
+	})), Effect.mapError((error) => accountReadFailure(error, session.email))), {
+		...runtime,
+		label: "Account deposit instructions"
+	});
 });
 //#endregion
 //#region src/commands/account/subcommands/deposit/command.ts
@@ -72299,7 +72315,10 @@ const readOrganization = (config, command, input, handler) => Effect.gen(functio
 	const local = command === "list" || command === "use" ? organizationId : yield* readResolvedOrganization(config, session.authUserId, organizationId);
 	const setupRead = command === "status" || command === "wait";
 	let unfinished = [];
-	if (setupRead && local === null) unfinished = yield* listUnfinishedSetups(client);
+	if (setupRead && local === null) unfinished = yield* withWaiting(listUnfinishedSetups(client), {
+		...runtime,
+		label: "Organization setup discovery"
+	});
 	let resolved = setupRead && local === null && unfinished.length === 1 ? unfinished[0].orgId : local;
 	if (setupRead && unfinished.length > 1) {
 		if (!interactive) return yield* Effect.fail(inputRequired("Provide --org to select one unfinished Organization setup."));
@@ -72312,8 +72331,14 @@ const readOrganization = (config, command, input, handler) => Effect.gen(functio
 		});
 	}
 	const exactSetupRead = setupRead && resolved !== null;
-	const organizations = exactSetupRead ? [] : yield* Effect.promise((signal) => handler.kind === "list" ? handler.listOrganizations(client, signal) : client.orgs({ signal })).pipe(Effect.flatMap(resultValue));
-	if (command === "list") unfinished = yield* listUnfinishedSetups(client, handler.kind === "list" ? handler.readSetupPage : void 0);
+	const organizations = exactSetupRead ? [] : yield* withWaiting(Effect.promise((signal) => handler.kind === "list" ? handler.listOrganizations(client, signal) : client.orgs({ signal })).pipe(Effect.flatMap(resultValue)), {
+		...runtime,
+		label: "Organization access"
+	});
+	if (command === "list") unfinished = yield* withWaiting(listUnfinishedSetups(client, handler.kind === "list" ? handler.readSetupPage : void 0), {
+		...runtime,
+		label: "Organization setup discovery"
+	});
 	if (command === "list") {
 		if (handler.kind !== "list") return yield* Effect.die("Expected Organization list handler");
 		return yield* handler.run(organizations, unfinished);
@@ -73312,6 +73337,16 @@ const contactLines = (entry) => [
 ];
 //#endregion
 //#region src/commands/contact/internal/recovery.ts
+/** Only an exact selected Organization can normalize the backend's masked denial. */
+const normalizeContactScopeFailure = (error, orgs) => {
+	const selected = [...new Set(orgs)];
+	if (selected.length !== 1 || selected[0] === void 0) return error;
+	try {
+		return normalizeOrganizationReadFailure(error, toOrgId(selected[0]));
+	} catch {
+		return error;
+	}
+};
 /** A lost write response needs readback in the same actor scope. */
 const uncertainContactFailure = (error, email, orgs, entryId) => {
 	const failure = classifyFailure(Cause.fail(error));
@@ -73357,6 +73392,12 @@ const unhideCommand = (email, orgs, entryId) => {
 	return `capxul ${orgs[0] === void 0 ? "" : "org "}contact unhide${orgs[0] === void 0 ? "" : ` --org ${shellArgument(orgs[0])}`} --entry-id ${shellArgument(entryId)} --email ${shellArgument(email)} --confirm`;
 };
 //#endregion
+//#region src/commands/contact/internal/client.ts
+const contactWaiting = (work, label) => Effect.flatMap(CliRuntime, (runtime) => withWaiting(work, {
+	...runtime,
+	label
+}));
+//#endregion
 //#region src/commands/contact/internal/selection.ts
 const selectedBook = (client, actor, orgs) => Effect.gen(function* () {
 	const ids = [...new Set(orgs)];
@@ -73373,9 +73414,9 @@ const selectedBook = (client, actor, orgs) => Effect.gen(function* () {
 	return client.org(organizationId).addressBook;
 });
 /** Preserve supplied IDs; otherwise select an exact Party in this book, including hidden entries. */
-const selectContactParty = (book, supplied) => Effect.gen(function* () {
+const selectContactParty = (book, supplied, orgs) => Effect.gen(function* () {
 	if (supplied !== null) return supplied;
-	const entries = yield* Effect.promise((signal) => book.list({ includeHidden: true }, { signal })).pipe(Effect.flatMap(resultValue));
+	const entries = yield* contactWaiting(Effect.promise((signal) => book.list({ includeHidden: true }, { signal })).pipe(Effect.flatMap(resultValue)), "Contact selection").pipe(Effect.mapError((error) => normalizeContactScopeFailure(error, orgs)));
 	if (entries.length === 0) return yield* inputRequired("No contacts are available to select.");
 	return yield* Prompt.select({
 		message: "Contact",
@@ -73411,7 +73452,10 @@ const perform$15 = (book, prepared, orgs, email) => Effect.gen(function* () {
 		],
 		question: "Add this contact?"
 	});
-	const entry = yield* Effect.promise((signal) => book.add(prepared.value, { signal })).pipe(Effect.flatMap(resultValue), Effect.mapError((error) => email === void 0 ? error : uncertainContactFailure(error, email, orgs)));
+	const entry = yield* contactWaiting(Effect.promise((signal) => book.add(prepared.value, { signal })).pipe(Effect.flatMap(resultValue)), "Contact add").pipe(Effect.mapError((error) => {
+		const scoped = normalizeContactScopeFailure(error, orgs);
+		return email === void 0 || !isCapxulError(scoped) ? scoped : uncertainContactFailure(scoped, email, orgs);
+	}));
 	return {
 		data: entry,
 		lines: [
@@ -73446,8 +73490,8 @@ const command$65 = (context) => Command.make("add", {
 //#region src/commands/contact/subcommands/get/execute.ts
 const prepare$3 = (input) => optionalPartyId(input.entryId);
 const perform$14 = (book, entryId, orgs) => Effect.gen(function* () {
-	const selected = yield* selectContactParty(book, entryId);
-	const entry = yield* Effect.promise((signal) => book.get(selected, { signal })).pipe(Effect.flatMap(resultValue));
+	const selected = yield* selectContactParty(book, entryId, orgs);
+	const entry = yield* contactWaiting(Effect.promise((signal) => book.get(selected, { signal })).pipe(Effect.flatMap(resultValue)), "Contact get").pipe(Effect.mapError((error) => normalizeContactScopeFailure(error, orgs)));
 	return {
 		data: entry,
 		lines: [actorLine(orgs), ...entry === null ? ["No contact found."] : contactLines(entry)]
@@ -73475,9 +73519,9 @@ const command$64 = (context) => Command.make("get", {
 //#endregion
 //#region src/commands/contact/internal/visibility.ts
 const performVisibility = (book, prepared, orgs, email, kind, mutate) => Effect.gen(function* () {
-	const entryId = yield* selectContactParty(book, prepared.entryId);
+	const entryId = yield* selectContactParty(book, prepared.entryId, orgs);
 	if (prepared.interactive) {
-		const current = yield* Effect.promise((signal) => book.get(entryId, { signal })).pipe(Effect.flatMap(resultValue));
+		const current = yield* contactWaiting(Effect.promise((signal) => book.get(entryId, { signal })).pipe(Effect.flatMap(resultValue)), "Contact preview").pipe(Effect.mapError((error) => normalizeContactScopeFailure(error, orgs)));
 		if (current === null) return yield* inputRequired("No contact has that --entry-id.");
 		yield* confirmWrite({
 			lines: [
@@ -73488,7 +73532,10 @@ const performVisibility = (book, prepared, orgs, email, kind, mutate) => Effect.
 			question: kind === "hide" ? "Hide this contact?" : "Show this contact again?"
 		});
 	}
-	const entry = yield* Effect.promise((signal) => mutate(entryId, signal)).pipe(Effect.flatMap(resultValue), Effect.mapError((error) => email === void 0 ? error : uncertainContactFailure(error, email, orgs, entryId)));
+	const entry = yield* contactWaiting(Effect.promise((signal) => mutate(entryId, signal)).pipe(Effect.flatMap(resultValue)), kind === "hide" ? "Contact hide" : "Contact unhide").pipe(Effect.mapError((error) => {
+		const scoped = normalizeContactScopeFailure(error, orgs);
+		return email === void 0 || !isCapxulError(scoped) ? scoped : uncertainContactFailure(scoped, email, orgs, entryId);
+	}));
 	const undo = kind !== "hide" || email === void 0 ? null : unhideCommand(email, orgs, entry.id);
 	return {
 		data: entry,
@@ -73540,9 +73587,9 @@ const prepare$1 = (input) => Effect.gen(function* () {
 	};
 });
 const perform$12 = (book, prepared, orgs, email) => Effect.gen(function* () {
-	const entryId = yield* selectContactParty(book, prepared.entryId);
+	const entryId = yield* selectContactParty(book, prepared.entryId, orgs);
 	if (prepared.interactive) {
-		const current = yield* Effect.promise((signal) => book.get(entryId, { signal })).pipe(Effect.flatMap(resultValue));
+		const current = yield* contactWaiting(Effect.promise((signal) => book.get(entryId, { signal })).pipe(Effect.flatMap(resultValue)), "Contact preview").pipe(Effect.mapError((error) => normalizeContactScopeFailure(error, orgs)));
 		if (current === null) return yield* inputRequired("No contact has that --entry-id.");
 		yield* confirmWrite({
 			lines: [
@@ -73553,10 +73600,13 @@ const perform$12 = (book, prepared, orgs, email) => Effect.gen(function* () {
 			question: "Change this contact's label?"
 		});
 	}
-	const entry = yield* Effect.promise((signal) => book.label({
+	const entry = yield* contactWaiting(Effect.promise((signal) => book.label({
 		entryId,
 		label: prepared.label
-	}, { signal })).pipe(Effect.flatMap(resultValue), Effect.mapError((error) => email === void 0 ? error : uncertainContactFailure(error, email, orgs, entryId)));
+	}, { signal })).pipe(Effect.flatMap(resultValue)), "Contact label").pipe(Effect.mapError((error) => {
+		const scoped = normalizeContactScopeFailure(error, orgs);
+		return email === void 0 || !isCapxulError(scoped) ? scoped : uncertainContactFailure(scoped, email, orgs, entryId);
+	}));
 	return {
 		data: entry,
 		lines: [
@@ -73591,7 +73641,7 @@ const command$62 = (context) => Command.make("label", {
 }, execute$59)).pipe(context.annotate("label"), Command.withDescription("Change one contact label by stable PartyId"));
 //#endregion
 //#region src/commands/contact/subcommands/list/execute.ts
-const perform$11 = (book, input, orgs) => Effect.promise((signal) => book.list(input.includeHidden ? { includeHidden: true } : void 0, { signal })).pipe(Effect.flatMap(resultValue), Effect.map((entries) => ({
+const perform$11 = (book, input, orgs) => contactWaiting(Effect.promise((signal) => book.list(input.includeHidden ? { includeHidden: true } : void 0, { signal })).pipe(Effect.flatMap(resultValue)), "Contact list").pipe(Effect.mapError((error) => normalizeContactScopeFailure(error, orgs)), Effect.map((entries) => ({
 	data: entries,
 	lines: [actorLine(orgs), ...entries.length === 0 ? ["No contacts found."] : entries.flatMap(contactLines)]
 })));
@@ -74498,7 +74548,7 @@ const resolveOwningOrganization = (client, invitationId) => Effect.gen(function*
 		}, { signal })).pipe(Effect.flatMap(resultValue));
 		const match = page.items.find((invitation) => invitation.id === invitationId);
 		if (match !== void 0) return match.orgId;
-		if (page.nextCursor === null) return yield* Effect.fail(Errors.invalidInput("invitationId", "The invitation is not in your available offers. Provide --org to read it directly."));
+		if (page.nextCursor === null) return yield* Effect.fail(invitationAccessFailure(new CapxulError("ROLE_PERMISSION_DENIED", "The invitation is unavailable.")));
 		cursor = page.nextCursor;
 	}
 });
@@ -74805,13 +74855,19 @@ const invite = Command.make("invite").pipe(annotate$6(CAPXUL_OPERATIONS.org.invi
 ]));
 //#endregion
 //#region src/commands/org/subcommands/balance/execute.ts
-const perform$9 = (scoped, organizationId, organization) => Effect.promise((signal) => scoped.treasury({ signal })).pipe(Effect.flatMap(resultValue), Effect.map((account) => ({
-	data: {
-		organizationId,
-		account
-	},
-	lines: [...organizationIdentityLines(organization), ...balanceLines(account)]
-})));
+const perform$9 = (scoped, organizationId, organization) => Effect.gen(function* () {
+	const runtime = yield* CliRuntime;
+	return yield* withWaiting(Effect.promise((signal) => scoped.treasury({ signal })).pipe(Effect.flatMap(resultValue), Effect.map((account) => ({
+		data: {
+			organizationId,
+			account
+		},
+		lines: [...organizationIdentityLines(organization), ...balanceLines(account)]
+	}))), {
+		...runtime,
+		label: "Organization balance"
+	});
+});
 const execute$46 = (config, input) => readOrganization(config, "balance", input, {
 	kind: "scoped",
 	run: ({ scoped, organizationId, organization }) => perform$9(scoped(), organizationId, organization)
@@ -74821,13 +74877,19 @@ const execute$46 = (config, input) => readOrganization(config, "balance", input,
 const command$49 = Command.make("balance", scoped, (flags) => read("org.balance", flags, execute$46)).pipe(Command.annotate(CliCommandMetadata, metadata$12("org.balance")), Command.withDescription("Read exact Organization treasury balances"));
 //#endregion
 //#region src/commands/org/subcommands/deposit/execute.ts
-const perform$8 = (scoped, organizationId, organization) => Effect.promise((signal) => scoped.profile.depositInstructions({ signal })).pipe(Effect.flatMap(resultValue), Effect.map((depositInstructions) => ({
-	data: {
-		organizationId,
-		depositInstructions
-	},
-	lines: [...organizationIdentityLines(organization), ...depositLines(depositInstructions)]
-})));
+const perform$8 = (scoped, organizationId, organization) => Effect.gen(function* () {
+	const runtime = yield* CliRuntime;
+	return yield* withWaiting(Effect.promise((signal) => scoped.profile.depositInstructions({ signal })).pipe(Effect.flatMap(resultValue), Effect.map((depositInstructions) => ({
+		data: {
+			organizationId,
+			depositInstructions
+		},
+		lines: [...organizationIdentityLines(organization), ...depositLines(depositInstructions)]
+	}))), {
+		...runtime,
+		label: "Organization deposit instructions"
+	});
+});
 const execute$45 = (config, input) => readOrganization(config, "deposit", input, {
 	kind: "scoped",
 	run: ({ scoped, organizationId, organization }) => perform$8(scoped(), organizationId, organization)
@@ -74947,10 +75009,13 @@ const accessDenied = (orgId) => new CliFailure({
 });
 const resolvePermissionScope = (config, email, explicit) => Effect.gen(function* () {
 	const { client, session } = yield* restoreAuthenticatedClient(config, email);
-	const organizations = yield* Effect.promise((signal) => client.orgs({ signal })).pipe(Effect.flatMap(resultValue));
+	const runtime = yield* CliRuntime;
+	const organizations = yield* withWaiting(Effect.promise((signal) => client.orgs({ signal })).pipe(Effect.flatMap(resultValue)), {
+		...runtime,
+		label: "Organization access"
+	});
 	let orgId = explicit ?? (yield* readOrganizationSelection(config, session.authUserId));
 	if (orgId === null) {
-		const runtime = yield* CliRuntime;
 		if (!runtime.tty || runtime.ci || runtime.mode === "json" || organizations.length === 0) return yield* inputRequired("Provide --org or select a read default with org use.");
 		orgId = yield* Prompt.select({
 			message: "Organization",
@@ -74973,7 +75038,11 @@ const resolvePermissionScope = (config, email, explicit) => Effect.gen(function*
 const execute$44 = (config, input) => Effect.gen(function* () {
 	const explicit = yield* explicitOrganization$1(input.orgs);
 	const { orgId, organization, permissions } = yield* resolvePermissionScope(config, input.email, explicit);
-	const result = yield* Effect.promise((signal) => permissions.list({ signal })).pipe(Effect.flatMap(resultValue));
+	const runtime = yield* CliRuntime;
+	const result = yield* withWaiting(Effect.promise((signal) => permissions.list({ signal })).pipe(Effect.flatMap(resultValue)), {
+		...runtime,
+		label: "Permission list"
+	});
 	return {
 		data: { permissions: result },
 		lines: permissionListLines(orgId, result, organization.name)
@@ -75006,7 +75075,11 @@ const execute$43 = (config, input) => Effect.gen(function* () {
 	const explicit = yield* explicitOrganization$1(input.orgs);
 	const permissionId = yield* readPermissionId(input.permissionId);
 	const { orgId, permissions } = yield* resolvePermissionScope(config, input.email, explicit);
-	const permission = yield* Effect.promise((signal) => permissions.get(permissionId, { signal })).pipe(Effect.flatMap(resultValue));
+	const runtime = yield* CliRuntime;
+	const permission = yield* withWaiting(Effect.promise((signal) => permissions.get(permissionId, { signal })).pipe(Effect.flatMap(resultValue)), {
+		...runtime,
+		label: "Permission read"
+	});
 	if (permission === null) return yield* notFound();
 	if (permission.permissionId !== permissionId || permission.orgId !== orgId) return yield* new CliFailure({
 		code: "INVALID_INPUT",
@@ -78745,13 +78818,19 @@ const command$23 = Command.make("list", { email: emailFlag$9 }, ({ email }) => r
 }, execute$21)).pipe(Command.annotate(CliCommandMetadata, metadata$12(CAPXUL_OPERATIONS.org.list)), Command.withDescription("List current Organization access"));
 //#endregion
 //#region src/commands/org/subcommands/me/execute.ts
-const perform$6 = (scoped, organizationId, organization) => Effect.promise((signal) => scoped.me({ signal })).pipe(Effect.flatMap(resultValue), Effect.map((member) => ({
-	data: {
-		organizationId,
-		member
-	},
-	lines: [...organizationIdentityLines(organization), ...organizationMeLines(member)]
-})));
+const perform$6 = (scoped, organizationId, organization) => Effect.gen(function* () {
+	const runtime = yield* CliRuntime;
+	return yield* withWaiting(Effect.promise((signal) => scoped.me({ signal })).pipe(Effect.flatMap(resultValue), Effect.map((member) => ({
+		data: {
+			organizationId,
+			member
+		},
+		lines: [...organizationIdentityLines(organization), ...organizationMeLines(member)]
+	}))), {
+		...runtime,
+		label: "Organization membership"
+	});
+});
 const execute$20 = (config, input) => readOrganization(config, "me", input, {
 	kind: "scoped",
 	run: ({ scoped, organizationId, organization }) => perform$6(scoped(), organizationId, organization)
@@ -78765,7 +78844,11 @@ const command$22 = Command.make("me", scoped, ({ email, orgs }) => read(CAPXUL_O
 //#endregion
 //#region src/commands/org/subcommands/member/get/execute.ts
 const perform$5 = (scoped, organizationId, organization, selectedAccountId) => Effect.gen(function* () {
-	const members = yield* Effect.promise((signal) => scoped.members({ signal })).pipe(Effect.flatMap(resultValue));
+	const runtime = yield* CliRuntime;
+	const members = yield* withWaiting(Effect.promise((signal) => scoped.members({ signal })).pipe(Effect.flatMap(resultValue)), {
+		...runtime,
+		label: "Organization members"
+	});
 	let accountId = selectedAccountId;
 	if (accountId === null) {
 		const choices = members.flatMap((member) => member.accountId === null ? [] : [{
@@ -78813,17 +78896,23 @@ const command$21 = Command.make("get", {
 }, execute$19, Option.isSome(accountId) ? { accountId: accountId.value } : {})).pipe(Command.annotate(CliCommandMetadata, metadata$12("org.member.get")), Command.withDescription("Read one member by exact Account ID"));
 //#endregion
 //#region src/commands/org/subcommands/member/list/execute.ts
-const perform$4 = (scoped, organizationId, organization) => Effect.promise((signal) => scoped.members({ signal })).pipe(Effect.flatMap(resultValue), Effect.map((members) => ({
-	data: {
-		organizationId,
-		members
-	},
-	lines: [
-		...organizationIdentityLines(organization),
-		"Members",
-		...members.length === 0 ? ["No members found."] : members.flatMap((member) => [...organizationMemberLines(member), ""])
-	]
-})));
+const perform$4 = (scoped, organizationId, organization) => Effect.gen(function* () {
+	const runtime = yield* CliRuntime;
+	return yield* withWaiting(Effect.promise((signal) => scoped.members({ signal })).pipe(Effect.flatMap(resultValue), Effect.map((members) => ({
+		data: {
+			organizationId,
+			members
+		},
+		lines: [
+			...organizationIdentityLines(organization),
+			"Members",
+			...members.length === 0 ? ["No members found."] : members.flatMap((member) => [...organizationMemberLines(member), ""])
+		]
+	}))), {
+		...runtime,
+		label: "Organization members"
+	});
+});
 const execute$18 = (config, input) => readOrganization(config, "member.list", input, {
 	kind: "scoped",
 	run: ({ scoped, organizationId, organization }) => perform$4(scoped(), organizationId, organization)
@@ -78843,17 +78932,23 @@ const command$19 = Command.make("member").pipe(Command.annotate(CliCommandMetada
 ]));
 //#endregion
 //#region src/commands/org/subcommands/members/execute.ts
-const perform$3 = (scoped, organizationId, organization) => Effect.promise((signal) => scoped.members({ signal })).pipe(Effect.flatMap(resultValue), Effect.map((members) => ({
-	data: {
-		organizationId,
-		members
-	},
-	lines: [
-		...organizationIdentityLines(organization),
-		"Members",
-		...members.length === 0 ? ["No members found."] : members.flatMap((member) => [...organizationMemberLines(member), ""])
-	]
-})));
+const perform$3 = (scoped, organizationId, organization) => Effect.gen(function* () {
+	const runtime = yield* CliRuntime;
+	return yield* withWaiting(Effect.promise((signal) => scoped.members({ signal })).pipe(Effect.flatMap(resultValue), Effect.map((members) => ({
+		data: {
+			organizationId,
+			members
+		},
+		lines: [
+			...organizationIdentityLines(organization),
+			"Members",
+			...members.length === 0 ? ["No members found."] : members.flatMap((member) => [...organizationMemberLines(member), ""])
+		]
+	}))), {
+		...runtime,
+		label: "Organization members"
+	});
+});
 const execute$17 = (config, input) => readOrganization(config, "members", input, {
 	kind: "scoped",
 	run: ({ scoped, organizationId, organization }) => perform$3(scoped(), organizationId, organization)