@agentuity/cli 0.0.43 → 0.0.45

package/src/types.ts

@@ -1,6 +1,10 @@
 import type { Logger } from '@agentuity/core';
+import { Deployment } from '@agentuity/server';
 import type * as z from 'zod';
 import { z as zod } from 'zod';
+import type { APIClient } from './api';
+
+export type { Logger };
 
 export const ConfigSchema = zod.object({
 	name: zod.string().describe('Profile name'),
@@ -20,22 +24,41 @@ export const ConfigSchema = zod.object({
 		.describe('Development mode configuration'),
 	overrides: zod
 		.object({
-			api_url: zod
+			api_url: zod.url().default('https://api.agentuity.com').describe('Override API base URL'),
+			app_url: zod.url().default('https://app.agentuity.com').describe('Override app base URL'),
+			transport_url: zod
 				.url()
-				.optional()
-				.describe('Override API base URL (default: https://api.agentuity.com)'),
-			app_url: zod
+				.default('https://catalyst.agentuity.cloud')
+				.describe('Override transport URL'),
+			stream_url: zod
 				.url()
-				.optional()
-				.describe('Override app base URL (default: https://app.agentuity.com)'),
-			transport_url: zod
+				.default('https://stream.agentuity.cloud')
+				.describe('Override stream URL'),
+			kv_url: zod
 				.url()
-				.optional()
-				.describe('Override transport URL (default: https://agentuity.ai)'),
-			websocket_url: zod
+				.default('https://catalyst.agentuity.cloud')
+				.describe('Override keyvalue URL'),
+			object_url: zod
+				.url()
+				.default('https://catalyst.agentuity.cloud')
+				.describe('Override object store URL'),
+			vector_url: zod
+				.url()
+				.default('https://catalyst.agentuity.cloud')
+				.describe('Override vector store URL'),
+			catalyst_url: zod
+				.url()
+				.default('https://catalyst.agentuity.cloud')
+				.describe('Override catalyst URL'),
+			ion_url: zod
 				.url()
 				.optional()
-				.describe('Override WebSocket URL (default: wss://api.agentuity.com)'),
+				.default('https://ion.agentuity.cloud')
+				.describe('Override ion URL'),
+			gravity_url: zod
+				.url()
+				.default('grpc://devmode.agentuity.com')
+				.describe('Override gravity URL'),
 			skip_version_check: zod.boolean().optional().describe('Skip CLI version check on startup'),
 		})
 		.optional()
@@ -50,6 +73,13 @@ export const ConfigSchema = zod.object({
 		})
 		.optional()
 		.describe('User preferences'),
+	gravity: zod
+		.object({
+			version: zod.string().optional().describe('The current gravity version'),
+			checked: zod.number().optional().describe('Last gravity check timestamp'),
+		})
+		.optional()
+		.describe('the gravity client information'),
 });
 
 export type Config = zod.infer<typeof ConfigSchema>;
@@ -73,6 +103,7 @@ export interface GlobalOptions {
 	logLevel: LogLevel;
 	logTimestamp?: boolean;
 	logPrefix?: boolean;
+	orgId?: string;
 }
 
 export interface CommandSchemas {
@@ -80,245 +111,278 @@ export interface CommandSchemas {
 	options?: z.ZodType;
 }
 
+export type ProjectConfig = zod.infer<typeof ProjectSchema>;
+
+export type Requires = {
+	auth?: true;
+	project?: true;
+	apiClient?: true;
+	org?: true;
+	regions?: true;
+	region?: true;
+};
+
+export type Optional = {
+	auth?: true | string;
+	project?: true;
+	org?: true;
+	region?: true;
+};
+
+type AddArgs<A extends z.ZodType | undefined> = A extends z.ZodType
+	? { args: z.infer<A> }
+	: Record<string, never>;
+type AddOpts<O extends z.ZodType | undefined> = O extends z.ZodType
+	? { opts: z.infer<O> }
+	: Record<string, never>;
+
+type AuthMode<R extends Requires | undefined, O extends Optional | undefined> = R extends {
+	auth: true;
+}
+	? 'required'
+	: O extends { auth: true | string }
+		? 'optional'
+		: 'none';
+
+type ProjectMode<R extends Requires | undefined, O extends Optional | undefined> = R extends {
+	project: true;
+}
+	? 'required'
+	: O extends { project: true }
+		? 'optional'
+		: 'none';
+
+type APIClientRequired<R extends Requires | undefined> = R extends { apiClient: true }
+	? true
+	: false;
+
+type AddAuth<M extends 'required' | 'optional' | 'none'> = M extends 'required'
+	? { auth: AuthData }
+	: M extends 'optional'
+		? { auth: AuthData | undefined }
+		: Record<string, never>;
+
+type AddProject<M extends 'required' | 'optional' | 'none'> = M extends 'required'
+	? { project: ProjectConfig; projectDir: string }
+	: M extends 'optional'
+		? { project?: ProjectConfig; projectDir: string }
+		: Record<string, never>;
+
+type OrgMode<R extends Requires | undefined, O extends Optional | undefined> = R extends {
+	org: true;
+}
+	? 'required'
+	: O extends { org: true }
+		? 'optional'
+		: 'none';
+
+type AddOrg<M extends 'required' | 'optional' | 'none'> = M extends 'required'
+	? { orgId: string }
+	: M extends 'optional'
+		? { orgId?: string }
+		: Record<string, never>;
+
+type RegionsRequired<R extends Requires | undefined> = R extends { regions: true } ? true : false;
+
+type AddRegions<R extends boolean> = R extends true
+	? { regions: Array<{ region: string; description: string }> }
+	: Record<string, never>;
+
+type RegionMode<R extends Requires | undefined, O extends Optional | undefined> = R extends {
+	region: true;
+}
+	? 'required'
+	: O extends { region: true }
+		? 'optional'
+		: 'none';
+
+type AddRegionOptional<M extends 'required' | 'optional' | 'none'> = M extends 'required'
+	? { region: string }
+	: M extends 'optional'
+		? { region?: string }
+		: Record<string, never>;
+
+export type CommandContextFromSpecs<
+	R extends Requires | undefined,
+	O extends Optional | undefined,
+	A extends z.ZodType | undefined = undefined,
+	Op extends z.ZodType | undefined = undefined,
+> = {
+	config: Config | null;
+	logger: Logger;
+	options: GlobalOptions;
+} & AddArgs<A> &
+	AddOpts<Op> &
+	AddAuth<AuthMode<R, O>> &
+	AddProject<ProjectMode<R, O>> &
+	AddOrg<OrgMode<R, O>> &
+	AddRegions<RegionsRequired<R>> &
+	AddRegionOptional<RegionMode<R, O>> &
+	(APIClientRequired<R> extends true ? { apiClient: APIClient } : Record<string, never>);
+
 export type CommandContext<
-	RequiresAuth extends boolean | 'optional' = false,
-	ArgsSchema extends z.ZodType | undefined = undefined,
-	OptionsSchema extends z.ZodType | undefined = undefined,
-> = RequiresAuth extends true
-	? ArgsSchema extends z.ZodType
-		? OptionsSchema extends z.ZodType
-			? {
-					config: Config | null;
-					logger: Logger;
-					options: GlobalOptions;
-					auth: AuthData;
-					args: z.infer<ArgsSchema>;
-					opts: z.infer<OptionsSchema>;
-				}
-			: {
-					config: Config | null;
-					logger: Logger;
-					options: GlobalOptions;
-					auth: AuthData;
-					args: z.infer<ArgsSchema>;
-				}
-		: OptionsSchema extends z.ZodType
-			? {
-					config: Config | null;
-					logger: Logger;
-					options: GlobalOptions;
-					auth: AuthData;
-					opts: z.infer<OptionsSchema>;
-				}
-			: {
-					config: Config | null;
-					logger: Logger;
-					options: GlobalOptions;
-					auth: AuthData;
-				}
-	: RequiresAuth extends 'optional'
-		? ArgsSchema extends z.ZodType
-			? OptionsSchema extends z.ZodType
-				? {
-						config: Config | null;
-						logger: Logger;
-						options: GlobalOptions;
-						auth: AuthData | undefined;
-						args: z.infer<ArgsSchema>;
-						opts: z.infer<OptionsSchema>;
-					}
-				: {
-						config: Config | null;
-						logger: Logger;
-						options: GlobalOptions;
-						auth: AuthData | undefined;
-						args: z.infer<ArgsSchema>;
-					}
-			: OptionsSchema extends z.ZodType
-				? {
-						config: Config | null;
-						logger: Logger;
-						options: GlobalOptions;
-						auth: AuthData | undefined;
-						opts: z.infer<OptionsSchema>;
-					}
-				: {
-						config: Config | null;
-						logger: Logger;
-						options: GlobalOptions;
-						auth: AuthData | undefined;
-					}
-		: ArgsSchema extends z.ZodType
-			? OptionsSchema extends z.ZodType
-				? {
-						config: Config | null;
-						logger: Logger;
-						options: GlobalOptions;
-						args: z.infer<ArgsSchema>;
-						opts: z.infer<OptionsSchema>;
-					}
-				: {
-						config: Config | null;
-						logger: Logger;
-						options: GlobalOptions;
-						args: z.infer<ArgsSchema>;
-					}
-			: OptionsSchema extends z.ZodType
-				? {
-						config: Config | null;
-						logger: Logger;
-						options: GlobalOptions;
-						opts: z.infer<OptionsSchema>;
-					}
-				: {
-						config: Config | null;
-						logger: Logger;
-						options: GlobalOptions;
-					};
-
-// Helper to create subcommands with proper type inference
+	R extends Requires | undefined = undefined,
+	O extends Optional | undefined = undefined,
+	A extends z.ZodType | undefined = undefined,
+	Op extends z.ZodType | undefined = undefined,
+> = CommandContextFromSpecs<R, O, A, Op>;
+
 export function createSubcommand<
-	TRequiresAuth extends boolean,
-	TOptionalAuth extends boolean | string,
-	TArgsSchema extends z.ZodType | undefined,
-	TOptionsSchema extends z.ZodType | undefined,
+	R extends Requires | undefined = undefined,
+	O extends Optional | undefined = undefined,
+	A extends z.ZodType | undefined = undefined,
+	Op extends z.ZodType | undefined = undefined,
 >(definition: {
 	name: string;
 	description: string;
+	banner?: true;
 	aliases?: string[];
 	toplevel?: boolean;
-	requiresAuth?: TRequiresAuth;
-	optionalAuth?: TOptionalAuth;
-	schema?: TArgsSchema extends z.ZodType
-		? TOptionsSchema extends z.ZodType
-			? { args: TArgsSchema; options: TOptionsSchema }
-			: { args: TArgsSchema }
-		: TOptionsSchema extends z.ZodType
-			? { options: TOptionsSchema }
+	requires?: R;
+	optional?: O;
+	schema?: A extends z.ZodType
+		? Op extends z.ZodType
+			? { args: A; options: Op }
+			: { args: A }
+		: Op extends z.ZodType
+			? { options: Op }
 			: never;
-	handler(
-		ctx: CommandContext<
-			TRequiresAuth extends true
-				? true
-				: TOptionalAuth extends true | string
-					? 'optional'
-					: false,
-			TArgsSchema,
-			TOptionsSchema
-		>
-	): void | Promise<void>;
+	handler(ctx: CommandContext<R, O, A, Op>): void | Promise<void>;
 }): SubcommandDefinition {
 	return definition as unknown as SubcommandDefinition;
 }
 
-// Helper to create commands with proper type inference
 export function createCommand<
-	TRequiresAuth extends boolean,
-	TOptionalAuth extends boolean | string,
-	TArgsSchema extends z.ZodType | undefined,
-	TOptionsSchema extends z.ZodType | undefined,
+	R extends Requires | undefined = undefined,
+	O extends Optional | undefined = undefined,
+	A extends z.ZodType | undefined = undefined,
+	Op extends z.ZodType | undefined = undefined,
 >(definition: {
 	name: string;
 	description: string;
+	banner?: true;
 	aliases?: string[];
 	hidden?: boolean;
-	requiresAuth?: TRequiresAuth;
-	optionalAuth?: TOptionalAuth;
-	schema?: TArgsSchema extends z.ZodType
-		? TOptionsSchema extends z.ZodType
-			? { args: TArgsSchema; options: TOptionsSchema }
-			: { args: TArgsSchema }
-		: TOptionsSchema extends z.ZodType
-			? { options: TOptionsSchema }
+	requires?: R;
+	optional?: O;
+	schema?: A extends z.ZodType
+		? Op extends z.ZodType
+			? { args: A; options: Op }
+			: { args: A }
+		: Op extends z.ZodType
+			? { options: Op }
 			: never;
-	handler?(
-		ctx: CommandContext<
-			TRequiresAuth extends true
-				? true
-				: TOptionalAuth extends true | string
-					? 'optional'
-					: false,
-			TArgsSchema,
-			TOptionsSchema
-		>
-	): void | Promise<void>;
+	handler?(ctx: CommandContext<R, O, A, Op>): void | Promise<void>;
 	subcommands?: SubcommandDefinition[];
 }): CommandDefinition {
 	return definition as unknown as CommandDefinition;
 }
 
-// Discriminated union for SubcommandDefinition
-export type SubcommandDefinition =
-	| {
-			name: string;
-			description: string;
-			aliases?: string[];
-			toplevel?: boolean;
-			requiresAuth: true;
-			optionalAuth?: false | string;
-			schema?: CommandSchemas;
-			handler(ctx: CommandContext): void | Promise<void>;
-	  }
+type CommandDefBase =
 	| {
 			name: string;
 			description: string;
 			aliases?: string[];
-			toplevel?: boolean;
-			requiresAuth?: false;
-			optionalAuth: true | string;
+			banner?: boolean;
 			schema?: CommandSchemas;
 			handler(ctx: CommandContext): void | Promise<void>;
+			subcommands?: SubcommandDefinition[];
 	  }
 	| {
 			name: string;
 			description: string;
 			aliases?: string[];
-			toplevel?: boolean;
-			requiresAuth?: false;
-			optionalAuth?: false;
+			banner?: boolean;
 			schema?: CommandSchemas;
-			handler(ctx: CommandContext): void | Promise<void>;
+			handler?: undefined;
+			subcommands: SubcommandDefinition[];
 	  };
 
-// Discriminated union for CommandDefinition
-export type CommandDefinition =
+type SubcommandDefBase =
 	| {
 			name: string;
 			description: string;
 			aliases?: string[];
-			hidden?: boolean;
-			requiresAuth: true;
-			optionalAuth?: false | string;
-			schema?: CommandSchemas;
-			handler?(ctx: CommandContext): void | Promise<void>;
-			subcommands?: SubcommandDefinition[];
-	  }
-	| {
-			name: string;
-			description: string;
-			aliases?: string[];
-			hidden?: boolean;
-			requiresAuth?: false;
-			optionalAuth: true | string;
+			toplevel?: boolean;
+			banner?: boolean;
 			schema?: CommandSchemas;
-			handler?(ctx: CommandContext): void | Promise<void>;
+			handler(ctx: CommandContext): void | Promise<void>;
 			subcommands?: SubcommandDefinition[];
 	  }
 	| {
 			name: string;
 			description: string;
 			aliases?: string[];
-			hidden?: boolean;
-			requiresAuth?: false;
-			optionalAuth?: false;
+			toplevel?: boolean;
+			banner?: boolean;
 			schema?: CommandSchemas;
-			handler?(ctx: CommandContext): void | Promise<void>;
-			subcommands?: SubcommandDefinition[];
+			handler?: undefined;
+			subcommands: SubcommandDefinition[];
 	  };
 
+export type CommandDefinition =
+	| (CommandDefBase & {
+			hidden?: boolean;
+			requires: Requires & { auth: true };
+			optional?: Optional & { auth?: never };
+	  })
+	| (CommandDefBase & {
+			hidden?: boolean;
+			requires?: Requires & { auth?: never };
+			optional: Optional & { auth: true | string };
+	  })
+	| (CommandDefBase & {
+			hidden?: boolean;
+			requires?: Requires & { auth?: never };
+			optional?: Optional & { auth?: never };
+	  });
+
+export type SubcommandDefinition =
+	| (SubcommandDefBase & {
+			requires: Requires & { auth: true };
+			optional?: Optional & { auth?: never };
+	  })
+	| (SubcommandDefBase & {
+			requires?: Requires & { auth?: never };
+			optional: Optional & { auth: true | string };
+	  })
+	| (SubcommandDefBase & {
+			requires?: Requires & { auth?: never };
+			optional?: Optional & { auth?: never };
+	  });
+
 export const ProjectSchema = zod.object({
 	projectId: zod.string().describe('the project id'),
 	orgId: zod.string().describe('the organization id'),
+	deployment: Deployment.optional().describe('the deployment configuration'),
+});
+
+const FileFields = {
+	filename: zod.string().describe('the relative path for the file'),
+	version: zod.string().describe('the SHA256 content of the file'),
+	identifier: zod.string().describe('the folder for the file'),
+};
+
+const BaseAgentFields = {
+	...FileFields,
+	id: zod.string().describe('the unique calculated id for the agent'),
+	name: zod.string().describe('the name of the agent'),
+	description: zod.string().optional().describe('the agent description'),
+	evals: zod
+		.array(
+			zod.object({
+				...FileFields,
+				name: zod.string().describe('the name of the eval'),
+				description: zod.string().optional().describe('the eval description'),
+			})
+		)
+		.optional()
+		.describe('the evals for the agent'),
+};
+
+const AgentSchema = zod.object({
+	...BaseAgentFields,
+	subagents: zod.array(zod.object(BaseAgentFields)).optional().describe('subagents of this agent'),
 });
 
 export const BuildMetadataSchema = zod.object({
@@ -336,16 +400,42 @@ export const BuildMetadataSchema = zod.object({
 				.describe('type specific configuration'),
 		})
 	),
-	agents: zod.array(
+	agents: zod.array(AgentSchema),
+	assets: zod.array(
 		zod.object({
-			id: zod.string().describe('the unique calculated id for the route'),
 			filename: zod.string().describe('the relative path for the file'),
-			name: zod.string().describe('the name of the agent'),
-			version: zod.string().describe('the SHA256 content of the file'),
-			identifier: zod.string().describe('the folder for the agent'),
-			description: zod.string().optional().describe('the agent description'),
+			kind: zod.string().describe('the type of asset'),
+			contentType: zod.string().describe('the content-type for the file'),
+			size: zod.number().describe('the size in bytes for the file'),
 		})
 	),
+	project: zod.object({
+		id: zod.string().describe('the project id'),
+		name: zod.string().describe('the name of the project (from package.json)'),
+		version: zod.string().optional().describe('the version of the project (from package.json)'),
+	}),
+	deployment: zod.object({
+		id: zod.string().describe('the deployment id'),
+		date: zod.string().describe('the date the deployment was created in UTC format'),
+		git: zod
+			.object({
+				repo: zod.string().optional().describe('the repository name'),
+				commit: zod.string().optional().describe('the git commit sha'),
+				message: zod.string().optional().describe('the git commit message'),
+				branch: zod.string().optional().describe('the git branch'),
+				tags: zod.array(zod.string()).optional().describe('the tags for the current branch'),
+				pr: zod.string().optional().describe('the pull request number'),
+			})
+			.optional()
+			.describe('git commit information'),
+		build: zod.object({
+			bun: zod.string().describe('the version of bun that was used to build the deployment'),
+			agentuity: zod.string().describe('the version of the agentuity runtime'),
+			arch: zod.string().describe('the machine architecture'),
+			platform: zod.string().describe('the machine os platform'),
+		}),
+	}),
 });
 
 export type BuildMetadata = zod.infer<typeof BuildMetadataSchema>;
+export type Project = zod.infer<typeof ProjectSchema>;

package/src/utils/detectSubagent.ts

@@ -0,0 +1,31 @@
+/**
+ * Detects if a file path represents a subagent based on path structure.
+ *
+ * Subagents follow the pattern: agents/parent/child/agent.ts or agents/parent/child/route.ts
+ * The path structure is currently hardcoded to 4 segments but could be made configurable later.
+ *
+ * @param filePath - The file path to analyze (can include leading './')
+ * @param srcDir - Optional source directory to strip from the path
+ * @returns Object with isSubagent flag and parentName if detected
+ */
+export function detectSubagent(
+	filePath: string,
+	srcDir?: string
+): { isSubagent: boolean; parentName: string | null } {
+	let normalizedPath = filePath;
+
+	// Strip srcDir if provided
+	if (srcDir && normalizedPath.startsWith(srcDir)) {
+		normalizedPath = normalizedPath.replace(srcDir, '');
+	}
+
+	// Strip leading './' and split into parts, filtering out empty segments
+	const pathParts = normalizedPath.replace(/^\.\//, '').split('/').filter(Boolean);
+
+	// Path structure assumption: ['agents', 'parent', 'child', 'agent.ts' | 'route.ts' | 'route']
+	// Currently hardcoded to 4 segments - consider making configurable in the future
+	const isSubagent = pathParts.length === 4 && pathParts[0] === 'agents';
+	const parentName = isSubagent ? pathParts[1] : null;
+
+	return { isSubagent, parentName };
+}

package/src/utils/zip.ts

@@ -0,0 +1,38 @@
+import { relative } from 'node:path';
+import { Glob } from 'bun';
+import AdmZip from 'adm-zip';
+
+interface Options {
+	progress?: (val: number) => void;
+	filter?: (filename: string, relative: string) => boolean;
+}
+
+export async function zipDir(dir: string, outdir: string, options?: Options) {
+	const zip = new AdmZip();
+	const files = await Array.fromAsync(new Glob('**').scan({ cwd: dir, absolute: true }));
+	const total = files.length;
+	let count = 0;
+	for (const file of files) {
+		const rel = relative(dir, file);
+		let skip = false;
+		if (options?.filter) {
+			if (!options.filter(file, rel)) {
+				skip = true;
+			}
+		}
+		if (!skip) {
+			zip.addLocalFile(file, undefined, rel);
+		}
+		count++;
+		if (options?.progress) {
+			const progress = Math.floor((count / total) * 100);
+			options.progress(progress);
+			await Bun.sleep(10); // give some time for the progress bar to render
+		}
+	}
+	await zip.writeZip(outdir);
+	if (options?.progress) {
+		options.progress(100);
+		await Bun.sleep(100); // give some time for the progress bar to render
+	}
+}

package/dist/cmd/example/create-user.d.ts

@@ -1,2 +0,0 @@
-export declare const createUserSubcommand: import("../..").SubcommandDefinition;
-//# sourceMappingURL=create-user.d.ts.map

package/dist/cmd/example/create-user.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"create-user.d.ts","sourceRoot":"","sources":["../../../src/cmd/example/create-user.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,oBAAoB,sCAkC/B,CAAC"}

package/dist/cmd/example/create.d.ts

@@ -1,2 +0,0 @@
-export declare const createCommand: import("../..").SubcommandDefinition;
-//# sourceMappingURL=create.d.ts.map

package/dist/cmd/example/create.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/cmd/example/create.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,aAAa,sCA2BxB,CAAC"}

package/dist/cmd/example/deploy.d.ts

@@ -1,2 +0,0 @@
-export declare const deploySubcommand: import("../..").SubcommandDefinition;
-//# sourceMappingURL=deploy.d.ts.map

package/dist/cmd/example/deploy.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../src/cmd/example/deploy.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,gBAAgB,sCAgC3B,CAAC"}

package/dist/cmd/example/index.d.ts

@@ -1,2 +0,0 @@
-export declare const command: import("../..").CommandDefinition;
-//# sourceMappingURL=index.d.ts.map