@agentuity/cli 0.1.17 → 0.1.19

package/src/tui.ts

@@ -45,7 +45,7 @@ export { maskSecret };
 // Export new TUI components
 export { createPrompt, PromptFlow } from './tui/prompt';
 export { group } from './tui/group';
-export { note, drawBox, errorBox } from './tui/box';
+export { note, drawBox, errorBox, warningBox } from './tui/box';
 export { symbols } from './tui/symbols';
 export { colors as tuiColors } from './tui/colors';
 export type {

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

package/src/utils/git.ts

@@ -0,0 +1,209 @@
+import type { Logger } from '@agentuity/core';
+import { existsSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+
+/**
+ * Git information detected from the repository
+ */
+export interface GitInfo {
+	branch?: string;
+	repo?: string;
+	provider?: string;
+	tags?: string[];
+	commit?: string;
+	message?: string;
+}
+
+/**
+ * Git options that can be provided via CLI flags to override auto-detected values
+ */
+export interface GitOptions {
+	message?: string;
+	commit?: string;
+	branch?: string;
+	repo?: string;
+	provider?: string;
+	commitUrl?: string;
+}
+
+/**
+ * Extended git info that includes CI-related fields
+ */
+export interface GitInfoExtended extends GitInfo {
+	commitUrl?: string;
+	logsUrl?: string;
+	trigger?: string;
+	event?: string;
+	pull_request?: {
+		number: number;
+		url?: string;
+	};
+}
+
+/**
+ * Detect git information from the repository at the given root directory.
+ * Walks up parent directories to find .git directory (supports monorepos).
+ *
+ * @param rootDir - The root directory to start searching for .git
+ * @param logger - Logger instance for trace output
+ * @returns Git information or undefined if not in a git repository
+ */
+export async function getGitInfo(rootDir: string, logger: Logger): Promise<GitInfo | 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: GitInfo = {
+			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;
+				}
+			}
+		}
+
+		return gitInfo;
+	} catch (error) {
+		logger.trace(`Failed to get git info: ${error}`);
+		return undefined;
+	}
+}
+
+/**
+ * Merge auto-detected git info with CLI-provided overrides.
+ * CLI options take precedence over auto-detected values.
+ *
+ * @param autoDetected - Git info auto-detected from the repository
+ * @param overrides - CLI options that override auto-detected values
+ * @returns Merged git info
+ */
+export function mergeGitInfo(
+	autoDetected: GitInfo | undefined,
+	overrides: GitOptions
+): GitInfoExtended {
+	const result: GitInfoExtended = { ...(autoDetected ?? {}) };
+
+	// CLI overrides take precedence
+	if (overrides.message !== undefined) {
+		result.message = overrides.message;
+	}
+	if (overrides.commit !== undefined) {
+		result.commit = overrides.commit;
+	}
+	if (overrides.branch !== undefined) {
+		result.branch = overrides.branch;
+	}
+	if (overrides.repo !== undefined) {
+		result.repo = overrides.repo;
+	}
+	if (overrides.provider !== undefined) {
+		result.provider = overrides.provider;
+	}
+	if (overrides.commitUrl !== undefined) {
+		result.commitUrl = overrides.commitUrl;
+	}
+
+	return result;
+}
+
+/**
+ * Build an array of tags from git info, including branch and short commit.
+ * Used for deployment tagging.
+ *
+ * @param gitInfo - Git information
+ * @returns Array of tags
+ */
+export function buildGitTags(gitInfo: GitInfo | undefined): string[] {
+	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));
+	}
+	return Array.from(tags);
+}