@agentuity/cli 1.0.32 → 1.0.34

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/consumers.ts

@@ -0,0 +1,97 @@
+import { z } from 'zod';
+import { createCommand, createSubcommand } from '../../../types';
+import * as tui from '../../../tui';
+import { createQueueAPIClient, getQueueApiOptions } from './util';
+import { getCommand } from '../../../command-prefix';
+import { listConsumers, type Consumer } from '@agentuity/server';
+
+const ConsumersListResponseSchema = z.object({
+	consumers: z.array(
+		z.object({
+			id: z.string(),
+			client_id: z.string().nullable().optional(),
+			durable: z.boolean(),
+			connected: z.boolean(),
+			ip_address: z.string().nullable().optional(),
+			last_offset: z.number().nullable().optional(),
+		})
+	),
+});
+
+const listConsumersSubcommand = createSubcommand({
+	name: 'list',
+	aliases: ['ls'],
+	description: 'List consumers for a queue',
+	tags: ['read-only', 'fast', 'requires-auth'],
+	requires: { auth: true },
+	examples: [
+		{
+			command: getCommand('cloud queue consumers list my-queue'),
+			description: 'List queue consumers',
+		},
+	],
+	schema: {
+		args: z.object({
+			queue_name: z.string().min(1).describe('Queue name'),
+		}),
+		response: ConsumersListResponseSchema,
+	},
+	idempotent: true,
+
+	async handler(ctx) {
+		const { args, options } = ctx;
+		const client = await createQueueAPIClient(ctx);
+		const consumers = await listConsumers(client, args.queue_name, getQueueApiOptions(ctx));
+
+		if (!options.json) {
+			if (consumers.length === 0) {
+				tui.info('No consumers connected');
+			} else {
+				const tableData = consumers.map((c: Consumer) => ({
+					ID: c.id,
+					'Client ID': c.client_id || '-',
+					Durable: c.durable ? 'Yes' : 'No',
+					Connected: c.disconnected_at ? 'No' : 'Yes',
+					'IP Address': c.ip_address || '-',
+					'Last Offset': c.last_offset != null ? String(c.last_offset) : '-',
+				}));
+				tui.table(tableData, [
+					'ID',
+					'Client ID',
+					'Durable',
+					'Connected',
+					'IP Address',
+					'Last Offset',
+				]);
+			}
+		}
+
+		return {
+			consumers: consumers.map((c: Consumer) => ({
+				id: c.id,
+				client_id: c.client_id || null,
+				durable: c.durable,
+				connected: !c.disconnected_at,
+				ip_address: c.ip_address || null,
+				last_offset: c.last_offset ?? null,
+			})),
+		};
+	},
+});
+
+export const consumersSubcommand = createCommand({
+	name: 'consumers',
+	aliases: ['consumer'],
+	description: 'Manage queue consumers (WebSocket subscriptions)',
+	tags: ['requires-auth'],
+	requires: { auth: true },
+	examples: [
+		{
+			command: getCommand('cloud queue consumers list my-queue'),
+			description: 'List consumers',
+		},
+	],
+	subcommands: [listConsumersSubcommand],
+});
+
+export default consumersSubcommand;

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

