@boltic/cli 1.0.40 → 1.0.42

package/commands/serverless.js

@@ -38,7 +38,11 @@ import {
 	pullServerless,
 	publishServerless,
 	updateServerless,
+	getServerlessBuilds,
+	getServerlessLogs,
+	getBuildLogs,
 } from "../api/serverless.js";
+import { setVerboseMode } from "../helper/verbose.js";
 
 // Define commands and their descriptions
 const commands = {
@@ -58,10 +62,6 @@ const commands = {
 		description: "Test a serverless function locally",
 		action: handleTest,
 	},
-	help: {
-		description: "Show help for serverless commands",
-		action: showHelp,
-	},
 	list: {
 		description: "List all serverless functions",
 		action: handleList,
@@ -70,6 +70,22 @@ const commands = {
 		description: "Show status of a serverless function",
 		action: handleStatus,
 	},
+	builds: {
+		description: "List builds for a serverless function",
+		action: handleBuilds,
+	},
+	logs: {
+		description: "Show logs for a serverless function",
+		action: handleLogs,
+	},
+	"build logs": {
+		description: "Show logs for a specific build",
+		action: handleBuildLogs,
+	},
+	help: {
+		description: "Show help for serverless commands",
+		action: showHelp,
+	},
 };
 
 // Serverless type choices for dropdown
@@ -381,7 +397,7 @@ async function handleCodeTypeCreate(name, language, version, targetDir) {
 }
 
 /**
- * Handle git type serverless creation - creates folder with boltic.yaml and calls create API
+ * Handle git type serverless creation - creates serverless on server and clones the repo
  */
 async function handleGitTypeCreate(name, language, version, targetDir) {
 	console.log(chalk.cyan("\n📁 Creating git-based serverless project..."));
@@ -442,7 +458,6 @@ async function handleGitTypeCreate(name, language, version, targetDir) {
 	}
 
 	// Extract serverless ID and git info from response
-	// Response structure: { ID, Links: { Git: { Repository: { SshURL, HtmlURL, CloneURL, ... } } } }
 	const serverlessId = response.ID || response.data?.ID || response._id;
 	const gitRepo =
 		response.Links?.Git?.Repository ||
@@ -451,8 +466,41 @@ async function handleGitTypeCreate(name, language, version, targetDir) {
 	const gitHttpUrl = gitRepo?.HtmlURL || "";
 	const gitCloneUrl = gitRepo?.CloneURL || "";
 
-	// Create boltic.yaml with serverlessId inside serverlessConfig
-	const bolticYamlContent = `app: "${name}"
+	// Remove the empty directory created earlier - we'll clone into it
+	try {
+		fs.rmSync(targetDir, { recursive: true, force: true });
+	} catch {
+		// Ignore cleanup errors
+	}
+
+	// Clone the repo from server (which has the server-generated boltic.yaml)
+	let cloneSuccess = false;
+	if (gitSshUrl) {
+		console.log(chalk.cyan("\n📥 Cloning git repository..."));
+		try {
+			// Clone the repo
+			execSync(`git clone ${gitSshUrl} "${targetDir}"`, {
+				stdio: "pipe",
+				timeout: 30000,
+			});
+			cloneSuccess = true;
+			console.log(chalk.green("✅ Repository cloned successfully!"));
+		} catch (err) {
+			console.log(
+				chalk.yellow(
+					"⚠️  Could not clone repository. You may not have SSH access yet."
+				)
+			);
+			cloneSuccess = false;
+		}
+	}
+
+	// If clone failed, create directory with minimal setup
+	if (!cloneSuccess) {
+		try {
+			fs.mkdirSync(targetDir, { recursive: true });
+			// Create a minimal boltic.yaml as fallback
+			const bolticYamlContent = `app: "${name}"
 region: "asia-south1"
 handler: "${HANDLER_MAPPING[language]}"
 language: "${language}/${version}"
@@ -460,19 +508,7 @@ language: "${language}/${version}"
 serverlessConfig:
   serverlessId: "${serverlessId}"
   Name: "${name}"
-  Description: ""
   Runtime: "git"
-  # Environment variables for your serverless function
-  # To add env variables, replace {} with key-value pairs like:
-  # Env:
-  #   API_KEY: "your-api-key"
-  #TO add port map, replace {} with port map like:
-  # PortMap:
-  #   - Name: "port"
-  #     Port: "8080"
-  #     Protocol: "http"/"https"
-  Env: {}
-  PortMap: {}
   Scaling:
     AutoStop: false
     Min: 1
@@ -483,61 +519,23 @@ serverlessConfig:
     MemoryMB: 128
     MemoryMaxMB: 128
   Timeout: 60
-  Validations: null
-
-build:
-  builtin: dockerfile
-  ignorefile: .gitignore
 `;
-
-	try {
-		fs.writeFileSync(
-			path.join(targetDir, "boltic.yaml"),
-			bolticYamlContent
-		);
-	} catch (err) {
-		console.error(chalk.red(`\n❌ Failed to create boltic.yaml`));
-		console.error(chalk.red(`Error: ${err.message}`));
-		return;
-	}
-
-	// Check if user has git access by trying ls-remote
-	let hasGitAccess = false;
-	if (gitSshUrl) {
-		console.log(chalk.cyan("\n🔍 Checking git repository access..."));
-		try {
+			fs.writeFileSync(
+				path.join(targetDir, "boltic.yaml"),
+				bolticYamlContent
+			);
 			// Initialize git repo
-			execSync(`git init`, { cwd: targetDir, stdio: "pipe" });
-			execSync(`git remote add origin ${gitSshUrl}`, {
-				cwd: targetDir,
-				stdio: "pipe",
-			});
-			// Try ls-remote to check SSH access
-			execSync(`git ls-remote ${gitSshUrl}`, {
-				cwd: targetDir,
-				stdio: "pipe",
-				timeout: 15000,
-			});
-			hasGitAccess = true;
-		} catch (err) {
-			hasGitAccess = false;
-		}
-	}
-
-	// If user has access, create main branch
-	if (hasGitAccess) {
-		try {
-			console.log(chalk.cyan("🔧 Setting up git branch..."));
-			// Create main branch
-			execSync(`git checkout -b main`, { cwd: targetDir, stdio: "pipe" });
-			console.log(chalk.green("✓ Created main branch"));
+			if (gitSshUrl) {
+				execSync(`git init`, { cwd: targetDir, stdio: "pipe" });
+				execSync(`git remote add origin ${gitSshUrl}`, {
+					cwd: targetDir,
+					stdio: "pipe",
+				});
+			}
 		} catch (err) {
-			// Ignore errors in branch setup, user can do it manually
-			console.log(
-				chalk.yellow(
-					"⚠️  Could not auto-setup git branch. You can set it up manually."
-				)
-			);
+			console.error(chalk.red(`\n❌ Failed to create project directory`));
+			console.error(chalk.red(`Error: ${err.message}`));
+			return;
 		}
 	}
 
@@ -573,11 +571,10 @@ build:
 		}
 		console.log();
 
-		if (hasGitAccess) {
+		if (cloneSuccess) {
 			console.log(
-				chalk.green("✅ You have access to the git repository!")
+				chalk.green("✅ Repository cloned with server configuration!")
 			);
-			console.log(chalk.green("✅ Main branch created!"));
 			console.log();
 			console.log(
 				chalk.yellow("📝 Next steps - Add your code and push:")
@@ -585,11 +582,13 @@ build:
 			console.log(chalk.dim("   1. Add your server code to this folder"));
 			console.log(chalk.dim("   2. Commit and push:"));
 			console.log(chalk.white(`      git add .`));
-			console.log(chalk.white(`      git commit -m "Initial commit"`));
-			console.log(chalk.white(`      git push -u origin main`));
+			console.log(
+				chalk.white(`      git commit -m "Add application code"`)
+			);
+			console.log(chalk.white(`      git push origin main`));
 		} else {
 			console.log(
-				chalk.red("❌ You don't have access to this git repository.")
+				chalk.yellow("⚠️  Could not clone repository automatically.")
 			);
 			console.log(
 				chalk.yellow(
@@ -598,14 +597,20 @@ build:
 			);
 			console.log();
 			console.log(
-				chalk.yellow("📝 Once you have access, push your code:")
+				chalk.yellow("📝 Once you have access, sync with remote:")
+			);
+			console.log(chalk.dim("   1. Pull the server config first:"));
+			console.log(
+				chalk.white(
+					`      git pull origin main --allow-unrelated-histories`
+				)
 			);
-			console.log(chalk.dim("   1. Add your code to this folder"));
-			console.log(chalk.dim("   2. Run:"));
-			console.log(chalk.white(`      git checkout -b main`));
+			console.log(chalk.dim("   2. Add your code and push:"));
 			console.log(chalk.white(`      git add .`));
-			console.log(chalk.white(`      git commit -m "Initial commit"`));
-			console.log(chalk.white(`      git push -u origin main`));
+			console.log(
+				chalk.white(`      git commit -m "Add application code"`)
+			);
+			console.log(chalk.white(`      git push origin main`));
 		}
 	} else {
 		console.log();
@@ -830,6 +835,15 @@ async function handlePublish(args = []) {
 		const languageBase = parseLanguageFromConfig(language);
 		const runtime = serverlessConfig?.Runtime || "code";
 		let code = null;
+		if (runtime === "git") {
+			console.log(
+				chalk.red("\n📄 Git type serverless does not support publish")
+			);
+			console.log(
+				chalk.yellow("Please publish using git push origin main")
+			);
+			return;
+		}
 
 		if (runtime === "code") {
 			code = readHandlerFile(directory, languageBase, config);
@@ -1540,132 +1554,184 @@ async function handlePull(args) {
 function showHelp() {
 	console.log(chalk.cyan("\nServerless Commands:\n"));
 	Object.entries(commands).forEach(([cmd, details]) => {
-		console.log(chalk.bold(`  ${cmd}`) + ` - ${details.description}`);
+		console.log(chalk.bold(`  ${cmd.padEnd(12)}`) + details.description);
 	});
 
-	console.log(chalk.cyan("\nCreate Command Options:\n"));
+	console.log(chalk.cyan("\nGlobal Options:\n"));
+	console.log(
+		chalk.bold("  --help, -h".padEnd(20)) + "Show help for a command"
+	);
+
+	console.log(chalk.cyan("\nCreate Options:\n"));
 	console.log(
-		chalk.bold("  --type, -t") +
-			chalk.dim("           ") +
-			"Serverless type: blueprint, git, or container (prompts if not provided)"
+		chalk.bold("  --type, -t".padEnd(20)) +
+			"Serverless type: blueprint, git, or container"
 	);
 	console.log(
-		chalk.bold("  --name, -n") +
-			chalk.dim("           ") +
-			"Name of the serverless function (required, prompts if not provided)"
+		chalk.bold("  --name, -n".padEnd(20)) +
+			"Name of the serverless function"
 	);
 	console.log(
-		chalk.bold("  --language, -l") +
-			chalk.dim("       ") +
-			"Programming language: nodejs, python, golang, java (prompts if not provided)"
+		chalk.bold("  --language, -l".padEnd(20)) +
+			"Programming language: nodejs, python, golang, java"
 	);
 	console.log(
-		chalk.bold("  --directory, -d") +
-			chalk.dim("      ") +
-			"Directory where to create the project (default: current directory)"
+		chalk.bold("  --directory, -d".padEnd(20)) +
+			"Directory for the project (default: current)"
 	);
 
-	console.log(chalk.cyan("\nTest Command Options:\n"));
+	console.log(chalk.cyan("\nTest Options:\n"));
 	console.log(
-		chalk.bold("  --port, -p") +
-			chalk.dim("           ") +
+		chalk.bold("  --port, -p".padEnd(20)) +
 			"Port to run the server on (default: 8080)"
 	);
 	console.log(
-		chalk.bold("  --language, -l") +
-			chalk.dim("       ") +
-			"Language (nodejs, python, golang, java) - auto-detected if not specified"
+		chalk.bold("  --language, -l".padEnd(20)) +
+			"Language (auto-detected if not specified)"
 	);
 	console.log(
-		chalk.bold("  --directory, -d") +
-			chalk.dim("      ") +
-			"Base directory of the project (default: current directory)"
+		chalk.bold("  --directory, -d".padEnd(20)) +
+			"Base directory of the project"
 	);
 
-	console.log(chalk.cyan("\nPublish Command Options:\n"));
+	console.log(chalk.cyan("\nPublish Options:\n"));
 	console.log(
-		chalk.bold("  --directory, -d") +
-			chalk.dim("      ") +
-			"Directory of the serverless project (default: current directory)"
+		chalk.bold("  --directory, -d".padEnd(20)) +
+			"Directory of the serverless project"
 	);
 
-	console.log(chalk.cyan("\nStatus Command Options:\n"));
+	console.log(chalk.cyan("\nStatus Options:\n"));
+	console.log(
+		chalk.bold("  --name, -n".padEnd(20)) +
+			"Name of the serverless function"
+	);
 	console.log(
-		chalk.bold("  --name, -n") +
-			chalk.dim("           ") +
-			"Name of the serverless function (prompts if not provided)"
+		chalk.bold("  --watch, -w".padEnd(20)) +
+			"Poll until status is running, failed, or degraded"
 	);
 
-	console.log(chalk.cyan("\nCreate Examples:\n"));
+	console.log(chalk.cyan("\nBuilds Options:\n"));
 	console.log(
-		chalk.dim(
-			"  # Interactive mode (will prompt for type, name, and language)"
-		)
+		chalk.bold("  --name, -n".padEnd(20)) +
+			"Name of the serverless function"
 	);
-	console.log("  boltic serverless create\n");
-	console.log(chalk.dim("  # Create blueprint serverless"));
+
+	console.log(chalk.cyan("\nLogs Options:\n"));
 	console.log(
-		"  boltic serverless create --type blueprint --name my-api --language nodejs\n"
+		chalk.bold("  --name, -n".padEnd(20)) +
+			"Name of the serverless function"
 	);
 	console.log(
-		chalk.dim(
-			"  # Create git-based serverless (add your code, then publish)"
-		)
+		chalk.bold("  --follow, -f".padEnd(20)) + "Follow logs in real-time"
 	);
 	console.log(
-		"  boltic serverless create --type git --name my-git-func --language python\n"
+		chalk.bold("  --lines, -l".padEnd(20)) +
+			"Number of lines to show (default: 100)"
+	);
+
+	console.log(chalk.cyan("\nBuild Logs Options:\n"));
+	console.log(
+		chalk.bold("  --name, -n".padEnd(20)) +
+			"Name of the serverless function"
 	);
-	console.log(chalk.dim("  # Create container-based serverless"));
 	console.log(
-		"  boltic serverless create --type container --name my-container --language golang\n"
+		chalk.bold("  --build, -b".padEnd(20)) +
+			"Build ID (prompts if not provided)"
 	);
-	console.log(chalk.dim("  # With custom directory"));
+
+	console.log(chalk.cyan("\nExamples:\n"));
+
+	console.log(chalk.dim("  # Create a blueprint serverless"));
 	console.log(
-		"  boltic serverless create --type blueprint --name my-function --language python --directory ./projects\n"
+		"  boltic serverless create -t blueprint -n my-api -l nodejs\n"
 	);
 
-	console.log(chalk.cyan("\nTest Examples:\n"));
-	console.log(chalk.dim("  # Basic usage - auto-detect everything"));
-	console.log("  boltic serverless test\n");
-	console.log(chalk.dim("  # Specify port"));
-	console.log("  boltic serverless test --port 3000\n");
+	console.log(chalk.dim("  # Test locally on port 3000"));
+	console.log("  boltic serverless test -p 3000\n");
 
-	console.log(chalk.cyan("\nPublish Examples:\n"));
 	console.log(chalk.dim("  # Publish from current directory"));
 	console.log("  boltic serverless publish\n");
-	console.log(chalk.dim("  # Publish from specific directory"));
-	console.log("  boltic serverless publish -d ./my-function\n");
 
-	console.log(chalk.cyan("\nList Examples:\n"));
 	console.log(chalk.dim("  # List all serverless functions"));
 	console.log("  boltic serverless list\n");
 
-	console.log(chalk.cyan("\nStatus Examples:\n"));
-	console.log(chalk.dim("  # Get status by name"));
-	console.log("  boltic serverless status -n my-function\n");
-	console.log(chalk.dim("  # Interactive mode (will prompt for name)"));
-	console.log("  boltic serverless status\n");
+	console.log(chalk.dim("  # Check status with polling"));
+	console.log("  boltic serverless status -n my-function --watch\n");
+
+	console.log(chalk.dim("  # View builds for a serverless"));
+	console.log("  boltic serverless builds -n my-function\n");
+
+	console.log(chalk.dim("  # View runtime logs"));
+	console.log("  boltic serverless logs -n my-function -f\n");
+
+	console.log(chalk.dim("  # View build logs"));
+	console.log("  boltic serverless build logs -n my-function\n");
 }
 
 // Execute the serverless command
 const execute = async (args) => {
-	const subCommand = args[0];
-
-	if (!subCommand) {
+	let subCommand = args[0];
+	let argsToPass = args.slice(1);
+
+	// Handle help flags
+	if (
+		!subCommand ||
+		subCommand === "--help" ||
+		subCommand === "-h" ||
+		args.includes("--help") ||
+		args.includes("-h")
+	) {
 		showHelp();
 		return;
 	}
 
+	// Handle two-word commands like "build logs"
+	if (subCommand === "build" && args[1] === "logs") {
+		subCommand = "build logs";
+		argsToPass = args.slice(2);
+	}
+
 	if (!commands[subCommand]) {
-		console.log(chalk.red("Unknown or missing serverless sub-command.\n"));
+		console.log(chalk.red(`Unknown serverless command: "${subCommand}"\n`));
 		showHelp();
 		return;
 	}
 
 	const commandObj = commands[subCommand];
-	await commandObj.action(args.slice(1));
+	await commandObj.action(argsToPass);
 };
 
+/**
+ * Get the URL for a serverless function
+ */
+function getServerlessUrl(serverless) {
+	const appDomain = serverless.AppDomain?.[0];
+	if (appDomain) {
+		return `https://${appDomain.DomainName}.${appDomain.BaseUrl || "serverless.boltic.app"}`;
+	}
+	return null;
+}
+
+/**
+ * Get status color for display
+ */
+function getStatusColor(status) {
+	switch (status) {
+		case "running":
+			return chalk.green;
+		case "draft":
+		case "building":
+		case "pending":
+			return chalk.yellow;
+		case "stopped":
+		case "failed":
+		case "degraded":
+			return chalk.red;
+		default:
+			return chalk.gray;
+	}
+}
+
 async function handleList(args = []) {
 	try {
 		const { apiUrl, token, accountId, session } = await getCurrentEnv();
@@ -1711,9 +1777,10 @@ async function handleList(args = []) {
 						: "📝";
 			const language = serverless.Config?.CodeOpts?.Language;
 			const status = serverless.Status;
+			const url = getServerlessUrl(serverless);
 
 			return {
-				name: `${serverless.Config.Name}: ${typeIcon} ${runtime} | Status - ${status}${language ? ` | ${language}` : ""} | ID: ${serverless.ID.substring(0, 8)}...`,
+				name: `${serverless.Config.Name}: ${typeIcon} ${runtime} | ${status}${language ? ` | ${language}` : ""}${url ? ` | ${url}` : ""}`,
 				value: serverless,
 			};
 		});
@@ -1731,44 +1798,7 @@ async function handleList(args = []) {
 
 		// Show details of selected serverless
 		if (selected) {
-			const runtime = selected.Config?.Runtime || "code";
-			const typeIcon =
-				runtime === "git"
-					? "📦"
-					: runtime === "container"
-						? "🐳"
-						: "📝";
-
-			console.log("\n" + chalk.cyan("━".repeat(60)));
-			console.log(chalk.bold("\n📌 Selected Serverless Details:\n"));
-			console.log(
-				chalk.cyan("   Name: ") + chalk.white(selected.Config.Name)
-			);
-			console.log(chalk.cyan("   ID: ") + chalk.white(selected.ID));
-			console.log(
-				chalk.cyan("   Type: ") + chalk.white(`${typeIcon} ${runtime}`)
-			);
-			console.log(
-				chalk.cyan("   Status: ") + chalk.white(selected.Status)
-			);
-			if (selected.Config?.CodeOpts?.Language) {
-				console.log(
-					chalk.cyan("   Language: ") +
-						chalk.white(selected.Config.CodeOpts.Language)
-				);
-			}
-			if (selected.Config?.ContainerOpts?.Image) {
-				console.log(
-					chalk.cyan("   Image: ") +
-						chalk.white(selected.Config.ContainerOpts.Image)
-				);
-			}
-			console.log(chalk.cyan("━".repeat(60)));
-			console.log(
-				chalk.dim(
-					"\nUse 'boltic serverless pull' to pull this serverless locally."
-				)
-			);
+			displayServerlessDetails(selected);
 		}
 	} catch (error) {
 		if (
@@ -1785,143 +1815,927 @@ async function handleList(args = []) {
 	}
 }
 
+/**
+ * Display detailed information about a serverless function
+ */
+function displayServerlessDetails(serverless) {
+	const runtime = serverless.Config?.Runtime || "code";
+	const typeIcon =
+		runtime === "git" ? "📦" : runtime === "container" ? "🐳" : "📝";
+	const status = serverless.Status;
+	const statusColor = getStatusColor(status);
+	const url = getServerlessUrl(serverless);
+
+	console.log("\n" + chalk.cyan("━".repeat(60)));
+	console.log(chalk.bold("\n📊 Serverless Details\n"));
+	console.log(chalk.cyan("   Name: ") + chalk.white(serverless.Config.Name));
+	console.log(chalk.cyan("   ID: ") + chalk.white(serverless.ID));
+	console.log(
+		chalk.cyan("   Type: ") + chalk.white(`${typeIcon} ${runtime}`)
+	);
+	console.log(chalk.cyan("   Status: ") + statusColor(status));
+
+	if (url) {
+		console.log(chalk.cyan("   URL: ") + chalk.white.bold(url));
+	}
+
+	if (serverless.Config?.CodeOpts?.Language) {
+		console.log(
+			chalk.cyan("   Language: ") +
+				chalk.white(serverless.Config.CodeOpts.Language)
+		);
+	}
+	if (serverless.Config?.ContainerOpts?.Image) {
+		console.log(
+			chalk.cyan("   Image: ") +
+				chalk.white(serverless.Config.ContainerOpts.Image)
+		);
+	}
+	if (serverless.Config?.Resources) {
+		console.log(
+			chalk.cyan("   Resources: ") +
+				chalk.white(
+					`CPU: ${serverless.Config.Resources.CPU}, Memory: ${serverless.Config.Resources.MemoryMB}MB`
+				)
+		);
+	}
+	if (serverless.Config?.Scaling) {
+		console.log(
+			chalk.cyan("   Scaling: ") +
+				chalk.white(
+					`Min: ${serverless.Config.Scaling.Min}, Max: ${serverless.Config.Scaling.Max}`
+				)
+		);
+	}
+	if (serverless.RegionID) {
+		console.log(
+			chalk.cyan("   Region: ") + chalk.white(serverless.RegionID)
+		);
+	}
+	if (serverless.CreatedAt) {
+		console.log(
+			chalk.cyan("   Created: ") +
+				chalk.white(new Date(serverless.CreatedAt).toLocaleString())
+		);
+	}
+	if (serverless.UpdatedAt) {
+		console.log(
+			chalk.cyan("   Updated: ") +
+				chalk.white(new Date(serverless.UpdatedAt).toLocaleString())
+		);
+	}
+
+	console.log();
+	console.log(chalk.cyan("━".repeat(60)));
+	console.log(
+		chalk.dim(
+			"\nTip: Use 'boltic serverless status -n <name> --watch' to poll for status changes."
+		)
+	);
+}
+
+/**
+ * Parse status command arguments
+ */
+function parseStatusArgs(args) {
+	const parsed = {
+		name: null,
+		watch: false,
+		verbose: false,
+		timeout: -1, // -1 means infinite
+	};
+
+	for (let i = 0; i < args.length; i++) {
+		const arg = args[i];
+		const nextArg = args[i + 1];
+
+		if ((arg === "--name" || arg === "-n") && nextArg) {
+			parsed.name = nextArg;
+			i++;
+		} else if (arg === "--watch" || arg === "-w") {
+			parsed.watch = true;
+		} else if (arg === "--verbose" || arg === "-v") {
+			parsed.verbose = true;
+		} else if ((arg === "--timeout" || arg === "-t") && nextArg) {
+			parsed.timeout = parseInt(nextArg, 10);
+			i++;
+		} else if (!arg.startsWith("-") && !parsed.name) {
+			// Accept positional argument as name
+			parsed.name = arg;
+		}
+	}
+
+	return parsed;
+}
+
 /**
  * Handle the status command - show status of a serverless function
  */
 async function handleStatus(args = []) {
 	try {
-		// Parse name from args
-		let name = null;
-		const nameIndex = args.indexOf("--name");
-		const shortNameIndex = args.indexOf("-n");
+		const parsedArgs = parseStatusArgs(args);
+		let { name, watch, verbose, timeout } = parsedArgs;
 
-		if (nameIndex !== -1 && args[nameIndex + 1]) {
-			name = args[nameIndex + 1];
-		} else if (shortNameIndex !== -1 && args[shortNameIndex + 1]) {
-			name = args[shortNameIndex + 1];
+		// Enable verbose mode if requested
+		if (verbose) {
+			setVerboseMode(true);
 		}
 
-		// If name not provided, prompt for it
+		const { apiUrl, token, accountId, session } = await getCurrentEnv();
+
+		// If name not provided, show list selector
 		if (!name) {
-			name = await input({
-				message: "Enter serverless name:",
-				validate: (value) => {
-					if (!value || value.trim() === "") {
-						return "Serverless name is required";
-					}
-					return true;
+			console.log(chalk.cyan("\n📋 Fetching serverless functions...\n"));
+
+			const allServerless = await listAllServerless(
+				apiUrl,
+				token,
+				accountId,
+				session
+			);
+
+			if (!allServerless || !Array.isArray(allServerless)) {
+				console.error(
+					chalk.red(
+						"\n❌ Failed to fetch serverless: Invalid response format"
+					)
+				);
+				return;
+			}
+
+			if (allServerless.length === 0) {
+				console.log(chalk.yellow("No serverless functions found."));
+				return;
+			}
+
+			// Build choices for the list
+			const choices = allServerless.map((serverless) => {
+				const runtime = serverless.Config?.Runtime || "code";
+				const typeIcon =
+					runtime === "git"
+						? "📦"
+						: runtime === "container"
+							? "🐳"
+							: "📝";
+				const status = serverless.Status;
+				const statusColor = getStatusColor(status);
+
+				return {
+					name: `${serverless.Config.Name} | ${typeIcon} ${runtime} | ${statusColor(status)}`,
+					value: serverless,
+				};
+			});
+
+			const selected = await search({
+				message: "Select a serverless function:",
+				source: async (term) => {
+					if (!term) return choices;
+					return choices.filter((choice) =>
+						choice.name.toLowerCase().includes(term.toLowerCase())
+					);
 				},
 			});
+
+			if (!selected) {
+				return;
+			}
+
+			// Display status directly since we have the full object
+			displayServerlessDetails(selected);
+
+			// If watch mode, continue polling
+			if (watch) {
+				name = selected.Config.Name;
+			} else {
+				return;
+			}
 		}
 
-		const { apiUrl, token, accountId, session } = await getCurrentEnv();
+		// If not in watch mode (and name was provided), just fetch and display once
+		if (!watch) {
+			console.log(chalk.cyan(`\n🔍 Fetching status for "${name}"...\n`));
 
-		console.log(chalk.cyan(`\n🔍 Fetching status for "${name}"...\n`));
+			// First find the serverless by name to get the ID
+			const result = await listAllServerless(
+				apiUrl,
+				token,
+				accountId,
+				session,
+				name
+			);
 
-		// Get serverless by name using query parameter
-		const result = await listAllServerless(
-			apiUrl,
-			token,
-			accountId,
-			session,
-			name // Pass name as query parameter
-		);
+			if (!result || !Array.isArray(result) || !result[0]) {
+				console.error(
+					chalk.red(`\n❌ Serverless "${name}" not found.`)
+				);
+				console.log(
+					chalk.yellow(
+						"\nUse 'boltic serverless list' to see all serverless functions."
+					)
+				);
+				return;
+			}
 
-		if (!result || !Array.isArray(result)) {
-			console.error(
-				chalk.red(
-					"\n❌ Failed to fetch serverless: Invalid response format"
-				)
+			// Use pullServerless to get the full details with accurate status
+			const serverlessId = result[0].ParentID || result[0].ID;
+			const serverless = await pullServerless(
+				apiUrl,
+				token,
+				accountId,
+				session,
+				serverlessId
 			);
+
+			if (!serverless) {
+				console.error(
+					chalk.red("\n❌ Failed to fetch serverless details")
+				);
+				return;
+			}
+
+			displayServerlessDetails(serverless);
 			return;
 		}
 
-		// Get first element (name is unique)
-		const serverless = result[0];
+		// Watch mode - poll for status changes
+		console.log(chalk.cyan(`\n👁️  Watching status for "${name}"...\n`));
+		const timeoutMsg = timeout > 0 ? ` (timeout: ${timeout}s)` : "";
+		console.log(chalk.dim(`Press Ctrl+C to stop watching.${timeoutMsg}\n`));
 
-		if (!serverless) {
+		// First, get the serverless ID
+		const initialResult = await listAllServerless(
+			apiUrl,
+			token,
+			accountId,
+			session,
+			name
+		);
+
+		if (
+			!initialResult ||
+			!Array.isArray(initialResult) ||
+			!initialResult[0]
+		) {
 			console.error(chalk.red(`\n❌ Serverless "${name}" not found.`));
-			console.log(
-				chalk.yellow(
-					"\nUse 'boltic serverless list' to see all serverless functions."
-				)
+			return;
+		}
+
+		const serverlessId = initialResult[0].ParentID || initialResult[0].ID;
+		const terminalStates = ["running", "failed", "degraded", "suspended"];
+		let lastStatus = null;
+		let iteration = 0;
+		const startTime = Date.now();
+
+		while (true) {
+			iteration++;
+
+			// Check timeout (-1 means infinite)
+			if (timeout > 0) {
+				const elapsed = Math.floor((Date.now() - startTime) / 1000);
+				if (elapsed >= timeout) {
+					console.log(
+						chalk.yellow(
+							`\n\n⏱️  Timeout reached after ${timeout} seconds.`
+						)
+					);
+					return;
+				}
+			}
+
+			// Use pullServerless for accurate status
+			const serverless = await pullServerless(
+				apiUrl,
+				token,
+				accountId,
+				session,
+				serverlessId
 			);
+
+			if (!serverless) {
+				console.error(
+					chalk.red(`\n❌ Failed to fetch serverless status.`)
+				);
+				return;
+			}
+			const status = serverless.Status;
+			const statusColor = getStatusColor(status);
+			const url = getServerlessUrl(serverless);
+
+			// Show status update
+			const timestamp = new Date().toLocaleTimeString();
+			if (status !== lastStatus) {
+				console.log(
+					chalk.dim(`[${timestamp}]`) +
+						` Status: ${statusColor(status)}` +
+						(url ? chalk.dim(` | ${url}`) : "")
+				);
+				lastStatus = status;
+			} else if (iteration % 3 === 0) {
+				// Show a dot every 3 iterations to indicate it's still polling
+				process.stdout.write(chalk.dim("."));
+			}
+
+			// Check if we've reached a terminal state
+			if (terminalStates.includes(status)) {
+				console.log();
+				displayServerlessDetails(serverless);
+				console.log(
+					chalk.green(`\n✓ Reached terminal state: ${status}`)
+				);
+				return;
+			}
+
+			// Wait before next poll
+			await new Promise((resolve) => setTimeout(resolve, 5000));
+		}
+	} catch (error) {
+		if (
+			error.message &&
+			error.message.includes("User force closed the prompt")
+		) {
+			console.log(chalk.yellow("\n⚠️ Operation cancelled by user"));
 			return;
 		}
+		console.error(
+			chalk.red("\n❌ An error occurred:"),
+			error.message || "Unknown error"
+		);
+	}
+}
+
+/**
+ * Helper to select a serverless function interactively
+ */
+async function selectServerless(
+	apiUrl,
+	token,
+	accountId,
+	session,
+	message = "Select a serverless function:"
+) {
+	const allServerless = await listAllServerless(
+		apiUrl,
+		token,
+		accountId,
+		session
+	);
+
+	if (!allServerless || !Array.isArray(allServerless)) {
+		throw new Error("Failed to fetch serverless: Invalid response format");
+	}
+
+	if (allServerless.length === 0) {
+		console.log(chalk.yellow("No serverless functions found."));
+		return null;
+	}
 
-		// Display status
+	const choices = allServerless.map((serverless) => {
 		const runtime = serverless.Config?.Runtime || "code";
 		const typeIcon =
 			runtime === "git" ? "📦" : runtime === "container" ? "🐳" : "📝";
 		const status = serverless.Status;
-		const statusColor =
-			status === "running"
-				? chalk.green
-				: status === "draft"
-					? chalk.yellow
-					: status === "stopped"
-						? chalk.red
-						: chalk.gray;
 
-		console.log(chalk.cyan("━".repeat(60)));
-		console.log(chalk.bold("\n📊 Serverless Status\n"));
+		return {
+			name: `${serverless.Config.Name} | ${typeIcon} ${runtime} | ${status}`,
+			value: serverless,
+		};
+	});
+
+	return await search({
+		message,
+		source: async (term) => {
+			if (!term) return choices;
+			return choices.filter((choice) =>
+				choice.name.toLowerCase().includes(term.toLowerCase())
+			);
+		},
+	});
+}
+
+/**
+ * Handle the builds command - list builds for a serverless function
+ */
+async function handleBuilds(args = []) {
+	try {
+		// Parse name from args (supports --name, -n, or positional)
+		let name = null;
+		for (let i = 0; i < args.length; i++) {
+			const arg = args[i];
+			if ((arg === "--name" || arg === "-n") && args[i + 1]) {
+				name = args[i + 1];
+				break;
+			} else if (!arg.startsWith("-") && !name) {
+				name = arg;
+			}
+		}
+
+		const { apiUrl, token, accountId, session } = await getCurrentEnv();
+
+		let serverless;
+
+		// If name not provided, show selector
+		if (!name) {
+			console.log(chalk.cyan("\n📋 Select a serverless function...\n"));
+			serverless = await selectServerless(
+				apiUrl,
+				token,
+				accountId,
+				session,
+				"Select serverless to view builds:"
+			);
+
+			if (!serverless) {
+				return;
+			}
+		} else {
+			// Fetch by name
+			const result = await listAllServerless(
+				apiUrl,
+				token,
+				accountId,
+				session,
+				name
+			);
+
+			if (!result || !Array.isArray(result) || !result[0]) {
+				console.error(
+					chalk.red(`\n❌ Serverless "${name}" not found.`)
+				);
+				return;
+			}
+			serverless = result[0];
+		}
+
+		// Check if serverless is container type - builds are not available
+		const runtime = serverless.Config?.Runtime || "code";
+		if (runtime === "container") {
+			console.log(
+				chalk.yellow(
+					`\n⚠️  Builds are not available for container-type serverless functions.`
+				)
+			);
+			console.log(
+				chalk.dim(
+					`   Container images are built externally and pulled directly.`
+				)
+			);
+			console.log(
+				chalk.dim(
+					`\n   To view runtime logs, use: boltic serverless logs ${serverless.Config.Name}`
+				)
+			);
+			return;
+		}
+
 		console.log(
-			chalk.cyan("   Name: ") + chalk.white(serverless.Config.Name)
+			chalk.cyan(
+				`\n🔨 Fetching builds for "${serverless.Config.Name}"...\n`
+			)
+		);
+
+		const buildsData = await getServerlessBuilds(
+			apiUrl,
+			token,
+			accountId,
+			session,
+			serverless.ID
 		);
-		console.log(chalk.cyan("   ID: ") + chalk.white(serverless.ID));
+
+		if (!buildsData || !buildsData.data || buildsData.data.length === 0) {
+			console.log(chalk.yellow("No builds found for this serverless."));
+			return;
+		}
+
+		const builds = buildsData.data;
+
+		console.log(chalk.green(`Found ${builds.length} build(s):\n`));
+		console.log(chalk.cyan("━".repeat(100)));
 		console.log(
-			chalk.cyan("   Type: ") + chalk.white(`${typeIcon} ${runtime}`)
+			chalk.bold("  #  ") +
+				chalk.bold("Status".padEnd(12)) +
+				chalk.bold("Version".padEnd(10)) +
+				chalk.bold("Created".padEnd(22)) +
+				chalk.bold("Build ID")
 		);
-		console.log(chalk.cyan("   Status: ") + statusColor(status));
+		console.log(chalk.cyan("━".repeat(100)));
+
+		builds.forEach((build, index) => {
+			const status =
+				build.StatusHistory?.slice(-1)[0]?.Status ||
+				build.Status ||
+				"unknown";
+			const statusColor = getStatusColor(status);
+			const createdAt = build.CreatedAt
+				? new Date(build.CreatedAt).toLocaleString()
+				: "N/A";
+			const version = build.Version || "N/A";
 
-		if (serverless.Config?.CodeOpts?.Language) {
 			console.log(
-				chalk.cyan("   Language: ") +
-					chalk.white(serverless.Config.CodeOpts.Language)
+				chalk.dim(`  ${String(index + 1).padStart(2)} `) +
+					statusColor(status.padEnd(12)) +
+					`v${String(version).padEnd(9)}` +
+					createdAt.padEnd(22) +
+					build.ID
 			);
+
+			// Show status history for recent builds (first 3)
+			if (
+				index < 3 &&
+				build.StatusHistory &&
+				build.StatusHistory.length > 1
+			) {
+				const history = build.StatusHistory.map((h) => {
+					const ts = h.Timestamp
+						? new Date(h.Timestamp).toLocaleTimeString()
+						: "";
+					return `${h.Status}${ts ? ` (${ts})` : ""}`;
+				}).join(" → ");
+				console.log(chalk.dim(`      └─ ${history}`));
+			}
+		});
+
+		console.log(chalk.cyan("━".repeat(100)));
+		console.log(
+			chalk.dim(
+				"\nTip: Use 'boltic serverless build logs -n <name>' to view logs for a build."
+			)
+		);
+	} catch (error) {
+		if (
+			error.message &&
+			error.message.includes("User force closed the prompt")
+		) {
+			console.log(chalk.yellow("\n⚠️ Operation cancelled by user"));
+			return;
 		}
-		if (serverless.Config?.ContainerOpts?.Image) {
-			console.log(
-				chalk.cyan("   Image: ") +
-					chalk.white(serverless.Config.ContainerOpts.Image)
+		console.error(
+			chalk.red("\n❌ An error occurred:"),
+			error.message || "Unknown error"
+		);
+	}
+}
+
+/**
+ * Handle the logs command - show logs for a serverless function
+ */
+async function handleLogs(args = []) {
+	try {
+		// Parse args (supports --name, -n, or positional)
+		let name = null;
+		let follow = false;
+		let lines = 100;
+
+		for (let i = 0; i < args.length; i++) {
+			const arg = args[i];
+			const nextArg = args[i + 1];
+
+			if ((arg === "--name" || arg === "-n") && nextArg) {
+				name = nextArg;
+				i++;
+			} else if (arg === "--follow" || arg === "-f") {
+				follow = true;
+			} else if ((arg === "--lines" || arg === "-l") && nextArg) {
+				lines = parseInt(nextArg, 10) || 100;
+				i++;
+			} else if (!arg.startsWith("-") && !name) {
+				// Accept positional argument as name
+				name = arg;
+			}
+		}
+
+		const { apiUrl, token, accountId, session } = await getCurrentEnv();
+
+		let serverless;
+
+		// If name not provided, show selector
+		if (!name) {
+			console.log(chalk.cyan("\n📋 Select a serverless function...\n"));
+			serverless = await selectServerless(
+				apiUrl,
+				token,
+				accountId,
+				session,
+				"Select serverless to view logs:"
 			);
+
+			if (!serverless) {
+				return;
+			}
+		} else {
+			// Fetch by name
+			const result = await listAllServerless(
+				apiUrl,
+				token,
+				accountId,
+				session,
+				name
+			);
+
+			if (!result || !Array.isArray(result) || !result[0]) {
+				console.error(
+					chalk.red(`\n❌ Serverless "${name}" not found.`)
+				);
+				return;
+			}
+			serverless = result[0];
 		}
-		if (serverless.Config?.Resources) {
-			console.log(
-				chalk.cyan("   Resources: ") +
-					chalk.white(
-						`CPU: ${serverless.Config.Resources.CPU}, Memory: ${serverless.Config.Resources.MemoryMB}MB`
-					)
+
+		console.log(
+			chalk.cyan(
+				`\n📜 Fetching logs for "${serverless.Config.Name}"...\n`
+			)
+		);
+
+		if (follow) {
+			console.log(chalk.dim("Following logs... Press Ctrl+C to stop.\n"));
+		}
+
+		const fetchAndDisplayLogs = async (timestampEnd = null) => {
+			const now = Math.floor(Date.now() / 1000);
+			const logsData = await getServerlessLogs(
+				apiUrl,
+				token,
+				accountId,
+				session,
+				serverless.ID,
+				{
+					limit: lines,
+					timestampEnd: timestampEnd || now,
+					timestampStart: (timestampEnd || now) - 24 * 60 * 60,
+				}
 			);
+
+			if (!logsData || !logsData.data || logsData.data.length === 0) {
+				if (!follow) {
+					console.log(
+						chalk.yellow("No logs found for this serverless.")
+					);
+				}
+				return timestampEnd;
+			}
+
+			const logs = logsData.data;
+			let latestTimestamp = timestampEnd;
+
+			logs.forEach((log) => {
+				// Timestamp is unix epoch in seconds
+				const timestamp = log.Timestamp
+					? new Date(log.Timestamp * 1000).toLocaleTimeString()
+					: "";
+				const severity = log.Severity || "INFO";
+				const severityColor =
+					severity === "ERROR"
+						? chalk.red
+						: severity === "WARNING" || severity === "WARN"
+							? chalk.yellow
+							: severity === "DEBUG"
+								? chalk.blue
+								: chalk.gray;
+
+				// Parse the Log field which may contain JSON
+				let message = "";
+				if (log.Log) {
+					try {
+						const parsed = JSON.parse(log.Log);
+						message = parsed.msg || parsed.message || log.Log;
+					} catch {
+						// Not JSON, use as-is
+						message = log.Log;
+					}
+				}
+
+				console.log(
+					chalk.dim(`[${timestamp}]`) +
+						` ${severityColor(severity.padEnd(7))} ${message}`
+				);
+
+				if (
+					log.Timestamp &&
+					(!latestTimestamp || log.Timestamp > latestTimestamp)
+				) {
+					latestTimestamp = log.Timestamp;
+				}
+			});
+
+			return latestTimestamp;
+		};
+
+		let lastTimestamp = await fetchAndDisplayLogs();
+
+		if (follow) {
+			while (true) {
+				await new Promise((resolve) => setTimeout(resolve, 3000));
+				lastTimestamp = await fetchAndDisplayLogs(lastTimestamp);
+			}
 		}
-		if (serverless.Config?.Scaling) {
-			console.log(
-				chalk.cyan("   Scaling: ") +
-					chalk.white(
-						`Min: ${serverless.Config.Scaling.Min}, Max: ${serverless.Config.Scaling.Max}`
-					)
+	} catch (error) {
+		if (
+			error.message &&
+			error.message.includes("User force closed the prompt")
+		) {
+			console.log(chalk.yellow("\n⚠️ Operation cancelled by user"));
+			return;
+		}
+		console.error(
+			chalk.red("\n❌ An error occurred:"),
+			error.message || "Unknown error"
+		);
+	}
+}
+
+/**
+ * Handle the "build logs" command - show logs for a specific build
+ */
+async function handleBuildLogs(args = []) {
+	try {
+		// Parse args (supports --name, -n, or positional)
+		let name = null;
+		let buildId = null;
+
+		for (let i = 0; i < args.length; i++) {
+			const arg = args[i];
+			const nextArg = args[i + 1];
+
+			if ((arg === "--name" || arg === "-n") && nextArg) {
+				name = nextArg;
+				i++;
+			} else if ((arg === "--build" || arg === "-b") && nextArg) {
+				buildId = nextArg;
+				i++;
+			} else if (!arg.startsWith("-") && !name) {
+				// Accept positional argument as name
+				name = arg;
+			}
+		}
+
+		const { apiUrl, token, accountId, session } = await getCurrentEnv();
+
+		let serverless;
+
+		// If name not provided, show selector
+		if (!name) {
+			console.log(chalk.cyan("\n📋 Select a serverless function...\n"));
+			serverless = await selectServerless(
+				apiUrl,
+				token,
+				accountId,
+				session,
+				"Select serverless to view build logs:"
+			);
+
+			if (!serverless) {
+				return;
+			}
+		} else {
+			// Fetch by name
+			const result = await listAllServerless(
+				apiUrl,
+				token,
+				accountId,
+				session,
+				name
 			);
+
+			if (!result || !Array.isArray(result) || !result[0]) {
+				console.error(
+					chalk.red(`\n❌ Serverless "${name}" not found.`)
+				);
+				return;
+			}
+			serverless = result[0];
 		}
-		if (serverless.RegionID) {
+
+		// Check if serverless is container type - build logs are not available
+		const runtime = serverless.Config?.Runtime || "code";
+		if (runtime === "container") {
+			console.log(
+				chalk.yellow(
+					`\n⚠️  Build logs are not available for container-type serverless functions.`
+				)
+			);
 			console.log(
-				chalk.cyan("   Region: ") + chalk.white(serverless.RegionID)
+				chalk.dim(
+					`   Container images are built externally and pulled directly.`
+				)
 			);
-		}
-		if (serverless.CreatedAt) {
 			console.log(
-				chalk.cyan("   Created: ") +
-					chalk.white(new Date(serverless.CreatedAt).toLocaleString())
+				chalk.dim(
+					`\n   To view runtime logs, use: boltic serverless logs ${serverless.Config.Name}`
+				)
 			);
+			return;
 		}
-		if (serverless.UpdatedAt) {
+
+		// If build ID not provided, fetch builds and let user select
+		if (!buildId) {
 			console.log(
-				chalk.cyan("   Updated: ") +
-					chalk.white(new Date(serverless.UpdatedAt).toLocaleString())
+				chalk.cyan(
+					`\n🔨 Fetching builds for "${serverless.Config.Name}"...\n`
+				)
+			);
+
+			const buildsData = await getServerlessBuilds(
+				apiUrl,
+				token,
+				accountId,
+				session,
+				serverless.ID
 			);
+
+			if (
+				!buildsData ||
+				!buildsData.data ||
+				buildsData.data.length === 0
+			) {
+				console.log(
+					chalk.yellow("No builds found for this serverless.")
+				);
+				return;
+			}
+
+			const builds = buildsData.data;
+
+			const buildChoices = builds.map((build, index) => {
+				const status =
+					build.StatusHistory?.slice(-1)[0]?.Status ||
+					build.Status ||
+					"unknown";
+				const statusColor = getStatusColor(status);
+				const createdAt = build.CreatedAt
+					? new Date(build.CreatedAt).toLocaleString()
+					: "N/A";
+
+				return {
+					name: `#${index + 1} | ${statusColor(status)} | ${createdAt} | ${build.ID.substring(0, 8)}...`,
+					value: build,
+				};
+			});
+
+			const selectedBuild = await search({
+				message: "Select a build to view logs:",
+				source: async (term) => {
+					if (!term) return buildChoices;
+					return buildChoices.filter((choice) =>
+						choice.name.toLowerCase().includes(term.toLowerCase())
+					);
+				},
+			});
+
+			if (!selectedBuild) {
+				return;
+			}
+
+			buildId = selectedBuild.ID;
 		}
 
-		console.log();
-		console.log(chalk.cyan("━".repeat(60)));
+		console.log(chalk.cyan(`\n📜 Fetching build logs...\n`));
+
+		const logsData = await getBuildLogs(
+			apiUrl,
+			token,
+			accountId,
+			session,
+			serverless.ID,
+			buildId
+		);
+
+		if (!logsData || !logsData.data) {
+			console.log(chalk.yellow("No logs found for this build."));
+			return;
+		}
+
+		console.log(chalk.cyan("━".repeat(80)));
+		console.log(chalk.bold("Build Logs:\n"));
+
+		// Handle different log formats
+		const logs = Array.isArray(logsData.data)
+			? logsData.data
+			: [logsData.data];
+
+		logs.forEach((log) => {
+			if (typeof log === "string") {
+				console.log(log);
+			} else if (log.Log) {
+				// Log field contains the actual log content (may include ANSI colors)
+				// Output directly to preserve color codes
+				process.stdout.write(log.Log);
+				if (!log.Log.endsWith("\n")) {
+					process.stdout.write("\n");
+				}
+			} else if (log.Message || log.message) {
+				const timestamp = log.Timestamp
+					? new Date(log.Timestamp * 1000).toLocaleTimeString()
+					: "";
+				console.log(
+					chalk.dim(`[${timestamp}]`) +
+						` ${log.Message || log.message}`
+				);
+			} else {
+				console.log(JSON.stringify(log, null, 2));
+			}
+		});
+
+		console.log("\n" + chalk.cyan("━".repeat(80)));
 	} catch (error) {
 		if (
 			error.message &&