@agentuity/cli 0.1.18 → 0.1.20

package/dist/utils/git.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/utils/git.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@agentuity/cli",
-	"version": "0.1.18",
+	"version": "0.1.20",
 	"license": "Apache-2.0",
 	"author": "Agentuity employees and contributors",
 	"type": "module",
@@ -40,9 +40,9 @@
 		"prepublishOnly": "bun run clean && bun run build"
 	},
 	"dependencies": {
-		"@agentuity/auth": "0.1.18",
-		"@agentuity/core": "0.1.18",
-		"@agentuity/server": "0.1.18",
+		"@agentuity/auth": "0.1.20",
+		"@agentuity/core": "0.1.20",
+		"@agentuity/server": "0.1.20",
 		"@datasert/cronjs-parser": "^1.4.0",
 		"@terascope/fetch-github-release": "^2.2.1",
 		"@vitejs/plugin-react": "^5.1.2",
@@ -60,10 +60,10 @@
 		"typescript": "^5.9.0",
 		"vite": "^7.2.7",
 		"zod": "^4.3.5",
-		"@agentuity/frontend": "0.1.18"
+		"@agentuity/frontend": "0.1.20"
 	},
 	"devDependencies": {
-		"@agentuity/test-utils": "0.1.18",
+		"@agentuity/test-utils": "0.1.20",
 		"@types/adm-zip": "^0.5.7",
 		"@types/bun": "latest",
 		"@types/tar-fs": "^2.0.4",

package/src/cmd/build/vite/metadata-generator.ts

@@ -4,13 +4,14 @@
  * Generates agentuity.metadata.json and .routemapping.json from discovered agents and routes
  */
 
-import { join, dirname } from 'node:path';
+import { join } from 'node:path';
 import { writeFileSync, mkdirSync, existsSync, readFileSync, statSync, readdirSync } from 'node:fs';
 import type { BuildMetadata } from '@agentuity/server';
 import type { AgentMetadata } from './agent-discovery';
 import type { RouteMetadata } from './route-discovery';
 import type { Logger, DeployOptions } from '../../../types';
 import { getVersion } from '../../../version';
+import { getGitInfo, buildGitTags } from '../../../utils/git';
 
 interface ViteManifestEntry {
 	file: string;
@@ -473,6 +474,12 @@ export async function generateMetadata(options: MetadataGeneratorOptions): Promi
 		},
 	};
 
