@agentuity/cli 1.0.7 → 1.0.9

package/src/cmd/build/vite/server-bundler.ts

@@ -6,8 +6,9 @@
 import { join } from 'node:path';
 import { readdir, stat } from 'node:fs/promises';
 import type { Logger } from '../../../types';
-import type { BunPlugin } from 'bun';
+import type { BunPlugin, BuildOutput } from 'bun';
 import { generatePatches, applyPatch } from '../patch';
+import { getLoaderForPath, rewriteBunImports, rewritePgImports } from './db-rewrite';
 
 /**
  * Format a Bun build log (BuildMessage or ResolveMessage) into a readable string
@@ -73,6 +74,7 @@ export async function installExternalsAndBuild(options: ServerBundleOptions): Pr
 	// Load custom externals and define from agentuity.config.ts if it exists
 	const customExternals: string[] = [];
 	let userDefine: Record<string, string> = {};
+	let dbRewriteEnabled = true;
 	const configPath = join(rootDir, 'agentuity.config.ts');
 	if (await Bun.file(configPath).exists()) {
 		try {
@@ -96,6 +98,12 @@ export async function installExternalsAndBuild(options: ServerBundleOptions): Pr
 					);
 				}
 			}
+
+			// Allow users to disable db rewrite plugin
+			if (userConfig?.build?.dbRewrite === false) {
+				dbRewriteEnabled = false;
+				logger.debug('DB rewrite: disabled via agentuity.config.ts');
+			}
 		} catch (error) {
 			logger.debug('Failed to load agentuity.config.ts for externals:', error);
 		}
@@ -308,6 +316,84 @@ export async function installExternalsAndBuild(options: ServerBundleOptions): Pr
 		},
 	};
 
+	// Detect files belonging to @agentuity/postgres or @agentuity/drizzle.
+	// Matches both published paths (node_modules/@agentuity/postgres/) and
+	// symlinked/monorepo paths (packages/postgres/dist/, packages/postgres/src/).
+	const isAgentuityPostgres = (filePath: string) =>
+		filePath.includes('/@agentuity/postgres/') ||
+		filePath.includes('\\@agentuity\\postgres\\') ||
+		filePath.includes('/packages/postgres/');
+
+	const isAgentuityDrizzle = (filePath: string) =>
+		filePath.includes('/@agentuity/drizzle/') ||
+		filePath.includes('\\@agentuity\\drizzle\\') ||
+		filePath.includes('/packages/drizzle/');
+
+	const dbRewritePlugin: BunPlugin = {
+		name: 'agentuity:db-rewrite',
+		setup(build) {
+			build.onResolve({ filter: /^drizzle-orm\/bun-sql$/ }, (args) => {
+				// Don't redirect if the importer is @agentuity/drizzle itself — that would create a cycle.
+				// Matches both published packages in node_modules and symlinked monorepo paths.
+				if (args.importer && isAgentuityDrizzle(args.importer)) {
+					return; // Let default resolution handle it
+				}
+				// Resolve to @agentuity/drizzle — the bundler will find it in node_modules
+				// and bundle it into .agentuity/app.js (NOT kept external).
+				const resolved = import.meta.resolveSync('@agentuity/drizzle', args.importer);
+				logger.debug('DB rewrite: redirected drizzle-orm/bun-sql → @agentuity/drizzle');
+				return { path: resolved };
+			});
+
+			build.onLoad(
+				{
+					filter: /\.[cm]?[jt]sx?$/,
+					namespace: 'file',
+				},
+				async (args) => {
+					// Skip node_modules and the rewrite-target packages themselves.
+					// The symlink check is needed because symlinked packages (e.g. via
+					// workspace links) resolve to paths outside node_modules/ (like
+					// ../../sdk/packages/postgres/dist/) and would otherwise be rewritten,
+					// creating circular imports (postgres importing from itself).
+					if (
+						args.path.includes('/node_modules/') ||
+						isAgentuityPostgres(args.path) ||
+						isAgentuityDrizzle(args.path)
+					) {
+						return;
+					}
+					const contents = await Bun.file(args.path).text();
+					let updated = contents;
+					let didRewrite = false;
+
+					const bunResult = rewriteBunImports(updated);
+					if (bunResult.changed) {
+						logger.debug('DB rewrite: redirected bun → @agentuity/postgres');
+						updated = bunResult.contents;
+						didRewrite = true;
+					}
+
+					const pgResult = rewritePgImports(updated);
+					if (pgResult.changed) {
+						logger.debug('DB rewrite: redirected pg → @agentuity/postgres');
+						updated = pgResult.contents;
+						didRewrite = true;
+					}
+
+					if (!didRewrite) {
+						return;
+					}
+
+					return {
+						contents: updated,
+						loader: getLoaderForPath(args.path) as Bun.Loader,
+					};
+				}
+			);
+		},
+	};
+
 	const buildConfig = {
 		entrypoints: [entryPath],
 		outdir: outDir, // Output to .agentuity/ directly (not .agentuity/server/)
@@ -322,7 +408,7 @@ export async function installExternalsAndBuild(options: ServerBundleOptions): Pr
 		// Without this, NODE_ENV and other env vars get inlined as string literals
 		env: 'disable' as const,
 		define: userDefine, // Include custom define values from agentuity.config.ts
-		plugins: [patchPlugin],
+		plugins: dbRewriteEnabled ? [patchPlugin, dbRewritePlugin] : [patchPlugin],
 		naming: {
 			entry: 'app.js', // Output as app.js (not app.generated.js)
 		},
@@ -345,7 +431,7 @@ export async function installExternalsAndBuild(options: ServerBundleOptions): Pr
 
 	logger.debug(`Entry point verified: ${entryPath}`);
 
-	let result;
+	let result: BuildOutput;
 	try {
 		result = await Bun.build(buildConfig);
 	} catch (error: unknown) {

package/src/cmd/canary/index.ts

@@ -1,6 +1,7 @@
 import { createCommand } from '../../types';
 import { z } from 'zod';
 import { $ } from 'bun';
+import { tmpdir } from 'node:os';
 import * as tui from '../../tui';
 
 const CANARY_BASE_URL = 'https://agentuity-sdk-objects.t3.storageapi.dev/npm';
@@ -99,7 +100,8 @@ export const command = createCommand({
 
 		try {
 			// Install the canary version globally using the tarball URL
-			const installResult = await $`bun add -g ${tarballUrl}`.quiet().nothrow();
+			// Run from tmpdir to avoid interference from any local package.json/node_modules
+			const installResult = await $`bun add -g ${tarballUrl}`.cwd(tmpdir()).quiet().nothrow();
 
 			if (installResult.exitCode !== 0) {
 				const stderr = installResult.stderr.toString();

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

@@ -11,7 +11,8 @@ export const listSubcommand = createSubcommand({
 	name: 'list',
 	description: 'List agents for a project',
 	aliases: ['ls'],
-	requires: { auth: true, apiClient: true, project: true },
+	requires: { auth: true, apiClient: true },
+	optional: { project: true },
 	examples: [
 		{ command: getCommand('cloud agent list'), description: 'List items' },
 		{ command: getCommand('cloud agent list --verbose'), description: 'Use verbose option' },
@@ -21,13 +22,26 @@ export const listSubcommand = createSubcommand({
 		options: z.object({
 			deploymentId: z.string().optional().describe('Filter by deployment ID'),
 			verbose: z.boolean().optional().default(false).describe('Show full descriptions'),
+			orgId: z.string().optional().describe('filter by organization id'),
+			projectId: z.string().optional().describe('filter by project id'),
 		}),
 		response: z.array(AgentSchema),
 	},
-	webUrl: (ctx) => `/projects/${encodeURIComponent(ctx.project.projectId)}/agents`,
+	webUrl: (ctx) => {
+		const projectId = ctx.opts?.projectId || ctx.project?.projectId;
+		return projectId ? `/projects/${encodeURIComponent(projectId)}/agents` : undefined;
+	},
 	async handler(ctx) {
-		const { opts, apiClient, project, options } = ctx;
-		const projectId = project.projectId;
+		const { opts, project, options, apiClient } = ctx;
+
+		if (opts?.orgId && opts?.projectId) {
+			tui.fatal('--org-id and --project-id are mutually exclusive. Use one or the other.');
+		}
+
+		const projectId = opts?.projectId || project?.projectId;
+		if (!projectId) {
+			tui.fatal('Project ID is required. Use --project-id or run from a project directory.');
+		}
 		const verbose = opts?.verbose ?? false;
 
 		const agents = await tui.spinner({
@@ -36,6 +50,7 @@ export const listSubcommand = createSubcommand({
 			callback: async () => {
 				return projectAgentList(apiClient, projectId, {
 					deploymentId: opts?.deploymentId,
+					orgId: opts?.orgId,
 				});
 			},
 		});

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

@@ -25,6 +25,10 @@ export const listSubcommand = createSubcommand({
 	async handler(ctx) {
 		const { opts, apiClient, options } = ctx;
 
+		if (opts?.orgId && opts?.projectId) {
+			tui.fatal('--org-id and --project-id are mutually exclusive. Use one or the other.');
+		}
+
 		const apiKeys = await tui.spinner('Fetching API keys', () => {
 			return apikeyList(apiClient, {
 				orgId: opts?.orgId,

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

@@ -38,6 +38,7 @@ export const listSubcommand = createSubcommand({
 	],
 	schema: {
 		options: z.object({
+			orgId: z.string().optional().describe('filter by organization id'),
 			showCredentials: z
 				.boolean()
 				.optional()
@@ -59,7 +60,7 @@ export const listSubcommand = createSubcommand({
 			message: 'Fetching databases',
 			clearOnSuccess: true,
 			callback: async () => {
-				return listOrgResources(catalystClient, { type: 'db' });
+				return listOrgResources(catalystClient, { type: 'db', orgId: opts?.orgId });
 			},
 		});
 

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

@@ -2,7 +2,6 @@ import { z } from 'zod';
 import { createSubcommand } from '../../../types';
 import * as tui from '../../../tui';
 import { projectDeploymentList } from '@agentuity/server';
-import { resolveProjectId } from './utils';
 import { getCommand } from '../../../command-prefix';
 import { ErrorCode } from '../../../errors';
 
@@ -49,7 +48,8 @@ export const listSubcommand = createSubcommand({
 	},
 	schema: {
 		options: z.object({
-			'project-id': z.string().optional().describe('Project ID'),
+			orgId: z.string().optional().describe('filter by organization id'),
+			projectId: z.string().optional().describe('filter by project id'),
 			count: z.coerce
 				.number()
 				.int()
@@ -61,15 +61,25 @@ export const listSubcommand = createSubcommand({
 		response: DeploymentListResponseSchema,
 	},
 	webUrl: (ctx) => {
-		const projectId = ctx.opts?.['project-id'] || ctx.project?.projectId;
+		const projectId = ctx.opts?.projectId || ctx.project?.projectId;
 		return projectId ? `/projects/${encodeURIComponent(projectId)}/deployments` : undefined;
 	},
 	async handler(ctx) {
-		const projectId = resolveProjectId(ctx, { projectId: ctx.opts['project-id'] });
-		const { apiClient, opts, options } = ctx;
+		const { opts, options, project, apiClient } = ctx;
+
+		if (opts?.orgId && opts?.projectId) {
+			tui.fatal('--org-id and --project-id are mutually exclusive. Use one or the other.');
+		}
+
+		const projectId = opts?.projectId || project?.projectId;
+		if (!projectId) {
+			tui.fatal('Project ID is required. Use --project-id or run from a project directory.');
+		}
 
 		try {
-			const deployments = await projectDeploymentList(apiClient, projectId, opts.count);
+			const deployments = await projectDeploymentList(apiClient, projectId, opts.count, {
+				orgId: opts?.orgId,
+			});
 
 			const result = deployments.map((d) => ({
 				id: d.id,

package/src/cmd/cloud/deployment/remove.ts

@@ -40,13 +40,13 @@ export const removeSubcommand = createSubcommand({
 			deployment_id: z.string().describe('Deployment ID'),
 		}),
 		options: z.object({
-			'project-id': z.string().optional().describe('Project ID'),
+			projectId: z.string().optional().describe('filter by project id'),
 			force: z.boolean().default(false).describe('Force removal without confirmation'),
 		}),
 		response: DeploymentRemoveResponseSchema,
 	},
 	async handler(ctx) {
-		const projectId = resolveProjectId(ctx, { projectId: ctx.opts['project-id'] });
+		const projectId = resolveProjectId(ctx, { projectId: ctx.opts.projectId });
 		const { apiClient, args, opts } = ctx;
 
 		if (!opts.force) {

package/src/cmd/cloud/deployment/rollback.ts

@@ -38,12 +38,12 @@ export const rollbackSubcommand = createSubcommand({
 	prerequisites: ['cloud deploy'],
 	schema: {
 		options: z.object({
-			'project-id': z.string().optional().describe('Project ID'),
+			projectId: z.string().optional().describe('filter by project id'),
 		}),
 		response: DeploymentRollbackResponseSchema,
 	},
 	async handler(ctx) {
-		const projectId = resolveProjectId(ctx, { projectId: ctx.opts['project-id'] });
+		const projectId = resolveProjectId(ctx, { projectId: ctx.opts.projectId });
 		const { apiClient } = ctx;
 
 		try {

package/src/cmd/cloud/deployment/show.ts

@@ -77,13 +77,13 @@ export const showSubcommand = createSubcommand({
 			deployment_id: z.string().describe('Deployment ID'),
 		}),
 		options: z.object({
-			'project-id': z.string().optional().describe('Project ID'),
+			projectId: z.string().optional().describe('filter by project id'),
 		}),
 		response: DeploymentShowResponseSchema,
 	},
 	idempotent: true,
 	async handler(ctx) {
-		const projectId = resolveProjectId(ctx, { projectId: ctx.opts['project-id'] });
+		const projectId = resolveProjectId(ctx, { projectId: ctx.opts.projectId });
 		const { apiClient, args, options } = ctx;
 
 		try {

package/src/cmd/cloud/deployment/undeploy.ts

@@ -28,12 +28,12 @@ export const undeploySubcommand = createSubcommand({
 	prerequisites: ['cloud deploy'],
 	schema: {
 		options: z.object({
-			'project-id': z.string().optional().describe('Project ID'),
+			projectId: z.string().optional().describe('filter by project id'),
 			force: z.boolean().default(false).describe('Force undeploy without confirmation'),
 		}),
 	},
 	async handler(ctx) {
-		const projectId = resolveProjectId(ctx, { projectId: ctx.opts['project-id'] });
+		const projectId = resolveProjectId(ctx, { projectId: ctx.opts.projectId });
 		const { apiClient, opts } = ctx;
 
 		if (!opts.force) {

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

@@ -43,6 +43,8 @@ export const listSubcommand = createSubcommand({
 				.union([z.boolean(), z.string()])
 				.optional()
 				.describe('list organization-level variables only (use --org for default org)'),
+			orgId: z.string().optional().describe('filter by organization id'),
+			projectId: z.string().optional().describe('filter by project id'),
 		}),
 		response: EnvListResponseSchema,
 	},
@@ -58,7 +60,12 @@ export const listSubcommand = createSubcommand({
 
 	async handler(ctx) {
 		const { opts, apiClient, project, options, config } = ctx;
-		const useOrgScope = isOrgScope(opts?.org);
+
+		if (opts?.orgId && opts?.projectId) {
+			tui.fatal('--org-id and --project-id are mutually exclusive. Use one or the other.');
+		}
+
+		const useOrgScope = isOrgScope(opts?.org) || !!opts?.orgId;
 
 		// Build combined result with type info and scope
 		const result: Record<string, { value: string; secret: boolean; scope: 'project' | 'org' }> =
@@ -70,7 +77,12 @@ export const listSubcommand = createSubcommand({
 
 		if (useOrgScope) {
 			// Organization scope only
-			const orgId = await resolveOrgId(apiClient, config, opts!.org!);
+			const orgId =
+				opts?.orgId ??
+				(opts?.org ? await resolveOrgId(apiClient, config, opts.org) : undefined);
+			if (!orgId) {
+				tui.fatal('Organization ID is required. Use --org-id or --org flag.');
+			}
 
 			const orgData = await tui.spinner('Fetching organization variables', () => {
 				return orgEnvGet(apiClient, { id: orgId, mask: false });
@@ -90,11 +102,12 @@ export const listSubcommand = createSubcommand({
 					result[key] = { value, secret: true, scope: 'org' };
 				}
 			}
-		} else if (project) {
+		} else if (opts?.projectId || project) {
 			// Project context: show merged view (org + project, project takes precedence)
 			// First, get project's org ID and fetch org env
+			const effectiveProjectId = opts?.projectId || project!.projectId;
 			const projectData = await tui.spinner('Fetching variables', () => {
-				return projectGet(apiClient, { id: project.projectId, mask: false });
+				return projectGet(apiClient, { id: effectiveProjectId, mask: false });
 			});
 
 			const projectEnv = projectData.env || {};

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

@@ -56,6 +56,7 @@ export const listSubcommand = createSubcommand({
 	},
 	schema: {
 		options: z.object({
+			orgId: z.string().optional().describe('filter by organization id'),
 			count: z.coerce
 				.number()
 				.int()
@@ -76,10 +77,15 @@ export const listSubcommand = createSubcommand({
 	async handler(ctx) {
 		const { apiClient, project, opts, options } = ctx;
 
-		const projectId = opts.all ? undefined : opts.projectId || project?.projectId;
+		if (opts?.orgId && opts?.projectId) {
+			tui.fatal('--org-id and --project-id are mutually exclusive. Use one or the other.');
+		}
+
+		const projectId = opts.all || opts.orgId ? undefined : opts.projectId || project?.projectId;
 
 		try {
 			const evals = await evalList(apiClient, {
+				orgId: opts?.orgId,
 				projectId,
 				agentId: opts.agentId,
 			});

package/src/cmd/cloud/eval-run/list.ts

@@ -65,6 +65,7 @@ export const listSubcommand = createSubcommand({
 	},
 	schema: {
 		options: z.object({
+			orgId: z.string().optional().describe('filter by organization id'),
 			count: z.coerce
 				.number()
 				.int()
@@ -87,10 +88,15 @@ export const listSubcommand = createSubcommand({
 	async handler(ctx) {
 		const { apiClient, project, opts, options } = ctx;
 
-		const projectId = opts.all ? undefined : opts.projectId || project?.projectId;
+		if (opts?.orgId && opts?.projectId) {
+			tui.fatal('--org-id and --project-id are mutually exclusive. Use one or the other.');
+		}
+
+		const projectId = opts.all || opts.orgId ? undefined : opts.projectId || project?.projectId;
 
 		try {
 			const evalRuns = await evalRunList(apiClient, {
+				orgId: opts?.orgId,
 				projectId,
 				evalId: opts.evalId,
 				sessionId: opts.sessionId,

package/src/cmd/cloud/keyvalue/list-namespaces.ts

@@ -18,14 +18,17 @@ export const listNamespacesSubcommand = createCommand({
 		{ command: getCommand('kv ns'), description: 'List namespaces (short alias)' },
 	],
 	schema: {
+		options: z.object({
+			orgId: z.string().optional().describe('filter by organization id'),
+		}),
 		response: NamespaceListResponseSchema,
 	},
 	webUrl: '/services/kv',
 	idempotent: true,
 
 	async handler(ctx) {
-		const { options } = ctx;
-		const storage = await createStorageAdapter(ctx);
+		const { options, opts } = ctx;
+		const storage = await createStorageAdapter(ctx, opts?.orgId);
 		const namespaces = await storage.getNamespaces();
 
 		if (!options.json) {

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

@@ -4,15 +4,19 @@ import type { AuthData, Config, GlobalOptions, ProjectConfig } from '../../../ty
 import { getCatalystUrl } from '../../../catalyst';
 import * as tui from '../../../tui';
 
-export function createStorageAdapter(ctx: {
-	logger: Logger;
-	auth: AuthData;
-	region: string;
-	project?: ProjectConfig;
-	config: Config | null;
-	options: GlobalOptions;
-}) {
+export function createStorageAdapter(
+	ctx: {
+		logger: Logger;
+		auth: AuthData;
+		region: string;
+		project?: ProjectConfig;
+		config: Config | null;
+		options: GlobalOptions;
+	},
+	explicitOrgId?: string
+) {
 	const orgId =
+		explicitOrgId ??
 		ctx.project?.orgId ??
 		ctx.options.orgId ??
 		(process.env.AGENTUITY_CLOUD_ORG_ID || ctx.config?.preferences?.orgId);

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

@@ -35,15 +35,18 @@ export const listSubcommand = createSubcommand({
 	requires: { auth: true },
 	idempotent: true,
 	schema: {
+		options: z.object({
+			orgId: z.string().optional().describe('filter by organization id'),
+		}),
 		response: MachineListResponseSchema,
 	},
 	async handler(ctx) {
-		const { options, logger, auth, config } = ctx;
+		const { options, opts, logger, auth, config } = ctx;
 
 		const catalystClient = await getGlobalCatalystAPIClient(logger, auth, config?.name);
 
 		try {
-			const machines = await machineList(catalystClient);
+			const machines = await machineList(catalystClient, { orgId: opts?.orgId });
 
 			const result = machines.map((m) => ({
 				id: m.id,

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

@@ -31,6 +31,7 @@ export const listSubcommand = createCommand({
 	schema: {
 		args: z.object({}),
 		options: z.object({
+			orgId: z.string().optional().describe('filter by organization id'),
 			limit: z.coerce.number().optional().describe('Maximum number of queues to return'),
 			offset: z.coerce.number().optional().describe('Offset for pagination'),
 		}),
@@ -41,13 +42,14 @@ export const listSubcommand = createCommand({
 	async handler(ctx) {
 		const { options, opts } = ctx;
 		const client = await createQueueAPIClient(ctx);
+		const queueOptions = opts?.orgId ? { orgId: opts.orgId } : getQueueApiOptions(ctx);
 		const result = await listQueues(
 			client,
 			{
 				limit: opts.limit,
 				offset: opts.offset,
 			},
-			getQueueApiOptions(ctx)
+			queueOptions
 		);
 
 		if (!options.json) {

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

@@ -43,18 +43,26 @@ export const listSubcommand = createCommand({
 		}),
 		options: z.object({
 			limit: z.number().optional().describe('Maximum number of results (default: 50, max: 100)'),
+			orgId: z.string().optional().describe('filter by organization id'),
 		}),
 		response: ExecutionListResponseSchema,
 	},
 
 	async handler(ctx) {
-		const { args, opts, options, auth, logger, orgId, config } = ctx;
-		const region = await getSandboxRegion(logger, auth, config?.name, args.sandboxId, orgId);
+		const { args, opts, options, auth, logger, orgId: ctxOrgId, config } = ctx;
+		const effectiveOrgId = opts?.orgId || ctxOrgId;
+		const region = await getSandboxRegion(
+			logger,
+			auth,
+			config?.name,
+			args.sandboxId,
+			effectiveOrgId
+		);
 		const client = createSandboxClient(logger, auth, region);
 
 		const result = await executionList(client, {
 			sandboxId: args.sandboxId,
-			orgId,
+			orgId: effectiveOrgId,
 			limit: opts.limit,
 		});
 

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

@@ -82,7 +82,11 @@ export const listSubcommand = createCommand({
 	async handler(ctx) {
 		const { opts, options, project, apiClient } = ctx;
 
-		const projectId = opts.all ? undefined : opts.projectId || project?.projectId;
+		if (opts?.orgId && opts?.projectId) {
+			tui.fatal('--org-id and --project-id are mutually exclusive. Use one or the other.');
+		}
+
+		const projectId = opts.all || opts.orgId ? undefined : opts.projectId || project?.projectId;
 
 		const result = await cliSandboxList(apiClient, {
 			projectId,

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

@@ -33,16 +33,18 @@ export const listSubcommand = createCommand({
 		options: z.object({
 			limit: z.number().optional().describe('Maximum number of results'),
 			offset: z.number().optional().describe('Offset for pagination'),
+			orgId: z.string().optional().describe('filter by organization id'),
 		}),
 		response: RuntimeListResponseSchema,
 	},
 
 	async handler(ctx) {
-		const { opts, options, auth, logger, orgId, config } = ctx;
+		const { opts, options, orgId: ctxOrgId, logger, auth, config } = ctx;
 		const client = await getGlobalCatalystAPIClient(logger, auth, config?.name);
+		const effectiveOrgId = opts?.orgId || ctxOrgId;
 
 		const result = await runtimeList(client, {
-			orgId,
+			orgId: effectiveOrgId,
 			limit: opts.limit,
 			offset: opts.offset,
 		});

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

@@ -46,19 +46,21 @@ export const listSubcommand = createCommand({
 			sandbox: z.string().optional().describe('Filter by sandbox ID'),
 			limit: z.number().optional().describe('Maximum number of results'),
 			offset: z.number().optional().describe('Offset for pagination'),
+			orgId: z.string().optional().describe('filter by organization id'),
 		}),
 		response: SnapshotListResponseSchema,
 	},
 
 	async handler(ctx) {
-		const { opts, options, auth, logger, orgId, config } = ctx;
+		const { opts, options, orgId: ctxOrgId, logger, auth, config } = ctx;
 		const client = await getGlobalCatalystAPIClient(logger, auth, config?.name);
+		const effectiveOrgId = opts?.orgId || ctxOrgId;
 
 		const result = await snapshotList(client, {
 			sandboxId: opts.sandbox,
 			limit: opts.limit,
 			offset: opts.offset,
-			orgId,
+			orgId: effectiveOrgId,
 		});
 
 		if (!options.json) {

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

@@ -72,6 +72,7 @@ export const listSubcommand = createSubcommand({
 	},
 	schema: {
 		options: z.object({
+			orgId: z.string().optional().describe('filter by organization id'),
 			count: z.coerce
 				.number()
 				.int()
@@ -101,11 +102,16 @@ export const listSubcommand = createSubcommand({
 		const { logger, auth, project, opts, options, config } = ctx;
 		const catalystClient = await getGlobalCatalystAPIClient(logger, auth, config?.name);
 
-		const projectId = opts.all ? undefined : opts.projectId || project?.projectId;
+		if (opts?.orgId && opts?.projectId) {
+			tui.fatal('--org-id and --project-id are mutually exclusive. Use one or the other.');
+		}
+
+		const projectId = opts.all || opts.orgId ? undefined : opts.projectId || project?.projectId;
 
 		try {
 			const sessions = await sessionList(catalystClient, {
 				count: opts.count,
+				orgId: opts?.orgId,
 				projectId,
 				deploymentId: opts.deploymentId,
 				trigger: opts.trigger,