@@ -18,6 +18,8 @@ const DestinationsListResponseSchema = z.object({
 	destinations: z.array(
 		z.object({
 			id: z.string(),
+			name: z.string(),
+			description: z.string().nullable().optional(),
 			destination_type: z.string(),
 			url: z.string(),
 			enabled: z.boolean(),
@@ -57,18 +59,21 @@ const listDestinationsSubcommand = createSubcommand({
 			} else {
 				const tableData = destinations.map((d: Destination) => ({
 					ID: d.id,
+					Name: d.name,
 					Type: d.destination_type,
 					URL: d.config.url,
 					Enabled: d.enabled ? 'Yes' : 'No',
 					Created: new Date(d.created_at).toLocaleString(),
 				}));
-				tui.table(tableData, ['ID', 'Type', 'URL', 'Enabled', 'Created']);
+				tui.table(tableData, ['ID', 'Name', 'Type', 'URL', 'Enabled', 'Created']);
 			}
 		}
 
 		return {
 			destinations: destinations.map((d: Destination) => ({
 				id: d.id,
+				name: d.name,
+				description: d.description ?? null,
 				destination_type: d.destination_type,
 				url: d.config.url,
 				enabled: d.enabled,
@@ -86,7 +91,7 @@ const createDestinationSubcommand = createSubcommand({
 	examples: [
 		{
 			command: getCommand(
-				'cloud queue destinations create my-queue --url https://example.com/webhook'
+				'cloud queue destinations create my-queue --name order-webhooks --url https://example.com/webhook'
 			),
 			description: 'Create a webhook destination',
 		},
@@ -96,6 +101,8 @@ const createDestinationSubcommand = createSubcommand({
 			queue_name: z.string().min(1).describe('Queue name'),
 		}),
 		options: z.object({
+			name: z.string().min(1).describe('Destination name'),
+			description: z.string().optional().describe('Destination description'),
 			url: z.string().url().describe('Webhook URL'),
 			method: z.string().default('POST').optional().describe('HTTP method (default: POST)'),
 			timeout: z.coerce.number().optional().describe('Request timeout in milliseconds'),
@@ -112,6 +119,8 @@ const createDestinationSubcommand = createSubcommand({
 				client,
 				args.queue_name,
 				{
+					name: opts.name,
+					description: opts.description,
 					destination_type: 'http',
 					config: {
 						url: opts.url,
@@ -125,6 +134,7 @@ const createDestinationSubcommand = createSubcommand({
 
 			if (!options.json) {
 				tui.success(`Created destination: ${destination.id}`);
+				console.log(`  Name:   ${destination.name}`);
 				console.log(`  URL:    ${destination.config.url}`);
 				console.log(`  Method: ${destination.config.method}`);
 			}
@@ -149,7 +159,7 @@ const updateDestinationSubcommand = createSubcommand({
 	requires: { auth: true },
 	examples: [
 		{
-			command: getCommand('cloud queue destinations update my-queue dest_abc123 --disabled'),
+			command: getCommand('cloud queue destinations update my-queue qdest_abc123 --disabled'),
 			description: 'Disable a destination',
 		},
 	],
@@ -159,6 +169,8 @@ const updateDestinationSubcommand = createSubcommand({
 			destination_id: z.string().min(1).describe('Destination ID'),
 		}),
 		options: z.object({
+			name: z.string().min(1).optional().describe('Destination name'),
+			description: z.string().optional().describe('Destination description'),
 			url: z.string().url().optional().describe('Webhook URL'),
 			method: z.string().optional().describe('HTTP method'),
 			timeout: z.coerce.number().optional().describe('Request timeout in milliseconds'),
@@ -173,10 +185,15 @@ const updateDestinationSubcommand = createSubcommand({
 		const client = await createQueueAPIClient(ctx);
 
 		const updateParams: {
+			name?: string;
+			description?: string | null;
 			config?: { url?: string; method?: string; timeout_ms?: number };
 			enabled?: boolean;
 		} = {};
 
+		if (opts.name !== undefined) updateParams.name = opts.name;
+		if (opts.description !== undefined) updateParams.description = opts.description || null;
+
 		if (opts.url || opts.method || opts.timeout !== undefined) {
 			updateParams.config = {};
 			if (opts.url) updateParams.config.url = opts.url;
@@ -202,6 +219,7 @@ const updateDestinationSubcommand = createSubcommand({
 
 		if (!options.json) {
 			tui.success(`Updated destination: ${destination.id}`);
+			console.log(`  Name:    ${destination.name}`);
 			console.log(`  URL:     ${destination.config.url}`);
 			console.log(`  Enabled: ${destination.enabled ? 'Yes' : 'No'}`);
 		}

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

@@ -11,6 +11,7 @@ import { nackSubcommand } from './nack';
 import { dlqSubcommand } from './dlq';
 import { destinationsSubcommand } from './destinations';
 import { sourcesSubcommand } from './sources';
+import { consumersSubcommand } from './consumers';
 import { pauseSubcommand } from './pause';
 import { resumeSubcommand } from './resume';
 import { statsSubcommand } from './stats';
@@ -56,6 +57,7 @@ export const command = createCommand({
 		dlqSubcommand,
 		destinationsSubcommand,
 		sourcesSubcommand,
+		consumersSubcommand,
 		pauseSubcommand,
 		resumeSubcommand,
 		statsSubcommand,

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');