+	// Build tags from git info (includes 'latest', branch, and short commit)
+	const gitInfo = metadata.deployment.git;
+	if (gitInfo) {
+		gitInfo.tags = buildGitTags(gitInfo);
+	}
+
 	if (options.deploymentOptions) {
 		const git = { ...(metadata.deployment.git ?? {}), ...options.deploymentOptions };
 		if (options.deploymentOptions.pullRequestNumber) {
@@ -489,144 +496,6 @@ export async function generateMetadata(options: MetadataGeneratorOptions): Promi
 	return metadata;
 }
 
-/**
- * Get git information (branch, repo, provider, tags)
- */
-async function getGitInfo(
-	rootDir: string,
-	logger: Logger
-): Promise<
-	| {
-			branch?: string;
-			repo?: string;
-			provider?: string;
-			tags?: string[];
-			commit?: string;
-			message?: string;
-	  }
-	| undefined
-> {
-	if (!Bun.which('git')) {
-		logger.trace('git not found in PATH');
-		return undefined;
-	}
-
-	try {
-		// Find .git directory (may be in parent directories for monorepos)
-		let gitDir = join(rootDir, '.git');
-		let parentDir = dirname(dirname(gitDir));
-		while (!existsSync(gitDir) && parentDir !== dirname(parentDir) && gitDir !== '/') {
-			gitDir = join(parentDir, '.git');
-			parentDir = dirname(parentDir);
-		}
-
-		if (!existsSync(gitDir)) {
-			logger.trace('No .git directory found');
-			return undefined;
-		}
-
-		const $ = Bun.$;
-		const gitInfo: {
-			branch?: string;
-			repo?: string;
-			provider?: string;
-			tags?: string[];
-			commit?: string;
-			message?: string;
-		} = {
-			provider: 'git',
-		};
-
-		// Get git tags pointing to HEAD
-		const tagResult = $`git tag -l --points-at HEAD`.nothrow().quiet();
-		if (tagResult) {
-			const tagText = await tagResult.text();
-			if (tagText) {
-				gitInfo.tags = tagText
-					.trim()
-					.split(/\n/)
-					.map((s) => s.trim())
-					.filter(Boolean);
-			}
-		}
-
-		// Get current branch
-		const branchResult = $`git branch --show-current`.nothrow().quiet();
-		if (branchResult) {
-			const branchText = await branchResult.text();
-			if (branchText) {
-				gitInfo.branch = branchText.trim();
-			}
-		}
-
-		// Get commit SHA
-		const commitResult = $`git rev-parse HEAD`.nothrow().quiet();
-		if (commitResult) {
-			const commitText = await commitResult.text();
-			if (commitText) {
-				gitInfo.commit = commitText.trim();
-
-				// Get commit message
-				const msgResult = $`git log --pretty=format:%s -n1 ${gitInfo.commit}`.nothrow().quiet();
-				if (msgResult) {
-					const msgText = await msgResult.text();
-					if (msgText) {
-						gitInfo.message = msgText.trim();
-					}
-				}
-			}
-		}
-
-		// Get remote origin URL and parse
-		const originResult = $`git config --get remote.origin.url`.nothrow().quiet();
-		if (originResult) {
-			const originText = await originResult.text();
-			if (originText) {
-				const remoteUrl = originText.trim();
-
-				// Parse provider and repo from URL
-				if (remoteUrl.includes('github.com')) {
-					gitInfo.provider = 'github';
-					const match = remoteUrl.match(/github\.com[:/](.+?)(?:\.git)?$/);
-					if (match) {
-						gitInfo.repo = `https://github.com/${match[1]}`;
-					}
-				} else if (remoteUrl.includes('gitlab.com')) {
-					gitInfo.provider = 'gitlab';
-					const match = remoteUrl.match(/gitlab\.com[:/](.+?)(?:\.git)?$/);
-					if (match) {
-						gitInfo.repo = `https://gitlab.com/${match[1]}`;
-					}
-				} else if (remoteUrl.includes('bitbucket.org')) {
-					gitInfo.provider = 'bitbucket';
-					const match = remoteUrl.match(/bitbucket\.org[:/](.+?)(?:\.git)?$/);
-					if (match) {
-						gitInfo.repo = `https://bitbucket.org/${match[1]}`;
-					}
-				} else {
-					gitInfo.repo = remoteUrl;
-				}
-			}
-		}
-
-		// Build tags array with defaults
-		const tags = new Set(gitInfo.tags ?? []);
-		tags.add('latest');
-		if (gitInfo.branch) {
-			tags.add(gitInfo.branch);
-		}
-		if (gitInfo.commit) {
-			tags.add(gitInfo.commit.substring(0, 7));
-		}
-		gitInfo.tags = Array.from(tags);
-
-		return gitInfo;
-	} catch (error) {
-		logger.trace(`Failed to get git info: ${error}`);
-		return undefined;
-	}
-}
-
 /**
  * Generate AGENTS.md content for AI coding agents
  */

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

@@ -12,6 +12,22 @@ const SandboxResourcesSchema = z.object({
 	disk: z.string().optional().describe('Disk limit (e.g., "1Gi", "10Gi")'),
 });
 
+const SandboxRuntimeInfoSchema = z.object({
+	id: z.string().describe('Runtime ID'),
+	name: z.string().describe('Runtime name'),
+	iconUrl: z.string().optional().describe('URL for runtime icon'),
+	brandColor: z.string().optional().describe('Brand color for the runtime'),
+	tags: z.array(z.string()).optional().describe('Runtime tags'),
+});
+
+const SandboxSnapshotInfoSchema = z.object({
+	id: z.string().describe('Snapshot ID'),
+	name: z.string().optional().describe('Snapshot name'),
+	tag: z.string().optional().describe('Snapshot tag'),
+	fullName: z.string().optional().describe('Full name with org slug'),
+	public: z.boolean().describe('Whether snapshot is public'),
+});
+
 const SandboxGetResponseSchema = z.object({
 	sandboxId: z.string().describe('Sandbox ID'),
 	name: z.string().optional().describe('Sandbox name'),
@@ -19,10 +35,8 @@ const SandboxGetResponseSchema = z.object({
 	status: z.string().describe('Current status'),
 	createdAt: z.string().describe('Creation timestamp'),
 	region: z.string().optional().describe('Region where sandbox is running'),
-	runtimeId: z.string().optional().describe('Runtime ID'),
-	runtimeName: z.string().optional().describe('Runtime name'),
-	snapshotId: z.string().optional().describe('Snapshot ID sandbox was created from'),
-	snapshotTag: z.string().optional().describe('Snapshot tag sandbox was created from'),
+	runtime: SandboxRuntimeInfoSchema.optional().describe('Runtime information'),
+	snapshot: SandboxSnapshotInfoSchema.optional().describe('Snapshot information'),
 	executions: z.number().describe('Number of executions'),
 	stdoutStreamUrl: z.string().optional().describe('URL to stdout output stream'),
 	stderrStreamUrl: z.string().optional().describe('URL to stderr output stream'),
@@ -73,15 +87,6 @@ export const getSubcommand = createCommand({
 							? tui.colorError
 							: tui.colorMuted;
 
-			const snapshotDisplay =
-				result.snapshotId || result.snapshotTag
-					? result.snapshotTag
-						? result.snapshotId
-							? `${result.snapshotTag} ${tui.muted('(' + result.snapshotId + ')')}`
-							: result.snapshotTag
-						: result.snapshotId
-					: undefined;
-
 			let streamDisplay: string | undefined;
 			if (
 				result.stdoutStreamUrl &&
@@ -106,9 +111,15 @@ export const getSubcommand = createCommand({
 			if (result.description) tableData['Description'] = result.description;
 			tableData['Status'] = statusColor(result.status);
 			tableData['Created'] = result.createdAt;
-			if (result.runtimeName) tableData['Runtime'] = result.runtimeName;
+			if (result.runtime?.name) tableData['Runtime'] = result.runtime.name;
 			if (result.region) tableData['Region'] = result.region;
-			if (snapshotDisplay) tableData['Snapshot'] = snapshotDisplay;
+			if (result.snapshot?.id) {
+				const snapshotDisplay =
+					result.snapshot.public && result.snapshot.fullName
+						? result.snapshot.fullName
+						: result.snapshot.tag || result.snapshot.id;
+				tableData['Snapshot'] = snapshotDisplay;
+			}
 			tableData['Executions'] = result.executions;
 			if (streamDisplay) {
 				tableData['Stream'] = streamDisplay;
@@ -141,10 +152,8 @@ export const getSubcommand = createCommand({
 			status: result.status,
 			createdAt: result.createdAt,
 			region: result.region,
-			runtimeId: result.runtimeId,
-			runtimeName: result.runtimeName,
-			snapshotId: result.snapshotId,
-			snapshotTag: result.snapshotTag,
+			runtime: result.runtime,
+			snapshot: result.snapshot,
 			executions: result.executions,
 			stdoutStreamUrl: result.stdoutStreamUrl,
 			stderrStreamUrl: result.stderrStreamUrl,

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

@@ -6,6 +6,45 @@ import { sandboxList } from '@agentuity/server';
 import { getGlobalCatalystAPIClient } from '../../../config';
 import type { SandboxStatus } from '@agentuity/core';
 
+const SandboxRuntimeInfoSchema = z.object({
+	id: z.string().describe('Runtime ID'),
+	name: z.string().describe('Runtime name'),
+	iconUrl: z.string().optional().describe('URL for runtime icon'),
+	brandColor: z.string().optional().describe('Brand color for the runtime'),
+	tags: z.array(z.string()).optional().describe('Runtime tags'),
+});
+
+const SandboxSnapshotUserInfoSchema = z.object({
+	id: z.string().describe('User ID'),
+	firstName: z.string().optional().describe("User's first name"),
+	lastName: z.string().optional().describe("User's last name"),
+});
+
+const SandboxSnapshotOrgInfoSchema = z.object({
+	id: z.string().describe('Organization ID'),
+	name: z.string().describe('Organization name'),
+	slug: z.string().optional().describe('Organization slug'),
+});
+
+const SandboxSnapshotInfoSchema = z.discriminatedUnion('public', [
+	z.object({
+		id: z.string().describe('Snapshot ID'),
+		name: z.string().optional().describe('Snapshot name'),
+		tag: z.string().nullable().optional().describe('Snapshot tag'),
+		fullName: z.string().optional().describe('Full name with org slug'),
+		public: z.literal(true).describe('Public snapshot'),
+		org: SandboxSnapshotOrgInfoSchema.describe('Organization that owns the public snapshot'),
+	}),
+	z.object({
+		id: z.string().describe('Snapshot ID'),
+		name: z.string().optional().describe('Snapshot name'),
+		tag: z.string().nullable().optional().describe('Snapshot tag'),
+		fullName: z.string().optional().describe('Full name with org slug'),
+		public: z.literal(false).describe('Private snapshot'),
+		user: SandboxSnapshotUserInfoSchema.describe('User who created the private snapshot'),
+	}),
+]);
+
 const SandboxInfoSchema = z.object({
 	sandboxId: z.string().describe('Sandbox ID'),
 	name: z.string().optional().describe('Sandbox name'),
@@ -13,10 +52,8 @@ const SandboxInfoSchema = z.object({
 	status: z.string().describe('Current status'),
 	createdAt: z.string().describe('Creation timestamp'),
 	region: z.string().optional().describe('Region where sandbox is running'),
-	runtimeId: z.string().optional().describe('Runtime ID'),
-	runtimeName: z.string().optional().describe('Runtime name'),
-	snapshotId: z.string().optional().describe('Snapshot ID sandbox was created from'),
-	snapshotTag: z.string().optional().describe('Snapshot tag sandbox was created from'),
+	runtime: SandboxRuntimeInfoSchema.optional().describe('Runtime information'),
+	snapshot: SandboxSnapshotInfoSchema.optional().describe('Snapshot information'),
 	executions: z.number().describe('Number of executions'),
 });
 
@@ -100,7 +137,7 @@ export const listSubcommand = createCommand({
 					return {
 						ID: sandbox.sandboxId,
 						Name: sandbox.name || '-',
-						Runtime: sandbox.runtimeName || '-',
+						Runtime: sandbox.runtime?.name || '-',
 						Status: sandbox.status,
 						'Created At': sandbox.createdAt,
 						Executions: sandbox.executions,
@@ -127,10 +164,8 @@ export const listSubcommand = createCommand({
 				status: s.status,
 				createdAt: s.createdAt,
 				region: s.region,
-				runtimeId: s.runtimeId,
-				runtimeName: s.runtimeName,
-				snapshotId: s.snapshotId,
-				snapshotTag: s.snapshotTag,
+				runtime: s.runtime,
+				snapshot: s.snapshot,
 				executions: s.executions,
 			})),
 			total: result.total,

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

@@ -13,9 +13,10 @@ import {
 	snapshotUpload,
 	SnapshotBuildFileSchema,
 } from '@agentuity/server';
-import type { SnapshotFileInfo } from '@agentuity/server';
+import type { SnapshotFileInfo, SnapshotBuildGitInfo } from '@agentuity/server';
 import { getCatalystAPIClient } from '../../../../config';
 import { validateAptDependencies } from '../../../../utils/apt-validator';
+import { getGitInfo, mergeGitInfo } from '../../../../utils/git';
 import { encryptFIPSKEMDEMStream } from '../../../../crypto/box';
 import { tmpdir } from 'node:os';
 import { randomUUID, createHash, createPublicKey } from 'node:crypto';
@@ -351,6 +352,15 @@ export const buildSubcommand = createCommand({
 			name: z.string().optional().describe('Snapshot name (overrides build file)'),
 			tag: z.string().optional().describe('Snapshot tag (defaults to "latest")'),
 			description: z.string().optional().describe('Snapshot description (overrides build file)'),
+			message: z.string().optional().describe('Build message for this snapshot'),
+			commit: z.string().optional().describe('Git commit SHA (auto-detected if not provided)'),
+			branch: z.string().optional().describe('Git branch (auto-detected if not provided)'),
+			repo: z.string().optional().describe('Git repo URL (auto-detected if not provided)'),
+			provider: z
+				.string()
+				.optional()
+				.describe('Git provider (github, gitlab, bitbucket - auto-detected)'),
+			commitUrl: z.string().optional().describe('URL to the commit'),
 			metadata: z.array(z.string()).optional().describe('Metadata key-value pairs (KEY=VALUE)'),
 			force: z.boolean().optional().describe('Force rebuild even if content is unchanged'),
 			public: z
@@ -658,6 +668,34 @@ export const buildSubcommand = createCommand({
 
 			const client = getCatalystAPIClient(logger, auth, region);
 
+			// Auto-detect git info and merge with CLI overrides
+			const autoDetectedGit = await getGitInfo(directory, logger);
+			const mergedGitInfo = mergeGitInfo(autoDetectedGit, {
+				message: opts.message,
+				commit: opts.commit,
+				branch: opts.branch,
+				repo: opts.repo,
+				provider: opts.provider,
+				commitUrl: opts.commitUrl,
+			});
+
+			// Build git info for API (only include if we have any git data)
+			const hasGitInfo =
+				mergedGitInfo.branch ||
+				mergedGitInfo.commit ||
+				mergedGitInfo.repo ||
+				mergedGitInfo.provider ||
+				mergedGitInfo.commitUrl;
+			const gitInfo: SnapshotBuildGitInfo | undefined = hasGitInfo
+				? {
+						branch: mergedGitInfo.branch,
+						commit: mergedGitInfo.commit,
+						repo: mergedGitInfo.repo,
+						provider: mergedGitInfo.provider,
+						commitUrl: mergedGitInfo.commitUrl,
+					}
+				: undefined;
+
 			const initResult = await tui.spinner({
 				message: 'Initializing snapshot build...',
 				clearOnSuccess: true,
@@ -667,6 +705,8 @@ export const buildSubcommand = createCommand({
 						name: finalName,
 						tag: opts.tag ?? 'latest',
 						description: finalDescription,
+						message: mergedGitInfo.message,
+						git: gitInfo,
 						contentHash,
 						force: opts.force,
 						encrypt: !isPublic,

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

@@ -15,11 +15,29 @@ const SnapshotFileSchema = z.object({
 	mode: z.number(),
 });
 
+const SandboxRuntimeInfoSchema = z.object({
+	id: z.string().describe('Runtime ID'),
+	name: z.string().describe('Runtime name'),
+	iconUrl: z.string().optional().describe('URL for runtime icon'),
+	brandColor: z.string().optional().describe('Brand color for the runtime'),
+	tags: z.array(z.string()).optional().describe('Runtime tags'),
+});
+
+const SandboxSnapshotInfoSchema = z.object({
+	id: z.string().describe('Snapshot ID'),
+	name: z.string().optional().describe('Snapshot name'),
+	tag: z.string().optional().describe('Snapshot tag'),
+	fullName: z.string().optional().describe('Full name with org slug'),
+	public: z.boolean().describe('Whether snapshot is public'),
+});
+
 const SandboxInfoSchema = z.object({
 	sandboxId: z.string().describe('Sandbox ID'),
 	status: z.string().describe('Current status'),
 	createdAt: z.string().describe('Creation timestamp'),
 	executions: z.number().describe('Number of executions'),
+	runtime: SandboxRuntimeInfoSchema.optional().describe('Runtime information'),
+	snapshot: SandboxSnapshotInfoSchema.optional().describe('Snapshot information'),
 });
 
 const SnapshotGetResponseSchema = z.object({

package/src/types.ts

@@ -653,26 +653,37 @@ export const BuildMetadataSchema = ServerBuildMetadataSchema;
 export type BuildMetadata = zod.infer<typeof BuildMetadataSchema>;
 export type Project = zod.infer<typeof ProjectSchema>;
 
-export const DeployOptionsSchema = zod.object({
-	logsUrl: zod.url().optional().describe('The url to the CI build logs'),
-	trigger: zod
-		.enum(['cli', 'workflow', 'webhook'])
-		.default('cli')
-		.optional()
-		.describe('The trigger that caused the build'),
-	commitUrl: zod.url().optional().describe('The url to the CI commit'),
-	message: zod.string().optional().describe('The message to associate with this deployment'),
-	commit: zod.string().optional().describe('The commit SHA for this deployment'),
-	branch: zod.string().optional().describe('The git branch for this deployment'),
-	provider: zod.string().optional().describe('The CI provider name (attempts to autodetect)'),
-	repo: zod.string().optional().describe('The repo url'),
-	event: zod
-		.enum(['pull_request', 'push', 'manual', 'workflow'])
-		.default('manual')
-		.optional()
-		.describe('The event that triggered the deployment'),
-	pullRequestNumber: zod.number().optional().describe('the pull request number'),
-	pullRequestUrl: zod.url().optional().describe('the pull request url'),
+/**
+ * Common git options schema for build commands (deploy, snapshot build, etc.)
+ * These can be provided via CLI flags to override auto-detected git values.
+ */
+export const GitOptionsSchema = zod.object({
+	message: zod.string().optional().describe('The message to associate with this build'),
+	commit: zod.string().optional().describe('The git commit SHA'),
+	branch: zod.string().optional().describe('The git branch'),
+	repo: zod.string().optional().describe('The git repo URL'),
+	provider: zod.string().optional().describe('The git provider (github, gitlab, bitbucket)'),
+	commitUrl: zod.url().optional().describe('The URL to the commit'),
 });
 
+export type GitOptions = z.infer<typeof GitOptionsSchema>;
+
+export const DeployOptionsSchema = zod
+	.object({
+		logsUrl: zod.url().optional().describe('The url to the CI build logs'),
+		trigger: zod
+			.enum(['cli', 'workflow', 'webhook'])
+			.default('cli')
+			.optional()
+			.describe('The trigger that caused the build'),
+		event: zod
+			.enum(['pull_request', 'push', 'manual', 'workflow'])
+			.default('manual')
+			.optional()
+			.describe('The event that triggered the deployment'),
+		pullRequestNumber: zod.number().optional().describe('the pull request number'),
+		pullRequestUrl: zod.url().optional().describe('the pull request url'),
+	})
+	.merge(GitOptionsSchema);
+
 export type DeployOptions = z.infer<typeof DeployOptionsSchema>;