@agentuity/cli 1.0.32 → 1.0.33

package/src/cmd/cloud/email/stats.ts

@@ -1,9 +1,9 @@
+import { getServiceStats, type ServiceStatsData } from '@agentuity/server';
 import { z } from 'zod';
-import { createCommand } from '../../../types';
-import * as tui from '../../../tui';
-import { getGlobalCatalystAPIClient } from '../../../config';
 import { getCommand } from '../../../command-prefix';
-import { getServiceStats, type ServiceStatsData } from '@agentuity/server';
+import { getGlobalCatalystAPIClient } from '../../../config';
+import * as tui from '../../../tui';
+import { createCommand } from '../../../types';
 
 function formatNumber(n: number): string {
 	if (n >= 1_000_000) return `${(n / 1_000_000).toFixed(1)}M`;
@@ -47,7 +47,13 @@ export const statsSubcommand = createCommand({
 
 	async handler(ctx) {
 		const { opts, options } = ctx;
-		const client = await getGlobalCatalystAPIClient(ctx.logger, ctx.auth, ctx.config?.name);
+		const client = await getGlobalCatalystAPIClient(
+			ctx.logger,
+			ctx.auth,
+			ctx.config?.name,
+			undefined,
+			ctx.config
+		);
 		const orgId = ctx.orgId ?? ctx.options.orgId ?? ctx.config?.preferences?.orgId;
 
 		if (!orgId) {

package/src/cmd/cloud/email/util.ts

@@ -1,17 +1,17 @@
-import { z } from 'zod';
 import { EmailStorageService, type Logger } from '@agentuity/core';
 import { createServerFetchAdapter } from '@agentuity/server';
-import type { AuthData, Config, GlobalOptions } from '../../../types';
+import { z } from 'zod';
 import { getCatalystUrl } from '../../../catalyst';
 import { defaultProfileName, getDefaultRegion } from '../../../config';
 import * as tui from '../../../tui';
+import type { AuthData, Config, GlobalOptions } from '../../../types';
 
 export type {
 	EmailAddress,
+	EmailAttachment,
 	EmailDestination,
 	EmailInbound,
 	EmailOutbound,
-	EmailAttachment,
 	EmailSendParams,
 } from '@agentuity/core';
 
@@ -63,6 +63,6 @@ export async function createEmailAdapter(ctx: EmailContext, region?: string) {
 
 	const resolvedRegion =
 		region ?? (await getDefaultRegion(ctx.config?.name ?? defaultProfileName, ctx.config));
-	const baseUrl = getCatalystUrl(resolvedRegion);
+	const baseUrl = getCatalystUrl(resolvedRegion, ctx.config?.overrides);
 	return new EmailStorageService(baseUrl, adapter);
 }

package/src/cmd/cloud/keyvalue/util.ts

@@ -1,8 +1,8 @@
 import { KeyValueStorageService, type Logger } from '@agentuity/core';
 import { createServerFetchAdapter } from '@agentuity/server';
-import type { AuthData, Config, GlobalOptions, ProjectConfig } from '../../../types';
 import { getCatalystUrl } from '../../../catalyst';
 import * as tui from '../../../tui';
+import type { AuthData, Config, GlobalOptions, ProjectConfig } from '../../../types';
 
 export function createStorageAdapter(
 	ctx: {
@@ -36,6 +36,6 @@ export function createStorageAdapter(
 		ctx.logger
 	);
 
-	const baseUrl = getCatalystUrl(ctx.region);
+	const baseUrl = getCatalystUrl(ctx.region, ctx.config?.overrides);
 	return new KeyValueStorageService(baseUrl, adapter);
 }

package/src/cmd/cloud/machine/delete.ts

@@ -1,11 +1,11 @@
-import { z } from 'zod';
-import { createSubcommand } from '../../../types';
-import * as tui from '../../../tui';
 import { machineDelete, machineGet } from '@agentuity/server';
+import enquirer from 'enquirer';
+import { z } from 'zod';
 import { getCommand } from '../../../command-prefix';
-import { ErrorCode } from '../../../errors';
 import { getGlobalCatalystAPIClient } from '../../../config';
-import enquirer from 'enquirer';
+import { ErrorCode } from '../../../errors';
+import * as tui from '../../../tui';
+import { createSubcommand } from '../../../types';
 
 const MachineDeleteResponseSchema = z.object({
 	success: z.boolean().describe('Whether the deletion succeeded'),
@@ -41,7 +41,13 @@ export const deleteSubcommand = createSubcommand({
 	async handler(ctx) {
 		const { args, opts, options, logger, auth, config, orgId } = ctx;
 
-		const catalystClient = await getGlobalCatalystAPIClient(logger, auth, config?.name, orgId);
+		const catalystClient = await getGlobalCatalystAPIClient(
+			logger,
+			auth,
+			config?.name,
+			orgId,
+			config
+		);
 
 		try {
 			const machine = await machineGet(catalystClient, args.machine_id);

package/src/cmd/cloud/machine/deployments.ts

@@ -1,10 +1,10 @@
-import { z } from 'zod';
-import { createSubcommand } from '../../../types';
-import * as tui from '../../../tui';
 import { machineDeployments } from '@agentuity/server';
+import { z } from 'zod';
 import { getCommand } from '../../../command-prefix';
-import { ErrorCode } from '../../../errors';
 import { getGlobalCatalystAPIClient } from '../../../config';
+import { ErrorCode } from '../../../errors';
+import * as tui from '../../../tui';
+import { createSubcommand } from '../../../types';
 
 const MachineDeploymentResponseSchema = z.array(
 	z.object({
@@ -41,7 +41,13 @@ export const deploymentsSubcommand = createSubcommand({
 	async handler(ctx) {
 		const { args, options, logger, auth, config, orgId } = ctx;
 
-		const catalystClient = await getGlobalCatalystAPIClient(logger, auth, config?.name, orgId);
+		const catalystClient = await getGlobalCatalystAPIClient(
+			logger,
+			auth,
+			config?.name,
+			orgId,
+			config
+		);
 
 		try {
 			const deployments = await machineDeployments(catalystClient, args.machine_id);

package/src/cmd/cloud/machine/get.ts

@@ -1,10 +1,10 @@
-import { z } from 'zod';
-import { createSubcommand } from '../../../types';
-import * as tui from '../../../tui';
 import { machineGet } from '@agentuity/server';
+import { z } from 'zod';
 import { getCommand } from '../../../command-prefix';
-import { ErrorCode } from '../../../errors';
 import { getGlobalCatalystAPIClient } from '../../../config';
+import { ErrorCode } from '../../../errors';
+import * as tui from '../../../tui';
+import { createSubcommand } from '../../../types';
 
 const MachineGetResponseSchema = z.object({
 	id: z.string().describe('Machine ID'),
@@ -46,7 +46,13 @@ export const getSubcommand = createSubcommand({
 	async handler(ctx) {
 		const { args, options, logger, auth, config, orgId } = ctx;
 
-		const catalystClient = await getGlobalCatalystAPIClient(logger, auth, config?.name, orgId);
+		const catalystClient = await getGlobalCatalystAPIClient(
+			logger,
+			auth,
+			config?.name,
+			orgId,
+			config
+		);
 
 		try {
 			const machine = await machineGet(catalystClient, args.machine_id);

package/src/cmd/cloud/machine/list.ts

@@ -1,10 +1,10 @@
-import { z } from 'zod';
-import { createSubcommand } from '../../../types';
-import * as tui from '../../../tui';
 import { machineList } from '@agentuity/server';
+import { z } from 'zod';
 import { getCommand } from '../../../command-prefix';
-import { ErrorCode } from '../../../errors';
 import { getGlobalCatalystAPIClient } from '../../../config';
+import { ErrorCode } from '../../../errors';
+import * as tui from '../../../tui';
+import { createSubcommand } from '../../../types';
 
 const MachineListResponseSchema = z.array(
 	z.object({
@@ -43,7 +43,13 @@ export const listSubcommand = createSubcommand({
 	async handler(ctx) {
 		const { options, opts, logger, auth, config } = ctx;
 
-		const catalystClient = await getGlobalCatalystAPIClient(logger, auth, config?.name);
+		const catalystClient = await getGlobalCatalystAPIClient(
+			logger,
+			auth,
+			config?.name,
+			undefined,
+			config
+		);
 
 		try {
 			const machines = await machineList(catalystClient, { orgId: opts?.orgId });

package/src/cmd/cloud/queue/util.ts

@@ -1,5 +1,5 @@
 import type { Logger } from '@agentuity/core';
-import { APIClient, type QueueApiOptions } from '@agentuity/server';
+import type { APIClient, QueueApiOptions } from '@agentuity/server';
 import { getGlobalCatalystAPIClient } from '../../../config';
 import type { AuthData, Config, GlobalOptions } from '../../../types';
 
@@ -21,7 +21,7 @@ export interface QueueContext {
  * Uses the global Catalyst API client with user authentication.
  */
 export async function createQueueAPIClient(ctx: QueueContext): Promise<APIClient> {
-	return getGlobalCatalystAPIClient(ctx.logger, ctx.auth, ctx.config?.name);
+	return getGlobalCatalystAPIClient(ctx.logger, ctx.auth, ctx.config?.name, undefined, ctx.config);
 }
 
 /**

package/src/cmd/cloud/redis/get.ts

@@ -1,9 +1,9 @@
-import { z } from 'zod';
 import { listResources } from '@agentuity/server';
-import { createSubcommand } from '../../../types';
-import * as tui from '../../../tui';
-import { getCatalystAPIClient } from '../../../config';
+import { z } from 'zod';
 import { getCommand } from '../../../command-prefix';
+import { getCatalystAPIClient } from '../../../config';
+import * as tui from '../../../tui';
+import { createSubcommand } from '../../../types';
 
 const RedisGetResponseSchema = z.object({
 	url: z.string().optional().describe('Redis connection URL'),
@@ -42,7 +42,7 @@ export const showSubcommand = createSubcommand({
 	async handler(ctx) {
 		const { logger, opts, options, orgId, region, auth } = ctx;
 
-		const catalystClient = getCatalystAPIClient(logger, auth, region);
+		const catalystClient = getCatalystAPIClient(logger, auth, region, undefined, ctx.config);
 
 		const resources = await tui.spinner({
 			message: `Fetching Redis for ${orgId} in ${region}`,

package/src/cmd/cloud/sandbox/execution/get.ts

@@ -1,9 +1,9 @@
+import { executionGet } from '@agentuity/server';
 import { z } from 'zod';
-import { createCommand } from '../../../../types';
-import * as tui from '../../../../tui';
 import { getCommand } from '../../../../command-prefix';
-import { executionGet } from '@agentuity/server';
 import { getGlobalCatalystAPIClient } from '../../../../config';
+import * as tui from '../../../../tui';
+import { createCommand } from '../../../../types';
 
 const ExecutionGetResponseSchema = z.object({
 	executionId: z.string().describe('Execution ID'),
@@ -41,7 +41,13 @@ export const getSubcommand = createCommand({
 
 	async handler(ctx) {
 		const { args, options, auth, logger, orgId, config } = ctx;
-		const client = await getGlobalCatalystAPIClient(logger, auth, config?.name);
+		const client = await getGlobalCatalystAPIClient(
+			logger,
+			auth,
+			config?.name,
+			undefined,
+			config
+		);
 
 		const result = await executionGet(client, { executionId: args.executionId, orgId });
 

package/src/cmd/cloud/sandbox/execution/list.ts

@@ -1,9 +1,9 @@
+import { executionList } from '@agentuity/server';
 import { z } from 'zod';
-import { createCommand } from '../../../../types';
-import * as tui from '../../../../tui';
-import { getSandboxRegion, createSandboxClient } from '../util';
 import { getCommand } from '../../../../command-prefix';
-import { executionList } from '@agentuity/server';
+import * as tui from '../../../../tui';
+import { createCommand } from '../../../../types';
+import { createSandboxClient, getSandboxRegion } from '../util';
 
 const ExecutionInfoSchema = z.object({
 	executionId: z.string().describe('Execution ID'),
@@ -56,7 +56,8 @@ export const listSubcommand = createCommand({
 			auth,
 			config?.name,
 			args.sandboxId,
-			effectiveOrgId
+			effectiveOrgId,
+			config
 		);
 		const client = createSandboxClient(logger, auth, region);
 

package/src/cmd/cloud/sandbox/runtime/list.ts

@@ -1,9 +1,9 @@
+import { runtimeList } from '@agentuity/server';
 import { z } from 'zod';
-import { createCommand } from '../../../../types';
-import * as tui from '../../../../tui';
 import { getCommand } from '../../../../command-prefix';
-import { runtimeList } from '@agentuity/server';
 import { getGlobalCatalystAPIClient } from '../../../../config';
+import * as tui from '../../../../tui';
+import { createCommand } from '../../../../types';
 
 const RuntimeInfoSchema = z.object({
 	id: z.string().describe('Runtime ID'),
@@ -45,7 +45,13 @@ export const listSubcommand = createCommand({
 
 	async handler(ctx) {
 		const { opts, options, orgId: ctxOrgId, logger, auth, config } = ctx;
-		const client = await getGlobalCatalystAPIClient(logger, auth, config?.name);
+		const client = await getGlobalCatalystAPIClient(
+			logger,
+			auth,
+			config?.name,
+			undefined,
+			config
+		);
 		const effectiveOrgId = opts?.orgId || ctxOrgId;
 
 		const result = await runtimeList(client, {

package/src/cmd/cloud/sandbox/snapshot/build.ts

@@ -757,7 +757,7 @@ export const buildSubcommand = createCommand({
 			const archiveFile = Bun.file(archivePath);
 			const archiveSize = archiveFile.size;
 
-			const client = getCatalystAPIClient(logger, auth, region);
+			const client = getCatalystAPIClient(logger, auth, region, undefined, config);
 
 			// Auto-detect git info and merge with CLI overrides
 			const autoDetectedGit = await getGitInfo(directory, logger);

package/src/cmd/cloud/sandbox/snapshot/create.ts

@@ -1,9 +1,9 @@
+import { snapshotCreate } from '@agentuity/server';
 import { z } from 'zod';
-import { createCommand } from '../../../../types';
-import * as tui from '../../../../tui';
-import { getSandboxRegion, createSandboxClient } from '../util';
 import { getCommand } from '../../../../command-prefix';
-import { snapshotCreate } from '@agentuity/server';
+import * as tui from '../../../../tui';
+import { createCommand } from '../../../../types';
+import { createSandboxClient, getSandboxRegion } from '../util';
 
 const SNAPSHOT_NAME_REGEX = /^[a-zA-Z0-9_-]+$/;
 const SNAPSHOT_TAG_REGEX = /^[a-zA-Z0-9][a-zA-Z0-9._-]*$/;
@@ -87,7 +87,14 @@ export const createSubcommand = createCommand({
 		}
 
 		const profileName = config?.name;
-		const region = await getSandboxRegion(logger, auth, profileName, args.sandboxId, orgId);
+		const region = await getSandboxRegion(
+			logger,
+			auth,
+			profileName,
+			args.sandboxId,
+			orgId,
+			config
+		);
 		const client = createSandboxClient(logger, auth, region);
 
 		const snapshot = await snapshotCreate(client, {

package/src/cmd/cloud/sandbox/snapshot/delete.ts

@@ -1,9 +1,9 @@
+import { snapshotDelete } from '@agentuity/server';
 import { z } from 'zod';
-import { createCommand } from '../../../../types';
-import * as tui from '../../../../tui';
 import { getCommand } from '../../../../command-prefix';
-import { snapshotDelete } from '@agentuity/server';
 import { getGlobalCatalystAPIClient } from '../../../../config';
+import * as tui from '../../../../tui';
+import { createCommand } from '../../../../types';
 
 const SnapshotDeleteResponseSchema = z.object({
 	success: z.boolean().describe('Whether the operation succeeded'),
@@ -53,7 +53,13 @@ export const deleteSubcommand = createCommand({
 			}
 		}
 
-		const client = await getGlobalCatalystAPIClient(logger, auth, config?.name);
+		const client = await getGlobalCatalystAPIClient(
+			logger,
+			auth,
+			config?.name,
+			undefined,
+			config
+		);
 
 		await snapshotDelete(client, {
 			snapshotId: args.snapshotId,

package/src/cmd/cloud/sandbox/snapshot/get.ts

@@ -1,11 +1,11 @@
+import type { SandboxInfo } from '@agentuity/core';
+import type { SnapshotFileInfo } from '@agentuity/server';
+import { sandboxList, snapshotGet } from '@agentuity/server';
 import { z } from 'zod';
-import { createCommand } from '../../../../types';
-import * as tui from '../../../../tui';
 import { getCommand } from '../../../../command-prefix';
-import { snapshotGet, sandboxList } from '@agentuity/server';
-import type { SnapshotFileInfo } from '@agentuity/server';
-import type { SandboxInfo } from '@agentuity/core';
 import { getGlobalCatalystAPIClient } from '../../../../config';
+import * as tui from '../../../../tui';
+import { createCommand } from '../../../../types';
 
 const SnapshotFileSchema = z.object({
 	path: z.string(),
@@ -87,7 +87,13 @@ export const getSubcommand = createCommand({
 
 	async handler(ctx) {
 		const { args, options, auth, logger, orgId, config } = ctx;
-		const client = await getGlobalCatalystAPIClient(logger, auth, config?.name);
+		const client = await getGlobalCatalystAPIClient(
+			logger,
+			auth,
+			config?.name,
+			undefined,
+			config
+		);
 
 		const snapshot = await snapshotGet(client, {
 			snapshotId: args.snapshotId,

package/src/cmd/cloud/sandbox/snapshot/list.ts

@@ -1,9 +1,9 @@
+import { snapshotList } from '@agentuity/server';
 import { z } from 'zod';
-import { createCommand } from '../../../../types';
-import * as tui from '../../../../tui';
 import { getCommand } from '../../../../command-prefix';
-import { snapshotList } from '@agentuity/server';
 import { getGlobalCatalystAPIClient } from '../../../../config';
+import * as tui from '../../../../tui';
+import { createCommand } from '../../../../types';
 
 const SnapshotInfoSchema = z.object({
 	snapshotId: z.string(),
@@ -58,7 +58,13 @@ export const listSubcommand = createCommand({
 
 	async handler(ctx) {
 		const { opts, options, orgId: ctxOrgId, logger, auth, config } = ctx;
-		const client = await getGlobalCatalystAPIClient(logger, auth, config?.name);
+		const client = await getGlobalCatalystAPIClient(
+			logger,
+			auth,
+			config?.name,
+			undefined,
+			config
+		);
 		const effectiveOrgId = opts?.orgId || ctxOrgId;
 
 		const result = await snapshotList(client, {

package/src/cmd/cloud/sandbox/snapshot/tag.ts

@@ -1,9 +1,9 @@
+import { snapshotTag } from '@agentuity/server';
 import { z } from 'zod';
-import { createCommand } from '../../../../types';
-import * as tui from '../../../../tui';
 import { getCommand } from '../../../../command-prefix';
-import { snapshotTag } from '@agentuity/server';
 import { getGlobalCatalystAPIClient } from '../../../../config';
+import * as tui from '../../../../tui';
+import { createCommand } from '../../../../types';
 
 const SNAPSHOT_TAG_REGEX = /^[a-zA-Z0-9_][a-zA-Z0-9._-]*$/;
 const MAX_SNAPSHOT_TAG_LENGTH = 128;
@@ -41,7 +41,13 @@ export const tagSubcommand = createCommand({
 
 	async handler(ctx) {
 		const { args, opts, options, auth, logger, orgId, config } = ctx;
-		const client = await getGlobalCatalystAPIClient(logger, auth, config?.name);
+		const client = await getGlobalCatalystAPIClient(
+			logger,
+			auth,
+			config?.name,
+			undefined,
+			config
+		);
 
 		if (!args.tag && !opts.clear) {
 			throw new Error('Either provide a tag name or use --clear to remove the tag');

package/src/cmd/cloud/sandbox/stats.ts

@@ -1,9 +1,9 @@
+import { getServiceStats, type ServiceStatsData } from '@agentuity/server';
 import { z } from 'zod';
-import { createCommand } from '../../../types';
-import * as tui from '../../../tui';
-import { getGlobalCatalystAPIClient } from '../../../config';
 import { getCommand } from '../../../command-prefix';
-import { getServiceStats, type ServiceStatsData } from '@agentuity/server';
+import { getGlobalCatalystAPIClient } from '../../../config';
+import * as tui from '../../../tui';
+import { createCommand } from '../../../types';
 
 function formatNumber(n: number): string {
 	if (n >= 1_000_000) return `${(n / 1_000_000).toFixed(1)}M`;
@@ -56,7 +56,13 @@ export const statsSubcommand = createCommand({
 
 	async handler(ctx) {
 		const { opts, options } = ctx;
-		const client = await getGlobalCatalystAPIClient(ctx.logger, ctx.auth, ctx.config?.name);
+		const client = await getGlobalCatalystAPIClient(
+			ctx.logger,
+			ctx.auth,
+			ctx.config?.name,
+			undefined,
+			ctx.config
+		);
 		const orgId = ctx.orgId ?? ctx.options.orgId ?? ctx.config?.preferences?.orgId;
 
 		if (!orgId) {

package/src/cmd/cloud/sandbox/util.ts

@@ -1,12 +1,12 @@
 import { readFileSync } from 'node:fs';
 import { resolve } from 'node:path';
-import type { Logger, FileToWrite } from '@agentuity/core';
-import { APIClient, sandboxGet, getServiceUrls } from '@agentuity/server';
-import type { AuthData } from '../../../types';
+import type { FileToWrite, Logger } from '@agentuity/core';
+import { APIClient, getServiceUrls, sandboxGet } from '@agentuity/server';
+import { deleteResourceRegion, getResourceInfo, setResourceInfo } from '../../../cache';
 import { getGlobalCatalystAPIClient } from '../../../config';
-import { getResourceInfo, setResourceInfo, deleteResourceRegion } from '../../../cache';
-import * as tui from '../../../tui';
 import { ErrorCode } from '../../../errors';
+import * as tui from '../../../tui';
+import type { AuthData, Config } from '../../../types';
 
 export function createSandboxClient(logger: Logger, auth: AuthData, region: string): APIClient {
 	return new APIClient(getServiceUrls(region).catalyst, logger, auth.apiKey);
@@ -21,7 +21,8 @@ export async function getSandboxRegion(
 	auth: AuthData,
 	profileName = 'production',
 	sandboxId: string,
-	orgId?: string
+	orgId?: string,
+	config?: Config | null
 ): Promise<string> {
 	// Check cache first
 	const cachedInfo = await getResourceInfo('sandbox', profileName, sandboxId);
@@ -32,7 +33,13 @@ export async function getSandboxRegion(
 
 	// Fallback to API lookup using global client
 	logger.trace(`[sandbox] Cache miss for ${sandboxId}, fetching from API`);
-	const globalClient = await getGlobalCatalystAPIClient(logger, auth, profileName);
+	const globalClient = await getGlobalCatalystAPIClient(
+		logger,
+		auth,
+		profileName,
+		undefined,
+		config
+	);
 
 	const sandbox = await sandboxGet(globalClient, { sandboxId, orgId });
 	if (!sandbox.region) {

package/src/cmd/cloud/schedule/stats.ts

@@ -1,9 +1,9 @@
+import { getServiceStats, type ServiceStatsData } from '@agentuity/server';
 import { z } from 'zod';
-import { createCommand } from '../../../types';
-import * as tui from '../../../tui';
-import { getGlobalCatalystAPIClient } from '../../../config';
 import { getCommand } from '../../../command-prefix';
-import { getServiceStats, type ServiceStatsData } from '@agentuity/server';
+import { getGlobalCatalystAPIClient } from '../../../config';
+import * as tui from '../../../tui';
+import { createCommand } from '../../../types';
 
 function formatNumber(n: number): string {
 	if (n >= 1_000_000) return `${(n / 1_000_000).toFixed(1)}M`;
@@ -46,7 +46,13 @@ export const statsSubcommand = createCommand({
 
 	async handler(ctx) {
 		const { opts, options } = ctx;
-		const client = await getGlobalCatalystAPIClient(ctx.logger, ctx.auth, ctx.config?.name);
+		const client = await getGlobalCatalystAPIClient(
+			ctx.logger,
+			ctx.auth,
+			ctx.config?.name,
+			undefined,
+			ctx.config
+		);
 		const orgId = ctx.orgId ?? ctx.options.orgId ?? ctx.config?.preferences?.orgId;
 
 		if (!orgId) {

package/src/cmd/cloud/schedule/util.ts

@@ -1,9 +1,9 @@
-import { ScheduleService, type Logger } from '@agentuity/core';
+import { type Logger, ScheduleService } from '@agentuity/core';
 import { createServerFetchAdapter } from '@agentuity/server';
-import type { AuthData, Config, GlobalOptions } from '../../../types';
 import { getCatalystUrl } from '../../../catalyst';
 import { defaultProfileName, getDefaultRegion } from '../../../config';
 import * as tui from '../../../tui';
+import type { AuthData, Config, GlobalOptions } from '../../../types';
 
 export interface ScheduleContext {
 	logger: Logger;
@@ -23,6 +23,6 @@ export async function createScheduleAdapter(ctx: ScheduleContext) {
 		ctx.logger
 	);
 	const region = await getDefaultRegion(ctx.config?.name ?? defaultProfileName, ctx.config);
-	const baseUrl = getCatalystUrl(region);
+	const baseUrl = getCatalystUrl(region, ctx.config?.overrides);
 	return new ScheduleService(baseUrl, adapter);
 }

package/src/cmd/cloud/services/stats.ts

@@ -1,14 +1,14 @@
-import { z } from 'zod';
-import { createCommand } from '../../../types';
-import * as tui from '../../../tui';
-import { getGlobalCatalystAPIClient } from '../../../config';
-import { getCommand } from '../../../command-prefix';
 import {
 	getServiceStats,
-	VALID_SERVICES,
 	type ServiceName,
 	type ServiceStatsData,
+	VALID_SERVICES,
 } from '@agentuity/server';
+import { z } from 'zod';
+import { getCommand } from '../../../command-prefix';
+import { getGlobalCatalystAPIClient } from '../../../config';
+import * as tui from '../../../tui';
+import { createCommand } from '../../../types';
 
 function formatNumber(n: number): string {
 	if (n >= 1_000_000) return `${(n / 1_000_000).toFixed(1)}M`;
@@ -173,7 +173,13 @@ export const statsSubcommand = createCommand({
 
 	async handler(ctx) {
 		const { opts, options } = ctx;
-		const client = await getGlobalCatalystAPIClient(ctx.logger, ctx.auth, ctx.config?.name);
+		const client = await getGlobalCatalystAPIClient(
+			ctx.logger,
+			ctx.auth,
+			ctx.config?.name,
+			undefined,
+			ctx.config
+		);
 		const orgId = ctx.orgId ?? ctx.options.orgId ?? ctx.config?.preferences?.orgId;
 
 		if (!orgId) {