@tarout/cli 0.1.2 → 0.1.4

package/dist/index.js

@@ -2,6 +2,7 @@
 import {
   failSpinner,
   startSpinner,
+  stopSpinner,
   succeedSpinner,
   updateSpinner
 } from "./chunk-GSKD67K4.js";
@@ -9,9 +10,78 @@ import {
 // src/index.ts
 import { Command } from "commander";
 
-// src/lib/output.ts
-import chalk from "chalk";
-import Table from "cli-table3";
+// src/commands/apps.ts
+import open from "open";
+
+// src/lib/api.ts
+import { createTRPCProxyClient, httpBatchLink } from "@trpc/client";
+import superjson from "superjson";
+
+// src/lib/config.ts
+import Conf from "conf";
+var config = new Conf({
+  projectName: "tarout",
+  defaults: {
+    currentProfile: "default",
+    profiles: {}
+  }
+});
+function getConfig() {
+  return config.store;
+}
+function getCurrentProfile() {
+  const cfg = getConfig();
+  return cfg.profiles[cfg.currentProfile] || null;
+}
+function setProfile(name, profile) {
+  config.set(`profiles.${name}`, profile);
+}
+function setCurrentProfile(name) {
+  config.set("currentProfile", name);
+}
+function clearConfig() {
+  config.clear();
+}
+function isLoggedIn() {
+  const profile = getCurrentProfile();
+  return profile !== null && !!profile.token;
+}
+function getToken() {
+  const profile = getCurrentProfile();
+  return profile?.token || null;
+}
+function getApiUrl() {
+  const profile = getCurrentProfile();
+  return profile?.apiUrl || "https://tarout.sa";
+}
+function updateProfile(updates) {
+  const cfg = getConfig();
+  const currentProfileName = cfg.currentProfile;
+  const currentProfile = cfg.profiles[currentProfileName];
+  if (currentProfile) {
+    config.set(`profiles.${currentProfileName}`, {
+      ...currentProfile,
+      ...updates
+    });
+  }
+}
+
+// src/utils/exit-codes.ts
+var ExitCode = {
+  SUCCESS: 0,
+  GENERAL_ERROR: 1,
+  INVALID_ARGUMENTS: 2,
+  AUTH_ERROR: 3,
+  NOT_FOUND: 4,
+  PERMISSION_DENIED: 5,
+  // Deployment-specific exit codes
+  DEPLOYMENT_FAILED: 10,
+  DEPLOYMENT_TIMEOUT: 11,
+  BUILD_FAILED: 12
+};
+function exit(code) {
+  process.exit(code);
+}
 
 // src/utils/json.ts
 function jsonSuccess(data, meta) {
@@ -36,6 +106,8 @@ function outputJson(response) {
 }
 
 // src/lib/output.ts
+import chalk from "chalk";
+import Table from "cli-table3";
 var globalOptions = {
   json: false,
   quiet: false,
@@ -152,174 +224,6 @@ function box(title, content) {
   console.log("");
 }
 
-// src/commands/auth.ts
-import open from "open";
-
-// src/lib/config.ts
-import Conf from "conf";
-var config = new Conf({
-  projectName: "tarout",
-  defaults: {
-    currentProfile: "default",
-    profiles: {}
-  }
-});
-function getConfig() {
-  return config.store;
-}
-function getCurrentProfile() {
-  const cfg = getConfig();
-  return cfg.profiles[cfg.currentProfile] || null;
-}
-function setProfile(name, profile) {
-  config.set(`profiles.${name}`, profile);
-}
-function setCurrentProfile(name) {
-  config.set("currentProfile", name);
-}
-function clearConfig() {
-  config.clear();
-}
-function isLoggedIn() {
-  const profile = getCurrentProfile();
-  return profile !== null && !!profile.token;
-}
-function getToken() {
-  const profile = getCurrentProfile();
-  return profile?.token || null;
-}
-function getApiUrl() {
-  const profile = getCurrentProfile();
-  return profile?.apiUrl || "https://tarout.sa";
-}
-function updateProfile(updates) {
-  const cfg = getConfig();
-  const currentProfileName = cfg.currentProfile;
-  const currentProfile = cfg.profiles[currentProfileName];
-  if (currentProfile) {
-    config.set(`profiles.${currentProfileName}`, {
-      ...currentProfile,
-      ...updates
-    });
-  }
-}
-
-// src/lib/auth-server.ts
-import express from "express";
-function startAuthServer() {
-  return new Promise((resolve) => {
-    const app = express();
-    let server;
-    let callbackResolver;
-    let callbackRejecter;
-    const callbackPromise = new Promise((res, rej) => {
-      callbackResolver = res;
-      callbackRejecter = rej;
-    });
-    app.get("/callback", (req, res) => {
-      const {
-        token,
-        userId,
-        userEmail,
-        userName,
-        organizationId,
-        organizationName,
-        environmentId,
-        environmentName,
-        error: error6
-      } = req.query;
-      if (error6) {
-        res.send(`
-          <!DOCTYPE html>
-          <html>
-            <head>
-              <title>Tarout CLI - Authentication Failed</title>
-              <style>
-                body { font-family: system-ui, sans-serif; display: flex; justify-content: center; align-items: center; height: 100vh; margin: 0; background: #f5f5f5; }
-                .container { text-align: center; padding: 40px; background: white; border-radius: 12px; box-shadow: 0 2px 10px rgba(0,0,0,0.1); }
-                h1 { color: #dc2626; margin-bottom: 16px; }
-                p { color: #666; }
-              </style>
-            </head>
-            <body>
-              <div class="container">
-                <h1>Authentication Failed</h1>
-                <p>${error6}</p>
-                <p>You can close this window and try again.</p>
-              </div>
-            </body>
-          </html>
-        `);
-        callbackRejecter(new Error(String(error6)));
-        return;
-      }
-      if (!token || !userId || !userEmail || !organizationId || !organizationName || !environmentId || !environmentName) {
-        res.status(400).send("Missing required parameters");
-        callbackRejecter(new Error("Missing required parameters from auth callback"));
-        return;
-      }
-      res.send(`
-        <!DOCTYPE html>
-        <html>
-          <head>
-            <title>Tarout CLI - Authenticated</title>
-            <style>
-              body { font-family: system-ui, sans-serif; display: flex; justify-content: center; align-items: center; height: 100vh; margin: 0; background: #f5f5f5; }
-              .container { text-align: center; padding: 40px; background: white; border-radius: 12px; box-shadow: 0 2px 10px rgba(0,0,0,0.1); }
-              h1 { color: #16a34a; margin-bottom: 16px; }
-              p { color: #666; }
-              .checkmark { font-size: 64px; margin-bottom: 16px; }
-            </style>
-          </head>
-          <body>
-            <div class="container">
-              <div class="checkmark">\u2713</div>
-              <h1>Authenticated!</h1>
-              <p>You can close this window and return to the terminal.</p>
-            </div>
-          </body>
-        </html>
-      `);
-      callbackResolver({
-        token: String(token),
-        userId: String(userId),
-        userEmail: String(userEmail),
-        userName: userName ? String(userName) : void 0,
-        organizationId: String(organizationId),
-        organizationName: String(organizationName),
-        environmentId: String(environmentId),
-        environmentName: String(environmentName)
-      });
-    });
-    server = app.listen(0, () => {
-      const address = server.address();
-      const port = typeof address === "object" && address ? address.port : 0;
-      resolve({
-        port,
-        waitForCallback: () => callbackPromise,
-        close: () => server.close()
-      });
-    });
-    setTimeout(() => {
-      callbackRejecter(new Error("Authentication timed out. Please try again."));
-      server.close();
-    }, 5 * 60 * 1e3);
-  });
-}
-
-// src/utils/exit-codes.ts
-var ExitCode = {
-  SUCCESS: 0,
-  GENERAL_ERROR: 1,
-  INVALID_ARGUMENTS: 2,
-  AUTH_ERROR: 3,
-  NOT_FOUND: 4,
-  PERMISSION_DENIED: 5
-};
-function exit(code) {
-  process.exit(code);
-}
-
 // src/lib/errors.ts
 var CliError = class extends Error {
   constructor(message, code = ExitCode.GENERAL_ERROR, suggestions) {
@@ -344,15 +248,31 @@ var InvalidArgumentError = class extends CliError {
     super(message, ExitCode.INVALID_ARGUMENTS);
   }
 };
+var DeploymentFailedError = class extends CliError {
+  constructor(message, deploymentId, errorAnalysis) {
+    super(message, ExitCode.DEPLOYMENT_FAILED);
+    this.deploymentId = deploymentId;
+    this.errorAnalysis = errorAnalysis;
+  }
+};
+var DeploymentTimeoutError = class extends CliError {
+  constructor(message = "Deployment timed out", deploymentId) {
+    super(message, ExitCode.DEPLOYMENT_TIMEOUT);
+    this.deploymentId = deploymentId;
+  }
+};
+var BuildFailedError = class extends CliError {
+  constructor(message, deploymentId, errorAnalysis) {
+    super(message, ExitCode.BUILD_FAILED);
+    this.deploymentId = deploymentId;
+    this.errorAnalysis = errorAnalysis;
+  }
+};
 function handleError(err) {
   if (err instanceof CliError) {
     if (isJsonMode()) {
       outputJson(
-        jsonError(
-          getErrorCode(err.code),
-          err.message,
-          err.suggestions
-        )
+        jsonError(getErrorCode(err.code), err.message, err.suggestions)
       );
     } else {
       error(err.message, err.suggestions);
@@ -384,7 +304,10 @@ function getErrorCode(exitCode) {
     [ExitCode.INVALID_ARGUMENTS]: "INVALID_ARGUMENTS",
     [ExitCode.AUTH_ERROR]: "AUTH_ERROR",
     [ExitCode.NOT_FOUND]: "NOT_FOUND",
-    [ExitCode.PERMISSION_DENIED]: "PERMISSION_DENIED"
+    [ExitCode.PERMISSION_DENIED]: "PERMISSION_DENIED",
+    [ExitCode.DEPLOYMENT_FAILED]: "DEPLOYMENT_FAILED",
+    [ExitCode.DEPLOYMENT_TIMEOUT]: "DEPLOYMENT_TIMEOUT",
+    [ExitCode.BUILD_FAILED]: "BUILD_FAILED"
   };
   return codes[exitCode] || "ERROR";
 }
@@ -420,155 +343,288 @@ function similarity(s1, s2) {
   }
   return 2 * intersection / (s1.length - 1 + s2.length - 1);
 }
-
-// src/commands/auth.ts
-function registerAuthCommands(program2) {
-  program2.command("login").description("Authenticate with Tarout via browser").option("--api-url <url>", "Custom API URL", "https://tarout.sa").action(async (options) => {
-    try {
-      if (isLoggedIn()) {
-        const profile = getCurrentProfile();
-        if (profile) {
-          log(`Already logged in as ${colors.cyan(profile.userEmail)}`);
-          log(`Organization: ${profile.organizationName}`);
-          log("");
-          log(`Run ${colors.dim("tarout logout")} to sign out first.`);
-          return;
-        }
-      }
-      const apiUrl = options.apiUrl;
-      log("");
-      log("Opening browser to authenticate...");
-      const authServer = await startAuthServer();
-      const callbackUrl = `http://localhost:${authServer.port}/callback`;
-      const authUrl = `${apiUrl}/cli-auth?callback=${encodeURIComponent(callbackUrl)}`;
-      await open(authUrl);
-      const spinner = startSpinner("Waiting for authentication...");
-      try {
-        const authData = await authServer.waitForCallback();
-        succeedSpinner("Authentication successful!");
-        authServer.close();
-        setProfile("default", {
-          token: authData.token,
-          apiUrl,
-          userId: authData.userId,
-          userEmail: authData.userEmail,
-          userName: authData.userName,
-          organizationId: authData.organizationId,
-          organizationName: authData.organizationName,
-          environmentId: authData.environmentId,
-          environmentName: authData.environmentName
-        });
-        setCurrentProfile("default");
-        if (isJsonMode()) {
-          outputData({
-            success: true,
-            user: {
-              id: authData.userId,
-              email: authData.userEmail,
-              name: authData.userName
-            },
-            organization: {
-              id: authData.organizationId,
-              name: authData.organizationName
-            },
-            environment: {
-              id: authData.environmentId,
-              name: authData.environmentName
-            }
-          });
-        } else {
-          log("");
-          success(`Logged in as ${colors.cyan(authData.userEmail)}`);
-          box("Account", [
-            `Organization: ${colors.bold(authData.organizationName)}`,
-            `Environment: ${colors.bold(authData.environmentName)}`
-          ]);
+var ERROR_PATTERNS = [
+  {
+    patterns: [
+      /npm ERR!/i,
+      /npm error/i,
+      /ERESOLVE/i,
+      /Could not resolve dependency/i,
+      /peer dep missing/i
+    ],
+    category: "npm_install",
+    type: "build_error",
+    possibleCauses: [
+      "Package version conflicts",
+      "Missing peer dependencies",
+      "Invalid package.json",
+      "Network issues during npm install",
+      "Private package without authentication"
+    ],
+    suggestedFixes: [
+      "Run `npm install` locally to reproduce the issue",
+      "Check for conflicting package versions in package.json",
+      "Try deleting package-lock.json and node_modules, then reinstall",
+      "Add missing peer dependencies explicitly",
+      "Check if private packages are properly authenticated"
+    ]
+  },
+  {
+    patterns: [
+      /yarn error/i,
+      /YN\d{4}/i,
+      /error An unexpected error occurred/i
+    ],
+    category: "yarn_install",
+    type: "build_error",
+    possibleCauses: [
+      "Package version conflicts",
+      "Corrupted yarn.lock file",
+      "Network issues during install",
+      "Incompatible yarn version"
+    ],
+    suggestedFixes: [
+      "Run `yarn install` locally to reproduce the issue",
+      "Delete yarn.lock and node_modules, then reinstall",
+      "Check for conflicting resolutions in package.json",
+      "Ensure yarn version matches the project requirements"
+    ]
+  },
+  {
+    patterns: [/pnpm ERR/i, /ERR_PNPM/i],
+    category: "pnpm_install",
+    type: "build_error",
+    possibleCauses: [
+      "Package version conflicts",
+      "Incompatible pnpm version",
+      "Corrupted pnpm-lock.yaml"
+    ],
+    suggestedFixes: [
+      "Run `pnpm install` locally to reproduce the issue",
+      "Delete pnpm-lock.yaml and node_modules, then reinstall",
+      "Check pnpm version compatibility"
+    ]
+  },
+  {
+    patterns: [/bun install/i, /error: .* failed to resolve/i],
+    category: "bun_install",
+    type: "build_error",
+    possibleCauses: [
+      "Package resolution failure",
+      "Incompatible bun version",
+      "Missing dependencies"
+    ],
+    suggestedFixes: [
+      "Run `bun install` locally to reproduce the issue",
+      "Delete bun.lockb and node_modules, then reinstall",
+      "Check bun version compatibility"
+    ]
+  },
+  {
+    patterns: [
+      /error TS\d+/i,
+      /TypeScript error/i,
+      /tsc.*error/i,
+      /Type .* is not assignable to/i,
+      /Cannot find module/i,
+      /Property .* does not exist/i
+    ],
+    category: "typescript",
+    type: "build_error",
+    possibleCauses: [
+      "TypeScript compilation errors in source code",
+      "Missing type definitions",
+      "Incompatible TypeScript version",
+      "Strict mode type errors"
+    ],
+    suggestedFixes: [
+      "Run `npx tsc --noEmit` locally to see all type errors",
+      "Fix the TypeScript errors in the indicated files",
+      "Install missing @types/* packages",
+      "Check tsconfig.json for strict mode settings"
+    ]
+  },
+  {
+    patterns: [
+      /COPY failed/i,
+      /RUN.*failed/i,
+      /failed to build/i,
+      /Error building image/i,
+      /Dockerfile/i
+    ],
+    category: "docker_build",
+    type: "build_error",
+    possibleCauses: [
+      "Invalid Dockerfile syntax",
+      "Missing files in build context",
+      "Failed RUN commands",
+      "Base image not found"
+    ],
+    suggestedFixes: [
+      "Test Docker build locally with `docker build .`",
+      "Check that all required files are in the build context",
+      "Verify Dockerfile syntax and commands",
+      "Ensure base image exists and is accessible"
+    ]
+  },
+  {
+    patterns: [
+      /build.*failed/i,
+      /Build failed/i,
+      /exit code 1/i,
+      /Command failed/i,
+      /Script.*failed/i
+    ],
+    category: "build_script",
+    type: "build_error",
+    possibleCauses: [
+      "Build script error in package.json",
+      "Missing build dependencies",
+      "Environment variable issues",
+      "Build command not found"
+    ],
+    suggestedFixes: [
+      "Run `npm run build` locally to reproduce the error",
+      "Check package.json build script for errors",
+      "Ensure all required environment variables are set",
+      "Verify build dependencies are installed"
+    ]
+  },
+  {
+    patterns: [
+      /out of memory/i,
+      /JavaScript heap out of memory/i,
+      /FATAL ERROR: .* allocation failed/i,
+      /OOMKilled/i
+    ],
+    category: "memory_limit",
+    type: "build_error",
+    possibleCauses: [
+      "Build process requires more memory than allocated",
+      "Memory leak in build process",
+      "Large dependency tree"
+    ],
+    suggestedFixes: [
+      "Increase memory allocation for the build",
+      "Optimize build process to use less memory",
+      "Consider splitting large bundles",
+      "Add NODE_OPTIONS=--max_old_space_size=4096"
+    ]
+  },
+  {
+    patterns: [/timed? ?out/i, /deadline exceeded/i, /timeout/i],
+    category: "timeout",
+    type: "build_error",
+    possibleCauses: [
+      "Build process took too long",
+      "Network timeout during dependency install",
+      "Slow external service calls"
+    ],
+    suggestedFixes: [
+      "Optimize build process for faster execution",
+      "Check for slow network requests during build",
+      "Consider caching dependencies",
+      "Increase build timeout if possible"
+    ]
+  },
+  {
+    patterns: [/permission denied/i, /EACCES/i, /EPERM/i],
+    category: "permission",
+    type: "build_error",
+    possibleCauses: [
+      "File permission issues",
+      "Attempting to write to read-only locations",
+      "Docker user permission mismatch"
+    ],
+    suggestedFixes: [
+      "Check file permissions in the project",
+      "Ensure Dockerfile uses correct user",
+      "Avoid writing to restricted directories"
+    ]
+  },
+  {
+    patterns: [
+      /ENOTFOUND/i,
+      /ECONNREFUSED/i,
+      /network error/i,
+      /fetch failed/i,
+      /getaddrinfo/i
+    ],
+    category: "network",
+    type: "build_error",
+    possibleCauses: [
+      "Network connectivity issues",
+      "DNS resolution failure",
+      "Registry unavailable",
+      "Firewall blocking connections"
+    ],
+    suggestedFixes: [
+      "Check if the package registry is accessible",
+      "Verify network configuration",
+      "Try again later if registry is temporarily down",
+      "Check for any proxy configuration issues"
+    ]
+  }
+];
+function analyzeDeploymentError(logs, errorMessage) {
+  const relevantLogLines = [];
+  let matchedPattern = null;
+  let maxMatches = 0;
+  const allLines = errorMessage ? [...logs, errorMessage] : logs;
+  for (const pattern of ERROR_PATTERNS) {
+    let matches = 0;
+    const matchedLines = [];
+    for (const line of allLines) {
+      for (const regex of pattern.patterns) {
+        if (regex.test(line)) {
+          matches++;
+          if (!matchedLines.includes(line)) {
+            matchedLines.push(line);
+          }
+          break;
         }
-      } catch (err) {
-        failSpinner("Authentication failed");
-        authServer.close();
-        throw err;
       }
-    } catch (err) {
-      handleError(err);
     }
-  });
-  program2.command("logout").description("Sign out and clear stored credentials").action(async () => {
-    try {
-      if (!isLoggedIn()) {
-        if (isJsonMode()) {
-          outputData({ success: true, message: "Already logged out" });
-        } else {
-          log("Already logged out.");
-        }
-        return;
-      }
-      const profile = getCurrentProfile();
-      clearConfig();
-      if (isJsonMode()) {
-        outputData({ success: true, message: "Logged out successfully" });
-      } else {
-        success(`Logged out from ${profile?.userEmail || "Tarout"}`);
-      }
-    } catch (err) {
-      handleError(err);
+    if (matches > maxMatches) {
+      maxMatches = matches;
+      matchedPattern = pattern;
+      relevantLogLines.length = 0;
+      relevantLogLines.push(...matchedLines.slice(0, 10));
     }
-  });
-  program2.command("whoami").description("Show current authenticated user").action(async () => {
-    try {
-      if (!isLoggedIn()) {
-        throw new AuthError();
-      }
-      const profile = getCurrentProfile();
-      if (!profile) {
-        throw new AuthError();
-      }
-      if (isJsonMode()) {
-        outputData({
-          user: {
-            id: profile.userId,
-            email: profile.userEmail,
-            name: profile.userName
-          },
-          organization: {
-            id: profile.organizationId,
-            name: profile.organizationName
-          },
-          environment: {
-            id: profile.environmentId,
-            name: profile.environmentName
-          },
-          apiUrl: profile.apiUrl
-        });
-      } else {
-        log("");
-        log(`${colors.bold("User")}`);
-        log(`  Email: ${colors.cyan(profile.userEmail)}`);
-        if (profile.userName) {
-          log(`  Name: ${profile.userName}`);
-        }
-        log("");
-        log(`${colors.bold("Organization")}`);
-        log(`  Name: ${profile.organizationName}`);
-        log(`  ID: ${colors.dim(profile.organizationId)}`);
-        log("");
-        log(`${colors.bold("Environment")}`);
-        log(`  Name: ${profile.environmentName}`);
-        log(`  ID: ${colors.dim(profile.environmentId)}`);
-        log("");
-      }
-    } catch (err) {
-      handleError(err);
+  }
+  const errorIndicators = [/error/i, /failed/i, /fatal/i, /exception/i];
+  for (const line of allLines) {
+    if (relevantLogLines.length < 15 && !relevantLogLines.includes(line) && errorIndicators.some((indicator) => indicator.test(line))) {
+      relevantLogLines.push(line);
     }
-  });
+  }
+  if (matchedPattern) {
+    return {
+      type: matchedPattern.type,
+      category: matchedPattern.category,
+      possibleCauses: matchedPattern.possibleCauses,
+      suggestedFixes: matchedPattern.suggestedFixes,
+      relevantLogLines
+    };
+  }
+  return {
+    type: "unknown",
+    category: "unknown",
+    possibleCauses: [
+      "Unable to automatically determine the cause",
+      "Check the log output for specific error messages"
+    ],
+    suggestedFixes: [
+      "Review the deployment logs for error messages",
+      "Try running the build locally to reproduce the issue",
+      "Check environment variables and configuration",
+      "Contact support if the issue persists"
+    ],
+    relevantLogLines
+  };
 }
 
-// src/commands/apps.ts
-import open2 from "open";
-
 // src/lib/api.ts
-import { createTRPCProxyClient, httpBatchLink } from "@trpc/client";
-import superjson from "superjson";
 var client = null;
 function createApiClient() {
   if (!isLoggedIn()) {
@@ -638,7 +694,7 @@ function registerAppsCommands(program2) {
     try {
       if (!isLoggedIn()) throw new AuthError();
       const client2 = getApiClient();
-      const spinner = startSpinner("Fetching applications...");
+      const _spinner = startSpinner("Fetching applications...");
       const applications = await client2.application.allByOrganization.query();
       succeedSpinner();
       if (isJsonMode()) {
@@ -664,7 +720,11 @@ function registerAppsCommands(program2) {
         ])
       );
       log("");
-      log(colors.dim(`${applications.length} application${applications.length === 1 ? "" : "s"}`));
+      log(
+        colors.dim(
+          `${applications.length} application${applications.length === 1 ? "" : "s"}`
+        )
+      );
     } catch (err) {
       handleError(err);
     }
@@ -684,7 +744,7 @@ function registerAppsCommands(program2) {
       }
       const slug = generateSlug(appName);
       const client2 = getApiClient();
-      const spinner = startSpinner("Creating application...");
+      const _spinner = startSpinner("Creating application...");
       const application = await client2.application.create.mutate({
         name: appName,
         appName: slug,
@@ -703,8 +763,12 @@ function registerAppsCommands(program2) {
         `Slug: ${application.appName}`
       ]);
       log("Next steps:");
-      log(`  1. Connect a source: ${colors.dim(`tarout apps info ${application.applicationId.slice(0, 8)}`)}`);
-      log(`  2. Deploy: ${colors.dim(`tarout deploy ${application.applicationId.slice(0, 8)}`)}`);
+      log(
+        `  1. Connect a source: ${colors.dim(`tarout apps info ${application.applicationId.slice(0, 8)}`)}`
+      );
+      log(
+        `  2. Deploy: ${colors.dim(`tarout deploy ${application.applicationId.slice(0, 8)}`)}`
+      );
       log("");
     } catch (err) {
       handleError(err);
@@ -714,7 +778,7 @@ function registerAppsCommands(program2) {
     try {
       if (!isLoggedIn()) throw new AuthError();
       const client2 = getApiClient();
-      const spinner = startSpinner("Finding application...");
+      const _spinner = startSpinner("Finding application...");
       const apps2 = await client2.application.allByOrganization.query();
       const app = findApp(apps2, appIdentifier);
       if (!app) {
@@ -740,7 +804,7 @@ function registerAppsCommands(program2) {
           return;
         }
       }
-      const deleteSpinner = startSpinner("Deleting application...");
+      const _deleteSpinner = startSpinner("Deleting application...");
       await client2.application.delete.mutate({
         applicationId: app.applicationId
       });
@@ -758,7 +822,7 @@ function registerAppsCommands(program2) {
     try {
       if (!isLoggedIn()) throw new AuthError();
       const client2 = getApiClient();
-      const spinner = startSpinner("Fetching application...");
+      const _spinner = startSpinner("Fetching application...");
       const apps2 = await client2.application.allByOrganization.query();
       const appSummary = findApp(apps2, appIdentifier);
       if (!appSummary) {
@@ -835,7 +899,7 @@ function registerAppsCommands(program2) {
     try {
       if (!isLoggedIn()) throw new AuthError();
       const client2 = getApiClient();
-      const spinner = startSpinner("Finding application...");
+      const _spinner = startSpinner("Finding application...");
       const apps2 = await client2.application.allByOrganization.query();
       const appSummary = findApp(apps2, appIdentifier);
       if (!appSummary) {
@@ -857,7 +921,9 @@ function registerAppsCommands(program2) {
         url = app.cloudServiceUrl;
       }
       if (!url) {
-        error("No URL found for this application. Deploy first or add a domain.");
+        error(
+          "No URL found for this application. Deploy first or add a domain."
+        );
         return;
       }
       if (isJsonMode()) {
@@ -865,7 +931,7 @@ function registerAppsCommands(program2) {
         return;
       }
       log(`Opening ${colors.cyan(url)}...`);
-      await open2(url);
+      await open(url);
     } catch (err) {
       handleError(err);
     }
@@ -888,1033 +954,1445 @@ function formatDate(date) {
   );
   if (diffDays === 0) {
     return "Today";
-  } else if (diffDays === 1) {
+  }
+  if (diffDays === 1) {
     return "Yesterday";
-  } else if (diffDays < 7) {
+  }
+  if (diffDays < 7) {
     return `${diffDays}d ago`;
-  } else {
-    return d.toLocaleDateString("en-US", { month: "short", day: "numeric" });
   }
+  return d.toLocaleDateString("en-US", { month: "short", day: "numeric" });
 }
 
-// src/commands/deploy.ts
-function registerDeployCommands(program2) {
-  program2.command("deploy").argument("<app>", "Application ID or name").description("Deploy an application").option("-r, --region <region>", "Deployment region", "me-central1").option("-w, --wait", "Wait for deployment to complete").action(async (appIdentifier, options) => {
-    try {
-      if (!isLoggedIn()) throw new AuthError();
-      const client2 = getApiClient();
-      const spinner = startSpinner("Finding application...");
-      const apps = await client2.application.allByOrganization.query();
-      const app = findApp2(apps, appIdentifier);
-      if (!app) {
-        failSpinner();
-        const suggestions = findSimilar(
-          appIdentifier,
-          apps.map((a) => a.name)
-        );
-        throw new NotFoundError("Application", appIdentifier, suggestions);
-      }
-      updateSpinner(`Deploying ${app.name}...`);
-      const result = await client2.application.deployToCloud.mutate({
-        applicationId: app.applicationId,
-        region: options.region
-      });
-      if (options.wait) {
-        let attempts = 0;
-        const maxAttempts = 120;
-        while (attempts < maxAttempts) {
-          await sleep(5e3);
-          attempts++;
-          const fullApp = await client2.application.one.query({
-            applicationId: app.applicationId
-          });
-          updateSpinner(
-            `Deploying ${app.name}... (${attempts * 5}s)`
-          );
-          if (fullApp.applicationStatus === "done" || fullApp.applicationStatus === "running") {
-            succeedSpinner("Deployment successful!");
-            if (isJsonMode()) {
-              outputData({
-                deploymentId: result.deploymentId,
-                status: fullApp.applicationStatus,
-                url: fullApp.cloudServiceUrl
-              });
-            } else {
-              quietOutput(fullApp.cloudServiceUrl || result.deploymentId);
-              log("");
-              log(`URL: ${colors.cyan(fullApp.cloudServiceUrl || "Pending...")}`);
-              log("");
-            }
-            return;
-          }
-          if (fullApp.applicationStatus === "error") {
-            failSpinner("Deployment failed");
-            throw new CliError("Deployment failed. Check logs for details.", ExitCode.GENERAL_ERROR);
-          }
-        }
-        failSpinner("Deployment timed out");
-        throw new CliError("Deployment timed out after 10 minutes", ExitCode.GENERAL_ERROR);
-      } else {
-        succeedSpinner("Deployment started!");
-        if (isJsonMode()) {
-          outputData({
-            deploymentId: result.deploymentId,
-            status: "deploying"
-          });
-        } else {
-          quietOutput(result.deploymentId);
-          log("");
-          log(`Deployment ID: ${colors.cyan(result.deploymentId)}`);
-          log("");
-          log("Deployment is running in the background.");
-          log(`Check status: ${colors.dim(`tarout deploy:status ${app.applicationId.slice(0, 8)}`)}`);
-          log(`View logs: ${colors.dim(`tarout logs ${app.applicationId.slice(0, 8)}`)}`);
-          log("");
-        }
+// src/commands/auth.ts
+import open2 from "open";
+
+// src/lib/auth-server.ts
+import express from "express";
+function startAuthServer() {
+  return new Promise((resolve) => {
+    const app = express();
+    let server;
+    let callbackResolver;
+    let callbackRejecter;
+    const callbackPromise = new Promise((res, rej) => {
+      callbackResolver = res;
+      callbackRejecter = rej;
+    });
+    app.get("/callback", (req, res) => {
+      const {
+        token,
+        userId,
+        userEmail,
+        userName,
+        organizationId,
+        organizationName,
+        environmentId,
+        environmentName,
+        error: error2
+      } = req.query;
+      if (error2) {
+        res.send(`
+          <!DOCTYPE html>
+          <html>
+            <head>
+              <title>Tarout CLI - Authentication Failed</title>
+              <style>
+                body { font-family: system-ui, sans-serif; display: flex; justify-content: center; align-items: center; height: 100vh; margin: 0; background: #f5f5f5; }
+                .container { text-align: center; padding: 40px; background: white; border-radius: 12px; box-shadow: 0 2px 10px rgba(0,0,0,0.1); }
+                h1 { color: #dc2626; margin-bottom: 16px; }
+                p { color: #666; }
+              </style>
+            </head>
+            <body>
+              <div class="container">
+                <h1>Authentication Failed</h1>
+                <p>${error2}</p>
+                <p>You can close this window and try again.</p>
+              </div>
+            </body>
+          </html>
+        `);
+        callbackRejecter(new Error(String(error2)));
+        return;
       }
-    } catch (err) {
-      handleError(err);
-    }
-  });
-  program2.command("deploy:status").argument("<app>", "Application ID or name").description("Check deployment status").action(async (appIdentifier) => {
-    try {
-      if (!isLoggedIn()) throw new AuthError();
-      const client2 = getApiClient();
-      const spinner = startSpinner("Fetching status...");
-      const apps = await client2.application.allByOrganization.query();
-      const appSummary = findApp2(apps, appIdentifier);
-      if (!appSummary) {
-        failSpinner();
-        const suggestions = findSimilar(
-          appIdentifier,
-          apps.map((a) => a.name)
+      if (!token || !userId || !userEmail || !organizationId || !organizationName || !environmentId || !environmentName) {
+        res.status(400).send("Missing required parameters");
+        callbackRejecter(
+          new Error("Missing required parameters from auth callback")
         );
-        throw new NotFoundError("Application", appIdentifier, suggestions);
+        return;
       }
-      const app = await client2.application.one.query({
-        applicationId: appSummary.applicationId
-      });
-      const cloudStatus = await client2.application.getCloudDeploymentStatus.query({
-        applicationId: appSummary.applicationId
+      res.send(`
+        <!DOCTYPE html>
+        <html>
+          <head>
+            <title>Tarout CLI - Authenticated</title>
+            <style>
+              body { font-family: system-ui, sans-serif; display: flex; justify-content: center; align-items: center; height: 100vh; margin: 0; background: #f5f5f5; }
+              .container { text-align: center; padding: 40px; background: white; border-radius: 12px; box-shadow: 0 2px 10px rgba(0,0,0,0.1); }
+              h1 { color: #16a34a; margin-bottom: 16px; }
+              p { color: #666; }
+              .checkmark { font-size: 64px; margin-bottom: 16px; }
+            </style>
+          </head>
+          <body>
+            <div class="container">
+              <div class="checkmark">\u2713</div>
+              <h1>Authenticated!</h1>
+              <p>You can close this window and return to the terminal.</p>
+            </div>
+          </body>
+        </html>
+      `);
+      callbackResolver({
+        token: String(token),
+        userId: String(userId),
+        userEmail: String(userEmail),
+        userName: userName ? String(userName) : void 0,
+        organizationId: String(organizationId),
+        organizationName: String(organizationName),
+        environmentId: String(environmentId),
+        environmentName: String(environmentName)
       });
-      succeedSpinner();
-      if (isJsonMode()) {
-        outputData({
-          applicationId: app.applicationId,
-          name: app.name,
-          status: app.applicationStatus,
-          url: app.cloudServiceUrl,
-          cloudStatus
-        });
-        return;
+    });
+    server = app.listen(0, () => {
+      const address = server.address();
+      const port = typeof address === "object" && address ? address.port : 0;
+      resolve({
+        port,
+        waitForCallback: () => callbackPromise,
+        close: () => server.close()
+      });
+    });
+    setTimeout(
+      () => {
+        callbackRejecter(
+          new Error("Authentication timed out. Please try again.")
+        );
+        server.close();
+      },
+      5 * 60 * 1e3
+    );
+  });
+}
+
+// src/commands/auth.ts
+function registerAuthCommands(program2) {
+  program2.command("login").description("Authenticate with Tarout via browser").option("--api-url <url>", "Custom API URL", "https://tarout.sa").action(async (options) => {
+    try {
+      if (isLoggedIn()) {
+        const profile = getCurrentProfile();
+        if (profile) {
+          log(`Already logged in as ${colors.cyan(profile.userEmail)}`);
+          log(`Organization: ${profile.organizationName}`);
+          log("");
+          log(`Run ${colors.dim("tarout logout")} to sign out first.`);
+          return;
+        }
       }
+      const apiUrl = options.apiUrl;
       log("");
-      log(`${colors.bold(app.name)}`);
-      log("");
-      log(`Status: ${getStatusBadge(app.applicationStatus)}`);
-      if (app.cloudServiceUrl) {
-        log(`URL: ${colors.cyan(app.cloudServiceUrl)}`);
-      }
-      if (cloudStatus) {
-        log(`Provider: ${cloudStatus.provider}`);
-        log(`Region: ${cloudStatus.region}`);
-        log(`Updated: ${new Date(cloudStatus.updatedAt).toLocaleString()}`);
+      log("Opening browser to authenticate...");
+      const authServer = await startAuthServer();
+      const callbackUrl = `http://localhost:${authServer.port}/callback`;
+      const authUrl = `${apiUrl}/cli-auth?callback=${encodeURIComponent(callbackUrl)}`;
+      await open2(authUrl);
+      const _spinner = startSpinner("Waiting for authentication...");
+      try {
+        const authData = await authServer.waitForCallback();
+        succeedSpinner("Authentication successful!");
+        authServer.close();
+        setProfile("default", {
+          token: authData.token,
+          apiUrl,
+          userId: authData.userId,
+          userEmail: authData.userEmail,
+          userName: authData.userName,
+          organizationId: authData.organizationId,
+          organizationName: authData.organizationName,
+          environmentId: authData.environmentId,
+          environmentName: authData.environmentName
+        });
+        setCurrentProfile("default");
+        if (isJsonMode()) {
+          outputData({
+            success: true,
+            user: {
+              id: authData.userId,
+              email: authData.userEmail,
+              name: authData.userName
+            },
+            organization: {
+              id: authData.organizationId,
+              name: authData.organizationName
+            },
+            environment: {
+              id: authData.environmentId,
+              name: authData.environmentName
+            }
+          });
+        } else {
+          log("");
+          success(`Logged in as ${colors.cyan(authData.userEmail)}`);
+          box("Account", [
+            `Organization: ${colors.bold(authData.organizationName)}`,
+            `Environment: ${colors.bold(authData.environmentName)}`
+          ]);
+        }
+      } catch (err) {
+        failSpinner("Authentication failed");
+        authServer.close();
+        throw err;
       }
-      log("");
     } catch (err) {
       handleError(err);
     }
   });
-  program2.command("deploy:cancel").argument("<app>", "Application ID or name").description("Cancel a running deployment").action(async (appIdentifier) => {
+  program2.command("logout").description("Sign out and clear stored credentials").action(async () => {
     try {
-      if (!isLoggedIn()) throw new AuthError();
-      const client2 = getApiClient();
-      const spinner = startSpinner("Cancelling deployment...");
-      const apps = await client2.application.allByOrganization.query();
-      const app = findApp2(apps, appIdentifier);
-      if (!app) {
-        failSpinner();
-        const suggestions = findSimilar(
-          appIdentifier,
-          apps.map((a) => a.name)
-        );
-        throw new NotFoundError("Application", appIdentifier, suggestions);
+      if (!isLoggedIn()) {
+        if (isJsonMode()) {
+          outputData({ success: true, message: "Already logged out" });
+        } else {
+          log("Already logged out.");
+        }
+        return;
       }
-      await client2.application.cancelDeployment.mutate({
-        applicationId: app.applicationId
-      });
-      succeedSpinner("Deployment cancelled");
+      const profile = getCurrentProfile();
+      clearConfig();
       if (isJsonMode()) {
-        outputData({ cancelled: true, applicationId: app.applicationId });
+        outputData({ success: true, message: "Logged out successfully" });
+      } else {
+        success(`Logged out from ${profile?.userEmail || "Tarout"}`);
       }
     } catch (err) {
       handleError(err);
     }
   });
-  program2.command("deploy:list").argument("<app>", "Application ID or name").description("List recent deployments").option("-n, --limit <number>", "Number of deployments to show", "10").action(async (appIdentifier, options) => {
+  program2.command("whoami").description("Show current authenticated user").action(async () => {
     try {
-      if (!isLoggedIn()) throw new AuthError();
-      const client2 = getApiClient();
-      const spinner = startSpinner("Fetching deployments...");
-      const apps = await client2.application.allByOrganization.query();
-      const appSummary = findApp2(apps, appIdentifier);
-      if (!appSummary) {
-        failSpinner();
-        const suggestions = findSimilar(
-          appIdentifier,
-          apps.map((a) => a.name)
-        );
-        throw new NotFoundError("Application", appIdentifier, suggestions);
+      if (!isLoggedIn()) {
+        throw new AuthError();
       }
-      const deployments = await client2.deployment.all.query({
-        applicationId: appSummary.applicationId
-      });
-      succeedSpinner();
-      const limitedDeployments = deployments.slice(0, parseInt(options.limit, 10));
-      if (isJsonMode()) {
-        outputData(limitedDeployments);
-        return;
+      const profile = getCurrentProfile();
+      if (!profile) {
+        throw new AuthError();
       }
-      if (limitedDeployments.length === 0) {
+      if (isJsonMode()) {
+        outputData({
+          user: {
+            id: profile.userId,
+            email: profile.userEmail,
+            name: profile.userName
+          },
+          organization: {
+            id: profile.organizationId,
+            name: profile.organizationName
+          },
+          environment: {
+            id: profile.environmentId,
+            name: profile.environmentName
+          },
+          apiUrl: profile.apiUrl
+        });
+      } else {
         log("");
-        log("No deployments found.");
+        log(`${colors.bold("User")}`);
+        log(`  Email: ${colors.cyan(profile.userEmail)}`);
+        if (profile.userName) {
+          log(`  Name: ${profile.userName}`);
+        }
+        log("");
+        log(`${colors.bold("Organization")}`);
+        log(`  Name: ${profile.organizationName}`);
+        log(`  ID: ${colors.dim(profile.organizationId)}`);
+        log("");
+        log(`${colors.bold("Environment")}`);
+        log(`  Name: ${profile.environmentName}`);
+        log(`  ID: ${colors.dim(profile.environmentId)}`);
         log("");
-        log(`Deploy with: ${colors.dim(`tarout deploy ${appSummary.applicationId.slice(0, 8)}`)}`);
-        return;
       }
-      log("");
-      table(
-        ["ID", "STATUS", "TITLE", "CREATED"],
-        limitedDeployments.map((d) => [
-          colors.cyan(d.deploymentId.slice(0, 8)),
-          getStatusBadge(d.status),
-          d.title || colors.dim("-"),
-          formatDate2(d.createdAt)
-        ])
-      );
-      log("");
-      log(colors.dim(`${limitedDeployments.length} deployment${limitedDeployments.length === 1 ? "" : "s"}`));
     } catch (err) {
       handleError(err);
     }
   });
 }
-function registerLogsCommand(program2) {
-  program2.command("logs").argument("<app>", "Application ID or name").description("View application logs").option("-l, --level <level>", "Log level (ALL, ERROR, WARN, INFO, DEBUG)", "ALL").option("-f, --follow", "Stream logs continuously").option("-n, --limit <number>", "Number of logs to show", "100").option("--since <duration>", "Show logs since (e.g., 1h, 30m, 2d)").action(async (appIdentifier, options) => {
+
+// src/commands/db.ts
+import { spawn } from "child_process";
+function registerDbCommands(program2) {
+  const db = program2.command("db").description("Manage databases");
+  db.command("list").alias("ls").description("List all databases").option("-t, --type <type>", "Filter by type (postgres, mysql, redis)").action(async (options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
       const client2 = getApiClient();
-      const spinner = startSpinner("Fetching logs...");
-      const apps = await client2.application.allByOrganization.query();
-      const app = findApp2(apps, appIdentifier);
-      if (!app) {
-        failSpinner();
-        const suggestions = findSimilar(
-          appIdentifier,
-          apps.map((a) => a.name)
-        );
-        throw new NotFoundError("Application", appIdentifier, suggestions);
-      }
-      let timeRange;
-      if (options.since) {
-        const since = parseDuration(options.since);
-        if (since) {
-          timeRange = {
-            start: new Date(Date.now() - since).toISOString(),
-            end: null
-          };
-        }
-      }
-      const logs = await client2.logs.getCloudRunLogs.query({
-        applicationId: app.applicationId,
-        level: options.level.toUpperCase(),
-        limit: parseInt(options.limit, 10),
-        timeRange
-      });
+      const _spinner = startSpinner("Fetching databases...");
+      const [postgres, mysql, redis] = await Promise.all([
+        client2.postgres.allByOrganization.query(),
+        client2.mysql.allByOrganization.query(),
+        client2.redis.allByOrganization.query()
+      ]);
       succeedSpinner();
+      let databases = [];
+      if (!options.type || options.type === "postgres") {
+        databases = databases.concat(
+          postgres.map((db2) => ({
+            id: db2.postgresId,
+            name: db2.name,
+            type: "postgres",
+            status: db2.applicationStatus,
+            created: db2.createdAt
+          }))
+        );
+      }
+      if (!options.type || options.type === "mysql") {
+        databases = databases.concat(
+          mysql.map((db2) => ({
+            id: db2.mysqlId,
+            name: db2.name,
+            type: "mysql",
+            status: db2.applicationStatus,
+            created: db2.createdAt
+          }))
+        );
+      }
+      if (!options.type || options.type === "redis") {
+        databases = databases.concat(
+          redis.map((db2) => ({
+            id: db2.redisId,
+            name: db2.name,
+            type: "redis",
+            status: db2.applicationStatus,
+            created: db2.createdAt
+          }))
+        );
+      }
       if (isJsonMode()) {
-        outputData(logs);
+        outputData(databases);
         return;
       }
-      if (!logs.entries || logs.entries.length === 0) {
+      if (databases.length === 0) {
         log("");
-        log("No logs found.");
+        log("No databases found.");
+        log("");
+        log(`Create one with: ${colors.dim("tarout db create <name>")}`);
         return;
       }
       log("");
-      for (const entry of logs.entries) {
-        printLogEntry(entry);
-      }
-      if (options.follow) {
-        log("");
-        log(colors.dim("Streaming logs... (Ctrl+C to stop)"));
-        log("");
-        let lastTimestamp = logs.entries.length > 0 ? new Date(logs.entries[logs.entries.length - 1].timestamp).getTime() : Date.now();
-        while (true) {
-          await sleep(2e3);
-          const newLogs = await client2.logs.getCloudRunLogs.query({
-            applicationId: app.applicationId,
-            level: options.level.toUpperCase(),
-            limit: 50,
-            timeRange: {
-              start: new Date(lastTimestamp + 1).toISOString(),
-              end: null
-            }
-          });
-          if (newLogs.entries && newLogs.entries.length > 0) {
-            for (const entry of newLogs.entries) {
-              const entryTime = new Date(entry.timestamp).getTime();
-              if (entryTime > lastTimestamp) {
-                printLogEntry(entry);
-                lastTimestamp = entryTime;
-              }
-            }
-          }
-        }
-      }
+      table(
+        ["ID", "NAME", "TYPE", "STATUS", "CREATED"],
+        databases.map((db2) => [
+          colors.cyan(db2.id.slice(0, 8)),
+          db2.name,
+          getTypeLabel(db2.type),
+          getStatusBadge(db2.status),
+          formatDate2(db2.created)
+        ])
+      );
+      log("");
+      log(
+        colors.dim(
+          `${databases.length} database${databases.length === 1 ? "" : "s"}`
+        )
+      );
     } catch (err) {
       handleError(err);
     }
   });
-}
-function findApp2(apps, identifier) {
-  const lowerIdentifier = identifier.toLowerCase();
-  return apps.find(
-    (app) => app.applicationId === identifier || app.applicationId.startsWith(identifier) || app.name.toLowerCase() === lowerIdentifier || app.appName?.toLowerCase() === lowerIdentifier
-  );
-}
-function formatDate2(date) {
-  const d = new Date(date);
-  return d.toLocaleString("en-US", {
-    month: "short",
-    day: "numeric",
-    hour: "2-digit",
-    minute: "2-digit"
-  });
-}
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-function parseDuration(duration) {
-  const match = duration.match(/^(\d+)(s|m|h|d)$/);
-  if (!match) return null;
-  const value = parseInt(match[1], 10);
-  const unit = match[2];
-  const multipliers = {
-    s: 1e3,
-    m: 60 * 1e3,
-    h: 60 * 60 * 1e3,
-    d: 24 * 60 * 60 * 1e3
-  };
-  return value * (multipliers[unit] || 0);
-}
-function printLogEntry(entry) {
-  const time = new Date(entry.timestamp);
-  const timeStr = time.toLocaleTimeString("en-US", {
-    hour12: false,
-    hour: "2-digit",
-    minute: "2-digit",
-    second: "2-digit"
-  });
-  const levelColors = {
-    ERROR: colors.error,
-    WARN: colors.warn,
-    INFO: colors.info,
-    DEBUG: colors.dim,
-    DEFAULT: colors.dim
-  };
-  const colorFn = levelColors[entry.severity] || levelColors.DEFAULT;
-  const level = entry.severity.padEnd(5);
-  console.log(`${colors.dim(timeStr)}  ${colorFn(level)}  ${entry.message}`);
-}
-
-// src/commands/env.ts
-import { readFileSync, writeFileSync, existsSync } from "fs";
-function registerEnvCommands(program2) {
-  const env = program2.command("env").argument("<app>", "Application ID or name").description("Manage environment variables");
-  env.command("list").alias("ls").description("List all environment variables").option("--reveal", "Show actual values (not masked)").action(async (options, command) => {
+  db.command("create").argument("[name]", "Database name").description("Create a new database").option(
+    "-t, --type <type>",
+    "Database type (postgres, mysql, redis)",
+    "postgres"
+  ).option("-d, --description <description>", "Database description").action(async (name, options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const appIdentifier = command.parent.args[0];
+      const profile = getCurrentProfile();
+      if (!profile) throw new AuthError();
+      let dbName = name;
+      let dbType = options.type;
+      if (!dbName) {
+        dbName = await input("Database name:");
+      }
+      if (!options.type && !shouldSkipConfirmation()) {
+        dbType = await select("Database type:", [
+          { name: "PostgreSQL", value: "postgres" },
+          { name: "MySQL", value: "mysql" },
+          { name: "Redis", value: "redis" }
+        ]);
+      }
+      const slug = generateSlug2(dbName);
       const client2 = getApiClient();
-      const spinner = startSpinner("Fetching environment variables...");
-      const apps = await client2.application.allByOrganization.query();
-      const app = findApp3(apps, appIdentifier);
-      if (!app) {
-        failSpinner();
-        const suggestions = findSimilar(
-          appIdentifier,
-          apps.map((a) => a.name)
-        );
-        throw new NotFoundError("Application", appIdentifier, suggestions);
+      const _spinner = startSpinner(`Creating ${dbType} database...`);
+      let database;
+      switch (dbType) {
+        case "postgres":
+          database = await client2.postgres.create.mutate({
+            name: dbName,
+            appName: slug,
+            dockerImage: "postgres:17",
+            organizationId: profile.organizationId,
+            description: options.description
+          });
+          break;
+        case "mysql":
+          database = await client2.mysql.create.mutate({
+            name: dbName,
+            appName: slug,
+            dockerImage: "mysql:8",
+            organizationId: profile.organizationId,
+            description: options.description
+          });
+          break;
+        case "redis":
+          database = await client2.redis.create.mutate({
+            name: dbName,
+            appName: slug,
+            dockerImage: "redis:7",
+            organizationId: profile.organizationId,
+            description: options.description
+          });
+          break;
+        default:
+          throw new CliError(
+            `Unsupported database type: ${dbType}`,
+            ExitCode.INVALID_ARGUMENTS
+          );
       }
-      const variables = await client2.envVariable.list.query({
-        applicationId: app.applicationId,
-        includeValues: options.reveal || false
-      });
-      succeedSpinner();
+      succeedSpinner("Database created!");
+      const dbId = database.postgresId || database.mysqlId || database.redisId;
       if (isJsonMode()) {
-        outputData(variables);
-        return;
-      }
-      if (variables.length === 0) {
-        log("");
-        log("No environment variables found.");
-        log("");
-        log(`Set one with: ${colors.dim(`tarout env ${app.name} set KEY=value`)}`);
+        outputData(database);
         return;
       }
-      log("");
-      table(
-        ["KEY", "VALUE", "SECRET", "UPDATED"],
-        variables.map((v) => [
-          colors.cyan(v.key),
-          options.reveal ? v.value || colors.dim("-") : maskValue(v.value),
-          v.isSecret ? colors.warn("Yes") : "No",
-          formatDate3(v.updatedAt)
-        ])
+      quietOutput(dbId);
+      box("Database Created", [
+        `ID: ${colors.cyan(dbId)}`,
+        `Name: ${database.name}`,
+        `Type: ${getTypeLabel(dbType)}`
+      ]);
+      log("Next steps:");
+      log(
+        `  View connection info: ${colors.dim(`tarout db info ${dbId.slice(0, 8)}`)}`
       );
       log("");
-      log(colors.dim(`${variables.length} variable${variables.length === 1 ? "" : "s"}`));
     } catch (err) {
       handleError(err);
     }
   });
-  env.command("set").argument("<key=value>", "Variable to set (KEY=value format)").description("Set an environment variable").option("-s, --secret", "Mark as secret (default)", true).option("--no-secret", "Mark as non-secret").action(async (keyValue, options, command) => {
+  db.command("delete").alias("rm").argument("<db>", "Database ID or name").description("Delete a database").action(async (dbIdentifier) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const appIdentifier = command.parent.parent.args[0];
-      const eqIndex = keyValue.indexOf("=");
-      if (eqIndex === -1) {
-        throw new InvalidArgumentError(
-          "Invalid format. Use KEY=value (e.g., API_KEY=secret123)"
+      const client2 = getApiClient();
+      const _spinner = startSpinner("Finding database...");
+      const allDbs = await getAllDatabases(client2);
+      const dbInfo = findDatabase(allDbs, dbIdentifier);
+      if (!dbInfo) {
+        failSpinner();
+        const suggestions = findSimilar(
+          dbIdentifier,
+          allDbs.map((d) => d.name)
         );
+        throw new NotFoundError("Database", dbIdentifier, suggestions);
       }
-      const key = keyValue.slice(0, eqIndex);
-      const value = keyValue.slice(eqIndex + 1);
-      if (!key) {
-        throw new InvalidArgumentError("Key cannot be empty");
-      }
-      const client2 = getApiClient();
-      const spinner = startSpinner("Setting environment variable...");
-      const apps = await client2.application.allByOrganization.query();
-      const app = findApp3(apps, appIdentifier);
-      if (!app) {
-        failSpinner();
-        const suggestions = findSimilar(
-          appIdentifier,
-          apps.map((a) => a.name)
+      succeedSpinner();
+      if (!shouldSkipConfirmation()) {
+        log("");
+        log(`Database: ${colors.bold(dbInfo.name)}`);
+        log(`Type: ${getTypeLabel(dbInfo.type)}`);
+        log(`ID: ${colors.dim(dbInfo.id)}`);
+        log("");
+        const confirmed = await confirm(
+          `Are you sure you want to delete "${dbInfo.name}"? This cannot be undone.`,
+          false
         );
-        throw new NotFoundError("Application", appIdentifier, suggestions);
+        if (!confirmed) {
+          log("Cancelled.");
+          return;
+        }
       }
-      const existing = await client2.envVariable.list.query({
-        applicationId: app.applicationId,
-        includeValues: false
-      });
-      const existingVar = existing.find((v) => v.key === key);
-      if (existingVar) {
-        await client2.envVariable.update.mutate({
-          applicationId: app.applicationId,
-          key,
-          value,
-          isSecret: options.secret
-        });
-      } else {
-        await client2.envVariable.create.mutate({
-          applicationId: app.applicationId,
-          key,
-          value,
-          isSecret: options.secret
-        });
+      const _deleteSpinner = startSpinner("Deleting database...");
+      switch (dbInfo.type) {
+        case "postgres":
+          await client2.postgres.remove.mutate({ postgresId: dbInfo.id });
+          break;
+        case "mysql":
+          await client2.mysql.remove.mutate({ mysqlId: dbInfo.id });
+          break;
+        case "redis":
+          await client2.redis.remove.mutate({ redisId: dbInfo.id });
+          break;
       }
-      succeedSpinner(`Set ${key}`);
+      succeedSpinner("Database deleted!");
       if (isJsonMode()) {
-        outputData({ key, updated: !!existingVar });
+        outputData({ deleted: true, id: dbInfo.id });
       } else {
-        quietOutput(key);
+        quietOutput(dbInfo.id);
       }
     } catch (err) {
       handleError(err);
     }
   });
-  env.command("unset").argument("<key>", "Variable key to remove").description("Remove an environment variable").action(async (key, options, command) => {
+  db.command("info").argument("<db>", "Database ID or name").description("Show database details and connection info").action(async (dbIdentifier) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const appIdentifier = command.parent.parent.args[0];
       const client2 = getApiClient();
-      const spinner = startSpinner("Removing environment variable...");
-      const apps = await client2.application.allByOrganization.query();
-      const app = findApp3(apps, appIdentifier);
-      if (!app) {
+      const _spinner = startSpinner("Fetching database info...");
+      const allDbs = await getAllDatabases(client2);
+      const dbSummary = findDatabase(allDbs, dbIdentifier);
+      if (!dbSummary) {
         failSpinner();
         const suggestions = findSimilar(
-          appIdentifier,
-          apps.map((a) => a.name)
+          dbIdentifier,
+          allDbs.map((d) => d.name)
         );
-        throw new NotFoundError("Application", appIdentifier, suggestions);
+        throw new NotFoundError("Database", dbIdentifier, suggestions);
       }
-      await client2.envVariable.delete.mutate({
-        applicationId: app.applicationId,
-        key
-      });
-      succeedSpinner(`Removed ${key}`);
+      let dbDetails;
+      switch (dbSummary.type) {
+        case "postgres":
+          dbDetails = await client2.postgres.one.query({
+            postgresId: dbSummary.id
+          });
+          break;
+        case "mysql":
+          dbDetails = await client2.mysql.one.query({ mysqlId: dbSummary.id });
+          break;
+        case "redis":
+          dbDetails = await client2.redis.one.query({ redisId: dbSummary.id });
+          break;
+      }
+      succeedSpinner();
       if (isJsonMode()) {
-        outputData({ key, deleted: true });
+        outputData(dbDetails);
+        return;
+      }
+      log("");
+      log(colors.bold(dbDetails.name));
+      log(colors.dim(dbSummary.id));
+      log("");
+      log(`${colors.bold("Status")}`);
+      log(`  ${getStatusBadge(dbDetails.applicationStatus)}`);
+      log(`  Type: ${getTypeLabel(dbSummary.type)}`);
+      log("");
+      log(`${colors.bold("Connection")}`);
+      if (dbSummary.type === "redis") {
+        if (dbDetails.cloudHost) {
+          log(`  Host: ${colors.cyan(dbDetails.cloudHost)}`);
+          log(`  Port: ${dbDetails.cloudPort || 6379}`);
+          if (dbDetails.cloudPassword) {
+            log(`  Password: ${colors.dim("********")}`);
+          }
+        } else {
+          log(`  ${colors.dim("Not yet deployed")}`);
+        }
       } else {
-        quietOutput(key);
+        if (dbDetails.cloudInstanceId || dbDetails.databaseName) {
+          log(`  Host: ${colors.cyan(dbDetails.cloudHost || "localhost")}`);
+          log(
+            `  Port: ${dbDetails.cloudPort || (dbSummary.type === "postgres" ? 5432 : 3306)}`
+          );
+          log(
+            `  Database: ${dbDetails.cloudDatabaseName || dbDetails.databaseName}`
+          );
+          log(
+            `  Username: ${dbDetails.cloudUsername || dbDetails.databaseUser}`
+          );
+          log(`  Password: ${colors.dim("********")}`);
+        } else {
+          log(`  ${colors.dim("Not yet deployed")}`);
+        }
+      }
+      log("");
+      if (dbDetails.cloudHost || dbDetails.databaseName) {
+        log(`${colors.bold("Connection String")}`);
+        const connStr = getConnectionString(dbSummary.type, dbDetails);
+        log(`  ${colors.cyan(connStr)}`);
+        log("");
       }
+      log(`${colors.bold("Created")}`);
+      log(`  ${new Date(dbDetails.createdAt).toLocaleString()}`);
+      log("");
     } catch (err) {
       handleError(err);
     }
   });
-  env.command("pull").description("Download environment variables as .env file").option("-o, --output <file>", "Output file path", ".env").option("--reveal", "Include actual secret values").action(async (options, command) => {
+  db.command("connect").argument("<db>", "Database ID or name").description("Open interactive database shell").action(async (dbIdentifier) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const appIdentifier = command.parent.parent.args[0];
       const client2 = getApiClient();
-      const spinner = startSpinner("Downloading environment variables...");
-      const apps = await client2.application.allByOrganization.query();
-      const app = findApp3(apps, appIdentifier);
-      if (!app) {
+      const _spinner = startSpinner("Connecting to database...");
+      const allDbs = await getAllDatabases(client2);
+      const dbSummary = findDatabase(allDbs, dbIdentifier);
+      if (!dbSummary) {
         failSpinner();
         const suggestions = findSimilar(
-          appIdentifier,
-          apps.map((a) => a.name)
-        );
-        throw new NotFoundError("Application", appIdentifier, suggestions);
-      }
-      if (existsSync(options.output) && !shouldSkipConfirmation()) {
-        succeedSpinner();
-        const confirmed = await confirm(
-          `File ${options.output} already exists. Overwrite?`,
-          false
+          dbIdentifier,
+          allDbs.map((d) => d.name)
         );
-        if (!confirmed) {
-          log("Cancelled.");
-          return;
-        }
-      }
-      const result = await client2.envVariable.export.query({
-        applicationId: app.applicationId,
-        format: "dotenv",
-        maskSecrets: !options.reveal
-      });
-      writeFileSync(options.output, result.content);
-      succeedSpinner(`Saved to ${options.output}`);
-      if (isJsonMode()) {
-        outputData({ file: options.output, content: result.content });
-      } else {
-        quietOutput(options.output);
+        throw new NotFoundError("Database", dbIdentifier, suggestions);
       }
-    } catch (err) {
-      handleError(err);
-    }
-  });
-  env.command("push").description("Upload environment variables from .env file").option("-i, --input <file>", "Input file path", ".env").option("--replace", "Replace all existing variables (default: merge)").action(async (options, command) => {
-    try {
-      if (!isLoggedIn()) throw new AuthError();
-      const appIdentifier = command.parent.parent.args[0];
-      if (!existsSync(options.input)) {
-        throw new InvalidArgumentError(`File not found: ${options.input}`);
+      let dbDetails;
+      switch (dbSummary.type) {
+        case "postgres":
+          dbDetails = await client2.postgres.one.query({
+            postgresId: dbSummary.id
+          });
+          break;
+        case "mysql":
+          dbDetails = await client2.mysql.one.query({ mysqlId: dbSummary.id });
+          break;
+        case "redis":
+          dbDetails = await client2.redis.one.query({ redisId: dbSummary.id });
+          break;
       }
-      const content = readFileSync(options.input, "utf-8");
-      const client2 = getApiClient();
-      const spinner = startSpinner("Uploading environment variables...");
-      const apps = await client2.application.allByOrganization.query();
-      const app = findApp3(apps, appIdentifier);
-      if (!app) {
-        failSpinner();
-        const suggestions = findSimilar(
-          appIdentifier,
-          apps.map((a) => a.name)
+      succeedSpinner();
+      if (!dbDetails.cloudHost && !dbDetails.databaseName) {
+        throw new CliError(
+          "Database not deployed yet. Deploy first.",
+          ExitCode.GENERAL_ERROR
         );
-        throw new NotFoundError("Application", appIdentifier, suggestions);
       }
-      const result = await client2.envVariable.import.mutate({
-        applicationId: app.applicationId,
-        content,
-        format: "dotenv",
-        merge: !options.replace
+      const { command, args, env } = getConnectCommand(
+        dbSummary.type,
+        dbDetails
+      );
+      log("");
+      log(`Connecting to ${colors.bold(dbDetails.name)}...`);
+      log(colors.dim("Press Ctrl+D to exit"));
+      log("");
+      const child = spawn(command, args, {
+        stdio: "inherit",
+        env: { ...process.env, ...env }
+      });
+      child.on("exit", (code) => {
+        process.exit(code || 0);
       });
-      succeedSpinner(`Imported ${result.imported} variables`);
-      if (isJsonMode()) {
-        outputData(result);
-      } else {
-        quietOutput(String(result.imported));
-        if (result.skipped > 0) {
-          log(colors.dim(`Skipped ${result.skipped} (already exist)`));
-        }
-      }
     } catch (err) {
       handleError(err);
     }
   });
 }
-function findApp3(apps, identifier) {
-  const lowerIdentifier = identifier.toLowerCase();
-  return apps.find(
-    (app) => app.applicationId === identifier || app.applicationId.startsWith(identifier) || app.name.toLowerCase() === lowerIdentifier || app.appName?.toLowerCase() === lowerIdentifier
-  );
-}
-function maskValue(value) {
-  if (!value) return colors.dim("-");
-  if (value.length <= 4) return "****";
-  return value.slice(0, 2) + "****" + value.slice(-2);
-}
-function formatDate3(date) {
-  const d = new Date(date);
-  return d.toLocaleDateString("en-US", { month: "short", day: "numeric" });
-}
-
-// src/commands/db.ts
-import { spawn } from "child_process";
-function registerDbCommands(program2) {
-  const db = program2.command("db").description("Manage databases");
-  db.command("list").alias("ls").description("List all databases").option("-t, --type <type>", "Filter by type (postgres, mysql, redis)").action(async (options) => {
-    try {
-      if (!isLoggedIn()) throw new AuthError();
-      const client2 = getApiClient();
-      const spinner = startSpinner("Fetching databases...");
-      const [postgres, mysql, redis] = await Promise.all([
-        client2.postgres.allByOrganization.query(),
-        client2.mysql.allByOrganization.query(),
-        client2.redis.allByOrganization.query()
-      ]);
-      succeedSpinner();
-      let databases = [];
-      if (!options.type || options.type === "postgres") {
-        databases = databases.concat(
-          postgres.map((db2) => ({
-            id: db2.postgresId,
-            name: db2.name,
-            type: "postgres",
-            status: db2.applicationStatus,
-            created: db2.createdAt
-          }))
-        );
+async function getAllDatabases(client2) {
+  const [postgres, mysql, redis] = await Promise.all([
+    client2.postgres.allByOrganization.query(),
+    client2.mysql.allByOrganization.query(),
+    client2.redis.allByOrganization.query()
+  ]);
+  const databases = [];
+  for (const db of postgres) {
+    databases.push({
+      id: db.postgresId,
+      name: db.name,
+      type: "postgres",
+      status: db.applicationStatus
+    });
+  }
+  for (const db of mysql) {
+    databases.push({
+      id: db.mysqlId,
+      name: db.name,
+      type: "mysql",
+      status: db.applicationStatus
+    });
+  }
+  for (const db of redis) {
+    databases.push({
+      id: db.redisId,
+      name: db.name,
+      type: "redis",
+      status: db.applicationStatus
+    });
+  }
+  return databases;
+}
+function findDatabase(databases, identifier) {
+  const lowerIdentifier = identifier.toLowerCase();
+  return databases.find(
+    (db) => db.id === identifier || db.id.startsWith(identifier) || db.name.toLowerCase() === lowerIdentifier
+  );
+}
+function generateSlug2(name) {
+  return name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 63);
+}
+function formatDate2(date) {
+  const d = new Date(date);
+  return d.toLocaleDateString("en-US", { month: "short", day: "numeric" });
+}
+function getTypeLabel(type) {
+  const labels = {
+    postgres: colors.info("PostgreSQL"),
+    mysql: colors.warn("MySQL"),
+    redis: colors.error("Redis")
+  };
+  return labels[type] || type;
+}
+function getConnectionString(type, details) {
+  const host = details.cloudHost || "localhost";
+  const user = details.cloudUsername || details.databaseUser || "user";
+  const dbName = details.cloudDatabaseName || details.databaseName || "db";
+  switch (type) {
+    case "postgres": {
+      const pgPort = details.cloudPort || 5432;
+      return `postgresql://${user}:****@${host}:${pgPort}/${dbName}`;
+    }
+    case "mysql": {
+      const myPort = details.cloudPort || 3306;
+      return `mysql://${user}:****@${host}:${myPort}/${dbName}`;
+    }
+    case "redis": {
+      const redisPort = details.cloudPort || 6379;
+      return `redis://:****@${host}:${redisPort}`;
+    }
+    default:
+      return "";
+  }
+}
+function getConnectCommand(type, details) {
+  const host = details.cloudHost || "localhost";
+  const user = details.cloudUsername || details.databaseUser || "user";
+  const password = details.cloudPassword || details.databasePassword || "";
+  const dbName = details.cloudDatabaseName || details.databaseName || "db";
+  switch (type) {
+    case "postgres":
+      return {
+        command: "psql",
+        args: [
+          "-h",
+          host,
+          "-p",
+          String(details.cloudPort || 5432),
+          "-U",
+          user,
+          "-d",
+          dbName
+        ],
+        env: { PGPASSWORD: password }
+      };
+    case "mysql":
+      return {
+        command: "mysql",
+        args: [
+          "-h",
+          host,
+          "-P",
+          String(details.cloudPort || 3306),
+          "-u",
+          user,
+          `-p${password}`,
+          dbName
+        ],
+        env: {}
+      };
+    case "redis":
+      return {
+        command: "redis-cli",
+        args: [
+          "-h",
+          host,
+          "-p",
+          String(details.cloudPort || 6379),
+          ...password ? ["-a", password] : []
+        ],
+        env: {}
+      };
+    default:
+      throw new CliError(
+        `Unsupported database type: ${type}`,
+        ExitCode.INVALID_ARGUMENTS
+      );
+  }
+}
+
+// src/lib/websocket.ts
+import WebSocket from "ws";
+function streamDeploymentLogs(logPath, options) {
+  const token = getToken();
+  const apiUrl = getApiUrl();
+  const wsUrl = apiUrl.replace(/^http/, "ws");
+  const fullUrl = `${wsUrl}/listen-deployment?logPath=${encodeURIComponent(logPath)}`;
+  const ws = new WebSocket(fullUrl, {
+    headers: {
+      "x-api-key": token || ""
+    }
+  });
+  let buffer = "";
+  const done = new Promise((resolve) => {
+    ws.on("close", (code, reason) => {
+      if (buffer.length > 0) {
+        options.onData(buffer);
+      }
+      options.onClose?.(code, reason.toString());
+      resolve({ code, reason: reason.toString() });
+    });
+  });
+  ws.on("open", () => {
+    options.onOpen?.();
+  });
+  ws.on("message", (data) => {
+    buffer += data.toString();
+    const lines = buffer.split("\n");
+    buffer = lines.pop() || "";
+    for (const line of lines) {
+      if (line.length > 0) {
+        options.onData(line);
       }
-      if (!options.type || options.type === "mysql") {
-        databases = databases.concat(
-          mysql.map((db2) => ({
-            id: db2.mysqlId,
-            name: db2.name,
-            type: "mysql",
-            status: db2.applicationStatus,
-            created: db2.createdAt
-          }))
+    }
+  });
+  ws.on("error", (error2) => {
+    options.onError?.(error2);
+  });
+  const cleanup = () => {
+    if (ws.readyState === WebSocket.OPEN) {
+      ws.close();
+    }
+  };
+  return { cleanup, done };
+}
+
+// src/commands/deploy.ts
+function registerDeployCommands(program2) {
+  program2.command("deploy").argument("<app>", "Application ID or name").description("Deploy an application").option("-r, --region <region>", "Deployment region", "me-central1").option("-w, --wait", "Wait for deployment to complete and stream logs").action(async (appIdentifier, options) => {
+    try {
+      if (!isLoggedIn()) throw new AuthError();
+      const client2 = getApiClient();
+      const _spinner = startSpinner("Finding application...");
+      const apps = await client2.application.allByOrganization.query();
+      const app = findApp2(apps, appIdentifier);
+      if (!app) {
+        failSpinner();
+        const suggestions = findSimilar(
+          appIdentifier,
+          apps.map((a) => a.name)
         );
+        throw new NotFoundError("Application", appIdentifier, suggestions);
       }
-      if (!options.type || options.type === "redis") {
-        databases = databases.concat(
-          redis.map((db2) => ({
-            id: db2.redisId,
-            name: db2.name,
-            type: "redis",
-            status: db2.applicationStatus,
-            created: db2.createdAt
-          }))
+      updateSpinner(`Deploying ${app.name}...`);
+      const result = await client2.application.deployToCloud.mutate({
+        applicationId: app.applicationId,
+        region: options.region
+      });
+      if (options.wait) {
+        await streamDeploymentWithLogs(
+          client2,
+          result.deploymentId,
+          app.name,
+          app.applicationId
         );
-      }
-      if (isJsonMode()) {
-        outputData(databases);
         return;
       }
-      if (databases.length === 0) {
+      succeedSpinner("Deployment started!");
+      if (isJsonMode()) {
+        outputData({
+          deploymentId: result.deploymentId,
+          status: "deploying"
+        });
+      } else {
+        quietOutput(result.deploymentId);
         log("");
-        log("No databases found.");
+        log(`Deployment ID: ${colors.cyan(result.deploymentId)}`);
+        log("");
+        log("Deployment is running in the background.");
+        log(
+          `Check status: ${colors.dim(`tarout deploy:status ${app.applicationId.slice(0, 8)}`)}`
+        );
+        log(
+          `View logs: ${colors.dim(`tarout deploy:logs ${result.deploymentId.slice(0, 8)}`)}`
+        );
         log("");
-        log(`Create one with: ${colors.dim("tarout db create <name>")}`);
-        return;
       }
-      log("");
-      table(
-        ["ID", "NAME", "TYPE", "STATUS", "CREATED"],
-        databases.map((db2) => [
-          colors.cyan(db2.id.slice(0, 8)),
-          db2.name,
-          getTypeLabel(db2.type),
-          getStatusBadge(db2.status),
-          formatDate4(db2.created)
-        ])
-      );
-      log("");
-      log(
-        colors.dim(`${databases.length} database${databases.length === 1 ? "" : "s"}`)
-      );
     } catch (err) {
       handleError(err);
     }
   });
-  db.command("create").argument("[name]", "Database name").description("Create a new database").option("-t, --type <type>", "Database type (postgres, mysql, redis)", "postgres").option("-d, --description <description>", "Database description").action(async (name, options) => {
+  program2.command("deploy:status").argument("<app>", "Application ID or name").description("Check deployment status").action(async (appIdentifier) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
-      const profile = getCurrentProfile();
-      if (!profile) throw new AuthError();
-      let dbName = name;
-      let dbType = options.type;
-      if (!dbName) {
-        dbName = await input("Database name:");
-      }
-      if (!options.type && !shouldSkipConfirmation()) {
-        dbType = await select("Database type:", [
-          { name: "PostgreSQL", value: "postgres" },
-          { name: "MySQL", value: "mysql" },
-          { name: "Redis", value: "redis" }
-        ]);
-      }
-      const slug = generateSlug2(dbName);
       const client2 = getApiClient();
-      const spinner = startSpinner(`Creating ${dbType} database...`);
-      let database;
-      switch (dbType) {
-        case "postgres":
-          database = await client2.postgres.create.mutate({
-            name: dbName,
-            appName: slug,
-            dockerImage: "postgres:17",
-            organizationId: profile.organizationId,
-            description: options.description
-          });
-          break;
-        case "mysql":
-          database = await client2.mysql.create.mutate({
-            name: dbName,
-            appName: slug,
-            dockerImage: "mysql:8",
-            organizationId: profile.organizationId,
-            description: options.description
-          });
-          break;
-        case "redis":
-          database = await client2.redis.create.mutate({
-            name: dbName,
-            appName: slug,
-            dockerImage: "redis:7",
-            organizationId: profile.organizationId,
-            description: options.description
-          });
-          break;
-        default:
-          throw new CliError(`Unsupported database type: ${dbType}`, ExitCode.INVALID_ARGUMENTS);
+      const _spinner = startSpinner("Fetching status...");
+      const apps = await client2.application.allByOrganization.query();
+      const appSummary = findApp2(apps, appIdentifier);
+      if (!appSummary) {
+        failSpinner();
+        const suggestions = findSimilar(
+          appIdentifier,
+          apps.map((a) => a.name)
+        );
+        throw new NotFoundError("Application", appIdentifier, suggestions);
       }
-      succeedSpinner("Database created!");
-      const dbId = database.postgresId || database.mysqlId || database.redisId;
+      const app = await client2.application.one.query({
+        applicationId: appSummary.applicationId
+      });
+      const cloudStatus = await client2.application.getCloudDeploymentStatus.query({
+        applicationId: appSummary.applicationId
+      });
+      succeedSpinner();
       if (isJsonMode()) {
-        outputData(database);
+        outputData({
+          applicationId: app.applicationId,
+          name: app.name,
+          status: app.applicationStatus,
+          url: app.cloudServiceUrl,
+          cloudStatus
+        });
         return;
       }
-      quietOutput(dbId);
-      box("Database Created", [
-        `ID: ${colors.cyan(dbId)}`,
-        `Name: ${database.name}`,
-        `Type: ${getTypeLabel(dbType)}`
-      ]);
-      log("Next steps:");
-      log(`  View connection info: ${colors.dim(`tarout db info ${dbId.slice(0, 8)}`)}`);
+      log("");
+      log(`${colors.bold(app.name)}`);
+      log("");
+      log(`Status: ${getStatusBadge(app.applicationStatus)}`);
+      if (app.cloudServiceUrl) {
+        log(`URL: ${colors.cyan(app.cloudServiceUrl)}`);
+      }
+      if (cloudStatus) {
+        log(`Provider: ${cloudStatus.provider}`);
+        log(`Region: ${cloudStatus.region}`);
+        log(`Updated: ${new Date(cloudStatus.updatedAt).toLocaleString()}`);
+      }
       log("");
     } catch (err) {
       handleError(err);
     }
   });
-  db.command("delete").alias("rm").argument("<db>", "Database ID or name").description("Delete a database").action(async (dbIdentifier) => {
+  program2.command("deploy:cancel").argument("<app>", "Application ID or name").description("Cancel a running deployment").action(async (appIdentifier) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
       const client2 = getApiClient();
-      const spinner = startSpinner("Finding database...");
-      const allDbs = await getAllDatabases(client2);
-      const dbInfo = findDatabase(allDbs, dbIdentifier);
-      if (!dbInfo) {
+      const _spinner = startSpinner("Cancelling deployment...");
+      const apps = await client2.application.allByOrganization.query();
+      const app = findApp2(apps, appIdentifier);
+      if (!app) {
         failSpinner();
         const suggestions = findSimilar(
-          dbIdentifier,
-          allDbs.map((d) => d.name)
-        );
-        throw new NotFoundError("Database", dbIdentifier, suggestions);
-      }
-      succeedSpinner();
-      if (!shouldSkipConfirmation()) {
-        log("");
-        log(`Database: ${colors.bold(dbInfo.name)}`);
-        log(`Type: ${getTypeLabel(dbInfo.type)}`);
-        log(`ID: ${colors.dim(dbInfo.id)}`);
-        log("");
-        const confirmed = await confirm(
-          `Are you sure you want to delete "${dbInfo.name}"? This cannot be undone.`,
-          false
+          appIdentifier,
+          apps.map((a) => a.name)
         );
-        if (!confirmed) {
-          log("Cancelled.");
-          return;
-        }
-      }
-      const deleteSpinner = startSpinner("Deleting database...");
-      switch (dbInfo.type) {
-        case "postgres":
-          await client2.postgres.remove.mutate({ postgresId: dbInfo.id });
-          break;
-        case "mysql":
-          await client2.mysql.remove.mutate({ mysqlId: dbInfo.id });
-          break;
-        case "redis":
-          await client2.redis.remove.mutate({ redisId: dbInfo.id });
-          break;
+        throw new NotFoundError("Application", appIdentifier, suggestions);
       }
-      succeedSpinner("Database deleted!");
+      await client2.application.cancelDeployment.mutate({
+        applicationId: app.applicationId
+      });
+      succeedSpinner("Deployment cancelled");
       if (isJsonMode()) {
-        outputData({ deleted: true, id: dbInfo.id });
-      } else {
-        quietOutput(dbInfo.id);
+        outputData({ cancelled: true, applicationId: app.applicationId });
       }
     } catch (err) {
       handleError(err);
     }
   });
-  db.command("info").argument("<db>", "Database ID or name").description("Show database details and connection info").action(async (dbIdentifier) => {
+  program2.command("deploy:list").argument("<app>", "Application ID or name").description("List recent deployments").option("-n, --limit <number>", "Number of deployments to show", "10").action(async (appIdentifier, options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
       const client2 = getApiClient();
-      const spinner = startSpinner("Fetching database info...");
-      const allDbs = await getAllDatabases(client2);
-      const dbSummary = findDatabase(allDbs, dbIdentifier);
-      if (!dbSummary) {
+      const _spinner = startSpinner("Fetching deployments...");
+      const apps = await client2.application.allByOrganization.query();
+      const appSummary = findApp2(apps, appIdentifier);
+      if (!appSummary) {
         failSpinner();
         const suggestions = findSimilar(
-          dbIdentifier,
-          allDbs.map((d) => d.name)
+          appIdentifier,
+          apps.map((a) => a.name)
         );
-        throw new NotFoundError("Database", dbIdentifier, suggestions);
-      }
-      let dbDetails;
-      switch (dbSummary.type) {
-        case "postgres":
-          dbDetails = await client2.postgres.one.query({ postgresId: dbSummary.id });
-          break;
-        case "mysql":
-          dbDetails = await client2.mysql.one.query({ mysqlId: dbSummary.id });
-          break;
-        case "redis":
-          dbDetails = await client2.redis.one.query({ redisId: dbSummary.id });
-          break;
+        throw new NotFoundError("Application", appIdentifier, suggestions);
       }
+      const deployments = await client2.deployment.all.query({
+        applicationId: appSummary.applicationId
+      });
       succeedSpinner();
+      const limitedDeployments = deployments.slice(
+        0,
+        Number.parseInt(options.limit, 10)
+      );
       if (isJsonMode()) {
-        outputData(dbDetails);
+        outputData(limitedDeployments);
+        return;
+      }
+      if (limitedDeployments.length === 0) {
+        log("");
+        log("No deployments found.");
+        log("");
+        log(
+          `Deploy with: ${colors.dim(`tarout deploy ${appSummary.applicationId.slice(0, 8)}`)}`
+        );
         return;
       }
       log("");
-      log(colors.bold(dbDetails.name));
-      log(colors.dim(dbSummary.id));
-      log("");
-      log(`${colors.bold("Status")}`);
-      log(`  ${getStatusBadge(dbDetails.applicationStatus)}`);
-      log(`  Type: ${getTypeLabel(dbSummary.type)}`);
+      table(
+        ["ID", "STATUS", "TITLE", "CREATED"],
+        limitedDeployments.map((d) => [
+          colors.cyan(d.deploymentId.slice(0, 8)),
+          getStatusBadge(d.status),
+          d.title || colors.dim("-"),
+          formatDate3(d.createdAt)
+        ])
+      );
       log("");
-      log(`${colors.bold("Connection")}`);
-      if (dbSummary.type === "redis") {
-        if (dbDetails.cloudHost) {
-          log(`  Host: ${colors.cyan(dbDetails.cloudHost)}`);
-          log(`  Port: ${dbDetails.cloudPort || 6379}`);
-          if (dbDetails.cloudPassword) {
-            log(`  Password: ${colors.dim("********")}`);
+      log(
+        colors.dim(
+          `${limitedDeployments.length} deployment${limitedDeployments.length === 1 ? "" : "s"}`
+        )
+      );
+    } catch (err) {
+      handleError(err);
+    }
+  });
+  program2.command("deploy:logs").argument("<deployment-id>", "Deployment ID").description("View deployment logs").option(
+    "-f, --follow",
+    "Stream logs in real-time (for running deployments)"
+  ).option("--no-stream", "Fetch logs via HTTP instead of WebSocket").action(async (deploymentId, options) => {
+    try {
+      if (!isLoggedIn()) throw new AuthError();
+      const client2 = getApiClient();
+      const _spinner = startSpinner("Fetching deployment...");
+      let deployment;
+      try {
+        deployment = await client2.deployment.one.query({ deploymentId });
+      } catch {
+        failSpinner();
+        throw new NotFoundError("Deployment", deploymentId);
+      }
+      succeedSpinner();
+      const isRunning = deployment.status === "running";
+      const shouldStream = options.follow || isRunning && options.stream !== false;
+      if (shouldStream && deployment.logPath) {
+        log("");
+        log(
+          colors.dim(
+            `Streaming logs for deployment ${colors.cyan(deployment.deploymentId.slice(0, 8))}...`
+          )
+        );
+        log(colors.dim("Press Ctrl+C to stop"));
+        log("");
+        const logLines = [];
+        const errors = [];
+        let finalStatus = deployment.status;
+        const { cleanup, done } = streamDeploymentLogs(deployment.logPath, {
+          onData: (line) => {
+            logLines.push(line);
+            if (isErrorLine(line)) {
+              errors.push(line);
+            }
+            if (!isJsonMode()) {
+              printLogLine(line);
+            }
+          },
+          onError: (error2) => {
+            if (!isJsonMode()) {
+              log(colors.error(`WebSocket error: ${error2.message}`));
+            }
           }
+        });
+        process.on("SIGINT", () => {
+          cleanup();
+          if (!isJsonMode()) {
+            log("");
+            log(colors.dim("Log streaming stopped"));
+          }
+          process.exit(0);
+        });
+        await done;
+        const finalDeployment = await client2.deployment.one.query({
+          deploymentId
+        });
+        finalStatus = finalDeployment.status;
+        if (isJsonMode()) {
+          const analysis = finalStatus === "error" ? analyzeDeploymentError(logLines, finalDeployment.errorMessage) : void 0;
+          outputData({
+            deploymentId: deployment.deploymentId,
+            status: finalStatus,
+            logs: logLines,
+            errors: errors.length > 0 ? errors : void 0,
+            errorAnalysis: analysis,
+            application: deployment.application
+          });
         } else {
-          log(`  ${colors.dim("Not yet deployed")}`);
+          log("");
+          log(
+            `Final status: ${getStatusBadge(finalStatus)} ${finalStatus === "error" && finalDeployment.errorMessage ? `- ${finalDeployment.errorMessage}` : ""}`
+          );
         }
       } else {
-        if (dbDetails.cloudInstanceId || dbDetails.databaseName) {
-          log(`  Host: ${colors.cyan(dbDetails.cloudHost || "localhost")}`);
-          log(`  Port: ${dbDetails.cloudPort || (dbSummary.type === "postgres" ? 5432 : 3306)}`);
-          log(`  Database: ${dbDetails.cloudDatabaseName || dbDetails.databaseName}`);
-          log(`  Username: ${dbDetails.cloudUsername || dbDetails.databaseUser}`);
-          log(`  Password: ${colors.dim("********")}`);
-        } else {
-          log(`  ${colors.dim("Not yet deployed")}`);
+        const logsResult = await client2.deployment.getDeploymentLogs.query({
+          deploymentId,
+          offset: 0,
+          limit: 5e3
+        });
+        if (isJsonMode()) {
+          const errors = logsResult.lines.filter(isErrorLine);
+          const analysis = deployment.status === "error" ? analyzeDeploymentError(
+            logsResult.lines,
+            deployment.errorMessage
+          ) : void 0;
+          outputData({
+            deploymentId: deployment.deploymentId,
+            status: deployment.status,
+            logs: logsResult.lines,
+            totalLines: logsResult.totalLines,
+            errors: errors.length > 0 ? errors : void 0,
+            errorAnalysis: analysis,
+            application: deployment.application
+          });
+          return;
         }
-      }
-      log("");
-      if (dbDetails.cloudHost || dbDetails.databaseName) {
-        log(`${colors.bold("Connection String")}`);
-        const connStr = getConnectionString(dbSummary.type, dbDetails);
-        log(`  ${colors.cyan(connStr)}`);
+        if (logsResult.lines.length === 0) {
+          log("");
+          log("No logs available for this deployment.");
+          return;
+        }
+        log("");
+        log(
+          colors.dim(
+            `Logs for deployment ${colors.cyan(deployment.deploymentId.slice(0, 8))} (${logsResult.totalLines} lines):`
+          )
+        );
         log("");
+        for (const line of logsResult.lines) {
+          printLogLine(line);
+        }
+        if (logsResult.hasMore) {
+          log("");
+          log(
+            colors.dim(
+              `Showing ${logsResult.lines.length} of ${logsResult.totalLines} lines`
+            )
+          );
+        }
+        log("");
+        log(`Status: ${getStatusBadge(deployment.status)}`);
       }
-      log(`${colors.bold("Created")}`);
-      log(`  ${new Date(dbDetails.createdAt).toLocaleString()}`);
-      log("");
     } catch (err) {
       handleError(err);
     }
   });
-  db.command("connect").argument("<db>", "Database ID or name").description("Open interactive database shell").action(async (dbIdentifier) => {
+}
+function registerLogsCommand(program2) {
+  program2.command("logs").argument("<app>", "Application ID or name").description("View application logs").option(
+    "-l, --level <level>",
+    "Log level (ALL, ERROR, WARN, INFO, DEBUG)",
+    "ALL"
+  ).option("-f, --follow", "Stream logs continuously").option("-n, --limit <number>", "Number of logs to show", "100").option("--since <duration>", "Show logs since (e.g., 1h, 30m, 2d)").action(async (appIdentifier, options) => {
     try {
       if (!isLoggedIn()) throw new AuthError();
       const client2 = getApiClient();
-      const spinner = startSpinner("Connecting to database...");
-      const allDbs = await getAllDatabases(client2);
-      const dbSummary = findDatabase(allDbs, dbIdentifier);
-      if (!dbSummary) {
+      const _spinner = startSpinner("Fetching logs...");
+      const apps = await client2.application.allByOrganization.query();
+      const app = findApp2(apps, appIdentifier);
+      if (!app) {
         failSpinner();
         const suggestions = findSimilar(
-          dbIdentifier,
-          allDbs.map((d) => d.name)
+          appIdentifier,
+          apps.map((a) => a.name)
         );
-        throw new NotFoundError("Database", dbIdentifier, suggestions);
+        throw new NotFoundError("Application", appIdentifier, suggestions);
       }
-      let dbDetails;
-      switch (dbSummary.type) {
-        case "postgres":
-          dbDetails = await client2.postgres.one.query({ postgresId: dbSummary.id });
-          break;
-        case "mysql":
-          dbDetails = await client2.mysql.one.query({ mysqlId: dbSummary.id });
-          break;
-        case "redis":
-          dbDetails = await client2.redis.one.query({ redisId: dbSummary.id });
-          break;
+      let timeRange;
+      if (options.since) {
+        const since = parseDuration(options.since);
+        if (since) {
+          timeRange = {
+            start: new Date(Date.now() - since).toISOString(),
+            end: null
+          };
+        }
       }
+      const logs = await client2.logs.getCloudRunLogs.query({
+        applicationId: app.applicationId,
+        level: options.level.toUpperCase(),
+        limit: Number.parseInt(options.limit, 10),
+        timeRange
+      });
       succeedSpinner();
-      if (!dbDetails.cloudHost && !dbDetails.databaseName) {
-        throw new CliError("Database not deployed yet. Deploy first.", ExitCode.GENERAL_ERROR);
+      if (isJsonMode()) {
+        outputData(logs);
+        return;
+      }
+      if (!logs.entries || logs.entries.length === 0) {
+        log("");
+        log("No logs found.");
+        return;
       }
-      const { command, args, env } = getConnectCommand(dbSummary.type, dbDetails);
-      log("");
-      log(`Connecting to ${colors.bold(dbDetails.name)}...`);
-      log(colors.dim("Press Ctrl+D to exit"));
       log("");
-      const child = spawn(command, args, {
-        stdio: "inherit",
-        env: { ...process.env, ...env }
-      });
-      child.on("exit", (code) => {
-        process.exit(code || 0);
-      });
+      for (const entry of logs.entries) {
+        printLogEntry(entry);
+      }
+      if (options.follow) {
+        log("");
+        log(colors.dim("Streaming logs... (Ctrl+C to stop)"));
+        log("");
+        let lastTimestamp = logs.entries.length > 0 ? new Date(
+          logs.entries[logs.entries.length - 1].timestamp
+        ).getTime() : Date.now();
+        while (true) {
+          await sleep(2e3);
+          const newLogs = await client2.logs.getCloudRunLogs.query({
+            applicationId: app.applicationId,
+            level: options.level.toUpperCase(),
+            limit: 50,
+            timeRange: {
+              start: new Date(lastTimestamp + 1).toISOString(),
+              end: null
+            }
+          });
+          if (newLogs.entries && newLogs.entries.length > 0) {
+            for (const entry of newLogs.entries) {
+              const entryTime = new Date(entry.timestamp).getTime();
+              if (entryTime > lastTimestamp) {
+                printLogEntry(entry);
+                lastTimestamp = entryTime;
+              }
+            }
+          }
+        }
+      }
     } catch (err) {
       handleError(err);
     }
   });
 }
-async function getAllDatabases(client2) {
-  const [postgres, mysql, redis] = await Promise.all([
-    client2.postgres.allByOrganization.query(),
-    client2.mysql.allByOrganization.query(),
-    client2.redis.allByOrganization.query()
-  ]);
-  const databases = [];
-  for (const db of postgres) {
-    databases.push({
-      id: db.postgresId,
-      name: db.name,
-      type: "postgres",
-      status: db.applicationStatus
-    });
-  }
-  for (const db of mysql) {
-    databases.push({
-      id: db.mysqlId,
-      name: db.name,
-      type: "mysql",
-      status: db.applicationStatus
-    });
-  }
-  for (const db of redis) {
-    databases.push({
-      id: db.redisId,
-      name: db.name,
-      type: "redis",
-      status: db.applicationStatus
-    });
-  }
-  return databases;
-}
-function findDatabase(databases, identifier) {
+function findApp2(apps, identifier) {
   const lowerIdentifier = identifier.toLowerCase();
-  return databases.find(
-    (db) => db.id === identifier || db.id.startsWith(identifier) || db.name.toLowerCase() === lowerIdentifier
+  return apps.find(
+    (app) => app.applicationId === identifier || app.applicationId.startsWith(identifier) || app.name.toLowerCase() === lowerIdentifier || app.appName?.toLowerCase() === lowerIdentifier
   );
 }
-function generateSlug2(name) {
-  return name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 63);
-}
-function formatDate4(date) {
+function formatDate3(date) {
   const d = new Date(date);
-  return d.toLocaleDateString("en-US", { month: "short", day: "numeric" });
+  return d.toLocaleString("en-US", {
+    month: "short",
+    day: "numeric",
+    hour: "2-digit",
+    minute: "2-digit"
+  });
 }
-function getTypeLabel(type) {
-  const labels = {
-    postgres: colors.info("PostgreSQL"),
-    mysql: colors.warn("MySQL"),
-    redis: colors.error("Redis")
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function parseDuration(duration) {
+  const match = duration.match(/^(\d+)(s|m|h|d)$/);
+  if (!match) return null;
+  const value = Number.parseInt(match[1], 10);
+  const unit = match[2];
+  const multipliers = {
+    s: 1e3,
+    m: 60 * 1e3,
+    h: 60 * 60 * 1e3,
+    d: 24 * 60 * 60 * 1e3
   };
-  return labels[type] || type;
+  return value * (multipliers[unit] || 0);
 }
-function getConnectionString(type, details) {
-  const host = details.cloudHost || "localhost";
-  const user = details.cloudUsername || details.databaseUser || "user";
-  const dbName = details.cloudDatabaseName || details.databaseName || "db";
-  switch (type) {
-    case "postgres":
-      const pgPort = details.cloudPort || 5432;
-      return `postgresql://${user}:****@${host}:${pgPort}/${dbName}`;
-    case "mysql":
-      const myPort = details.cloudPort || 3306;
-      return `mysql://${user}:****@${host}:${myPort}/${dbName}`;
-    case "redis":
-      const redisPort = details.cloudPort || 6379;
-      return `redis://:****@${host}:${redisPort}`;
-    default:
-      return "";
-  }
+function printLogEntry(entry) {
+  const time = new Date(entry.timestamp);
+  const timeStr = time.toLocaleTimeString("en-US", {
+    hour12: false,
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit"
+  });
+  const levelColors = {
+    ERROR: colors.error,
+    WARN: colors.warn,
+    INFO: colors.info,
+    DEBUG: colors.dim,
+    DEFAULT: colors.dim
+  };
+  const colorFn = levelColors[entry.severity] || levelColors.DEFAULT;
+  const level = entry.severity.padEnd(5);
+  console.log(`${colors.dim(timeStr)}  ${colorFn(level)}  ${entry.message}`);
 }
-function getConnectCommand(type, details) {
-  const host = details.cloudHost || "localhost";
-  const user = details.cloudUsername || details.databaseUser || "user";
-  const password = details.cloudPassword || details.databasePassword || "";
-  const dbName = details.cloudDatabaseName || details.databaseName || "db";
-  switch (type) {
-    case "postgres":
-      return {
-        command: "psql",
-        args: [
-          "-h",
-          host,
-          "-p",
-          String(details.cloudPort || 5432),
-          "-U",
-          user,
-          "-d",
-          dbName
-        ],
-        env: { PGPASSWORD: password }
-      };
-    case "mysql":
-      return {
-        command: "mysql",
-        args: [
-          "-h",
-          host,
-          "-P",
-          String(details.cloudPort || 3306),
-          "-u",
-          user,
-          `-p${password}`,
-          dbName
-        ],
-        env: {}
-      };
-    case "redis":
-      return {
-        command: "redis-cli",
-        args: [
-          "-h",
-          host,
-          "-p",
-          String(details.cloudPort || 6379),
-          ...password ? ["-a", password] : []
-        ],
-        env: {}
-      };
-    default:
-      throw new CliError(`Unsupported database type: ${type}`, ExitCode.INVALID_ARGUMENTS);
+async function streamDeploymentWithLogs(client2, deploymentId, appName, applicationId) {
+  stopSpinner();
+  let deployment;
+  try {
+    deployment = await client2.deployment.one.query({ deploymentId });
+  } catch {
+    throw new NotFoundError("Deployment", deploymentId);
+  }
+  const logLines = [];
+  const errors = [];
+  const startTime = Date.now();
+  let wsConnected = false;
+  let lastStatus = deployment.status;
+  if (!isJsonMode()) {
+    log("");
+    log(
+      `${colors.bold(appName)} - Deployment ${colors.cyan(deploymentId.slice(0, 8))}`
+    );
+    log(colors.dim("\u2500".repeat(50)));
+    log("");
+  }
+  let cleanup = null;
+  if (deployment.logPath) {
+    const stream = streamDeploymentLogs(deployment.logPath, {
+      onData: (line) => {
+        logLines.push(line);
+        if (isErrorLine(line)) {
+          errors.push(line);
+        }
+        if (!isJsonMode()) {
+          printLogLine(line);
+        }
+      },
+      onOpen: () => {
+        wsConnected = true;
+      },
+      onError: () => {
+        if (!isJsonMode() && wsConnected) {
+          log(colors.dim("[WebSocket reconnecting...]"));
+        }
+      }
+    });
+    cleanup = stream.cleanup;
+  }
+  const maxWaitMs = 6e5;
+  const pollIntervalMs = 3e3;
+  try {
+    while (Date.now() - startTime < maxWaitMs) {
+      await sleep(pollIntervalMs);
+      const updatedDeployment = await client2.deployment.one.query({
+        deploymentId
+      });
+      lastStatus = updatedDeployment.status;
+      if (lastStatus === "done") {
+        await sleep(500);
+        cleanup?.();
+        const finalApp = await client2.application.one.query({ applicationId });
+        const duration2 = Math.round((Date.now() - startTime) / 1e3);
+        if (isJsonMode()) {
+          outputData({
+            success: true,
+            data: {
+              deploymentId,
+              status: "done",
+              url: finalApp.cloudServiceUrl,
+              duration: duration2,
+              logs: logLines
+            }
+          });
+        } else {
+          log("");
+          log(colors.dim("\u2500".repeat(50)));
+          log(colors.success("\u2713 Deployment successful!"));
+          log("");
+          log(`URL: ${colors.cyan(finalApp.cloudServiceUrl || "Pending...")}`);
+          log(`Duration: ${colors.dim(`${duration2}s`)}`);
+          log("");
+        }
+        return;
+      }
+      if (lastStatus === "error" || lastStatus === "cancelled") {
+        cleanup?.();
+        const errorAnalysis = analyzeDeploymentError(
+          logLines,
+          updatedDeployment.errorMessage
+        );
+        const duration2 = Math.round((Date.now() - startTime) / 1e3);
+        if (isJsonMode()) {
+          outputData({
+            success: false,
+            error: {
+              code: errorAnalysis.category === "build_script" || errorAnalysis.category === "npm_install" || errorAnalysis.category === "typescript" ? "BUILD_FAILED" : "DEPLOYMENT_FAILED",
+              message: updatedDeployment.errorMessage || "Deployment failed",
+              deploymentId,
+              duration: duration2,
+              logs: logLines,
+              errors: errors.length > 0 ? errors : void 0,
+              errorAnalysis
+            }
+          });
+        } else {
+          log("");
+          log(colors.dim("\u2500".repeat(50)));
+          log(colors.error("\u2717 Deployment failed"));
+          log("");
+          if (updatedDeployment.errorMessage) {
+            log(`Error: ${colors.error(updatedDeployment.errorMessage)}`);
+          }
+          if (errorAnalysis.category !== "unknown") {
+            log("");
+            log(colors.bold("Error Analysis:"));
+            log(`  Category: ${errorAnalysis.category}`);
+            log(`  Type: ${errorAnalysis.type}`);
+            log("");
+            log(colors.bold("Possible Causes:"));
+            for (const cause of errorAnalysis.possibleCauses.slice(0, 3)) {
+              log(`  \u2022 ${cause}`);
+            }
+            log("");
+            log(colors.bold("Suggested Fixes:"));
+            for (const fix of errorAnalysis.suggestedFixes.slice(0, 3)) {
+              log(`  \u2022 ${fix}`);
+            }
+          }
+          log("");
+        }
+        if (errorAnalysis.category === "build_script" || errorAnalysis.category === "npm_install" || errorAnalysis.category === "typescript" || errorAnalysis.category === "docker_build") {
+          throw new BuildFailedError(
+            updatedDeployment.errorMessage || "Build failed",
+            deploymentId,
+            errorAnalysis
+          );
+        }
+        throw new DeploymentFailedError(
+          updatedDeployment.errorMessage || "Deployment failed",
+          deploymentId,
+          errorAnalysis
+        );
+      }
+    }
+    cleanup?.();
+    const duration = Math.round((Date.now() - startTime) / 1e3);
+    if (isJsonMode()) {
+      outputData({
+        success: false,
+        error: {
+          code: "DEPLOYMENT_TIMEOUT",
+          message: "Deployment timed out",
+          deploymentId,
+          duration,
+          logs: logLines,
+          errors: errors.length > 0 ? errors : void 0
+        }
+      });
+    } else {
+      log("");
+      log(colors.dim("\u2500".repeat(50)));
+      log(colors.warn("\u26A0 Deployment timed out"));
+      log("");
+      log(
+        `The deployment is still running. Check status with: ${colors.dim(`tarout deploy:status ${applicationId.slice(0, 8)}`)}`
+      );
+      log("");
+    }
+    throw new DeploymentTimeoutError(
+      "Deployment timed out after 10 minutes",
+      deploymentId
+    );
+  } finally {
+    cleanup?.();
+  }
+}
+function isErrorLine(line) {
+  const errorPatterns = [
+    /error/i,
+    /ERR!/i,
+    /failed/i,
+    /fatal/i,
+    /exception/i,
+    /ENOENT/i,
+    /EACCES/i,
+    /EPERM/i
+  ];
+  return errorPatterns.some((pattern) => pattern.test(line));
+}
+function printLogLine(line) {
+  if (isErrorLine(line)) {
+    console.log(colors.error(line));
+  } else if (/warn/i.test(line)) {
+    console.log(colors.warn(line));
+  } else if (/step|stage|building|installing|deploying/i.test(line)) {
+    console.log(colors.info(line));
+  } else {
+    console.log(line);
   }
 }
 
@@ -1925,11 +2403,11 @@ function registerDomainsCommands(program2) {
     try {
       if (!isLoggedIn()) throw new AuthError();
       const client2 = getApiClient();
-      const spinner = startSpinner("Fetching domains...");
+      const _spinner = startSpinner("Fetching domains...");
       let domainsList;
       if (appIdentifier) {
         const apps = await client2.application.allByOrganization.query();
-        const app = findApp4(apps, appIdentifier);
+        const app = findApp3(apps, appIdentifier);
         if (!app) {
           failSpinner();
           const suggestions = findSimilar(
@@ -1955,7 +2433,9 @@ function registerDomainsCommands(program2) {
         log("");
         log("No domains found.");
         log("");
-        log(`Add one with: ${colors.dim("tarout domains add <app> <domain>")}`);
+        log(
+          `Add one with: ${colors.dim("tarout domains add <app> <domain>")}`
+        );
         return;
       }
       log("");
@@ -1969,7 +2449,11 @@ function registerDomainsCommands(program2) {
         ])
       );
       log("");
-      log(colors.dim(`${domainsList.length} domain${domainsList.length === 1 ? "" : "s"}`));
+      log(
+        colors.dim(
+          `${domainsList.length} domain${domainsList.length === 1 ? "" : "s"}`
+        )
+      );
     } catch (err) {
       handleError(err);
     }
@@ -1983,9 +2467,9 @@ function registerDomainsCommands(program2) {
         );
       }
       const client2 = getApiClient();
-      const spinner = startSpinner("Finding application...");
+      const _spinner = startSpinner("Finding application...");
       const apps = await client2.application.allByOrganization.query();
-      const app = findApp4(apps, appIdentifier);
+      const app = findApp3(apps, appIdentifier);
       if (!app) {
         failSpinner();
         const suggestions = findSimilar(
@@ -2012,8 +2496,10 @@ function registerDomainsCommands(program2) {
       ]);
       if (!domain.isVerified) {
         log("Next steps:");
-        log(`  1. Add DNS record pointing to your app`);
-        log(`  2. Verify: ${colors.dim(`tarout domains verify ${domain.domainId.slice(0, 8)}`)}`);
+        log("  1. Add DNS record pointing to your app");
+        log(
+          `  2. Verify: ${colors.dim(`tarout domains verify ${domain.domainId.slice(0, 8)}`)}`
+        );
         log("");
       }
     } catch (err) {
@@ -2024,8 +2510,10 @@ function registerDomainsCommands(program2) {
     try {
       if (!isLoggedIn()) throw new AuthError();
       const client2 = getApiClient();
-      const spinner = startSpinner("Finding domain...");
-      const allDomains = await client2.domain.all.query({ includeUnlinked: true });
+      const _spinner = startSpinner("Finding domain...");
+      const allDomains = await client2.domain.all.query({
+        includeUnlinked: true
+      });
       const domain = findDomain(allDomains, domainIdentifier);
       if (!domain) {
         failSpinner();
@@ -2052,7 +2540,7 @@ function registerDomainsCommands(program2) {
           return;
         }
       }
-      const deleteSpinner = startSpinner("Removing domain...");
+      const _deleteSpinner = startSpinner("Removing domain...");
       await client2.domain.delete.mutate({
         domainId: domain.domainId
       });
@@ -2070,8 +2558,10 @@ function registerDomainsCommands(program2) {
     try {
       if (!isLoggedIn()) throw new AuthError();
       const client2 = getApiClient();
-      const spinner = startSpinner("Finding domain...");
-      const allDomains = await client2.domain.all.query({ includeUnlinked: true });
+      const _spinner = startSpinner("Finding domain...");
+      const allDomains = await client2.domain.all.query({
+        includeUnlinked: true
+      });
       const domain = findDomain(allDomains, domainIdentifier);
       if (!domain) {
         failSpinner();
@@ -2116,7 +2606,7 @@ function registerDomainsCommands(program2) {
     }
   });
 }
-function findApp4(apps, identifier) {
+function findApp3(apps, identifier) {
   const lowerIdentifier = identifier.toLowerCase();
   return apps.find(
     (app) => app.applicationId === identifier || app.applicationId.startsWith(identifier) || app.name.toLowerCase() === lowerIdentifier || app.appName?.toLowerCase() === lowerIdentifier
@@ -2138,6 +2628,250 @@ function updateSpinner2(text) {
   });
 }
 
+// src/commands/env.ts
+import { existsSync, readFileSync, writeFileSync } from "fs";
+function registerEnvCommands(program2) {
+  const env = program2.command("env").argument("<app>", "Application ID or name").description("Manage environment variables");
+  env.command("list").alias("ls").description("List all environment variables").option("--reveal", "Show actual values (not masked)").action(async (options, command) => {
+    try {
+      if (!isLoggedIn()) throw new AuthError();
+      const appIdentifier = command.parent.args[0];
+      const client2 = getApiClient();
+      const _spinner = startSpinner("Fetching environment variables...");
+      const apps = await client2.application.allByOrganization.query();
+      const app = findApp4(apps, appIdentifier);
+      if (!app) {
+        failSpinner();
+        const suggestions = findSimilar(
+          appIdentifier,
+          apps.map((a) => a.name)
+        );
+        throw new NotFoundError("Application", appIdentifier, suggestions);
+      }
+      const variables = await client2.envVariable.list.query({
+        applicationId: app.applicationId,
+        includeValues: options.reveal || false
+      });
+      succeedSpinner();
+      if (isJsonMode()) {
+        outputData(variables);
+        return;
+      }
+      if (variables.length === 0) {
+        log("");
+        log("No environment variables found.");
+        log("");
+        log(
+          `Set one with: ${colors.dim(`tarout env ${app.name} set KEY=value`)}`
+        );
+        return;
+      }
+      log("");
+      table(
+        ["KEY", "VALUE", "SECRET", "UPDATED"],
+        variables.map((v) => [
+          colors.cyan(v.key),
+          options.reveal ? v.value || colors.dim("-") : maskValue(v.value),
+          v.isSecret ? colors.warn("Yes") : "No",
+          formatDate4(v.updatedAt)
+        ])
+      );
+      log("");
+      log(
+        colors.dim(
+          `${variables.length} variable${variables.length === 1 ? "" : "s"}`
+        )
+      );
+    } catch (err) {
+      handleError(err);
+    }
+  });
+  env.command("set").argument("<key=value>", "Variable to set (KEY=value format)").description("Set an environment variable").option("-s, --secret", "Mark as secret (default)", true).option("--no-secret", "Mark as non-secret").action(async (keyValue, options, command) => {
+    try {
+      if (!isLoggedIn()) throw new AuthError();
+      const appIdentifier = command.parent.parent.args[0];
+      const eqIndex = keyValue.indexOf("=");
+      if (eqIndex === -1) {
+        throw new InvalidArgumentError(
+          "Invalid format. Use KEY=value (e.g., API_KEY=secret123)"
+        );
+      }
+      const key = keyValue.slice(0, eqIndex);
+      const value = keyValue.slice(eqIndex + 1);
+      if (!key) {
+        throw new InvalidArgumentError("Key cannot be empty");
+      }
+      const client2 = getApiClient();
+      const _spinner = startSpinner("Setting environment variable...");
+      const apps = await client2.application.allByOrganization.query();
+      const app = findApp4(apps, appIdentifier);
+      if (!app) {
+        failSpinner();
+        const suggestions = findSimilar(
+          appIdentifier,
+          apps.map((a) => a.name)
+        );
+        throw new NotFoundError("Application", appIdentifier, suggestions);
+      }
+      const existing = await client2.envVariable.list.query({
+        applicationId: app.applicationId,
+        includeValues: false
+      });
+      const existingVar = existing.find((v) => v.key === key);
+      if (existingVar) {
+        await client2.envVariable.update.mutate({
+          applicationId: app.applicationId,
+          key,
+          value,
+          isSecret: options.secret
+        });
+      } else {
+        await client2.envVariable.create.mutate({
+          applicationId: app.applicationId,
+          key,
+          value,
+          isSecret: options.secret
+        });
+      }
+      succeedSpinner(`Set ${key}`);
+      if (isJsonMode()) {
+        outputData({ key, updated: !!existingVar });
+      } else {
+        quietOutput(key);
+      }
+    } catch (err) {
+      handleError(err);
+    }
+  });
+  env.command("unset").argument("<key>", "Variable key to remove").description("Remove an environment variable").action(async (key, _options, command) => {
+    try {
+      if (!isLoggedIn()) throw new AuthError();
+      const appIdentifier = command.parent.parent.args[0];
+      const client2 = getApiClient();
+      const _spinner = startSpinner("Removing environment variable...");
+      const apps = await client2.application.allByOrganization.query();
+      const app = findApp4(apps, appIdentifier);
+      if (!app) {
+        failSpinner();
+        const suggestions = findSimilar(
+          appIdentifier,
+          apps.map((a) => a.name)
+        );
+        throw new NotFoundError("Application", appIdentifier, suggestions);
+      }
+      await client2.envVariable.delete.mutate({
+        applicationId: app.applicationId,
+        key
+      });
+      succeedSpinner(`Removed ${key}`);
+      if (isJsonMode()) {
+        outputData({ key, deleted: true });
+      } else {
+        quietOutput(key);
+      }
+    } catch (err) {
+      handleError(err);
+    }
+  });
+  env.command("pull").description("Download environment variables as .env file").option("-o, --output <file>", "Output file path", ".env").option("--reveal", "Include actual secret values").action(async (options, command) => {
+    try {
+      if (!isLoggedIn()) throw new AuthError();
+      const appIdentifier = command.parent.parent.args[0];
+      const client2 = getApiClient();
+      const _spinner = startSpinner("Downloading environment variables...");
+      const apps = await client2.application.allByOrganization.query();
+      const app = findApp4(apps, appIdentifier);
+      if (!app) {
+        failSpinner();
+        const suggestions = findSimilar(
+          appIdentifier,
+          apps.map((a) => a.name)
+        );
+        throw new NotFoundError("Application", appIdentifier, suggestions);
+      }
+      if (existsSync(options.output) && !shouldSkipConfirmation()) {
+        succeedSpinner();
+        const confirmed = await confirm(
+          `File ${options.output} already exists. Overwrite?`,
+          false
+        );
+        if (!confirmed) {
+          log("Cancelled.");
+          return;
+        }
+      }
+      const result = await client2.envVariable.export.query({
+        applicationId: app.applicationId,
+        format: "dotenv",
+        maskSecrets: !options.reveal
+      });
+      writeFileSync(options.output, result.content);
+      succeedSpinner(`Saved to ${options.output}`);
+      if (isJsonMode()) {
+        outputData({ file: options.output, content: result.content });
+      } else {
+        quietOutput(options.output);
+      }
+    } catch (err) {
+      handleError(err);
+    }
+  });
+  env.command("push").description("Upload environment variables from .env file").option("-i, --input <file>", "Input file path", ".env").option("--replace", "Replace all existing variables (default: merge)").action(async (options, command) => {
+    try {
+      if (!isLoggedIn()) throw new AuthError();
+      const appIdentifier = command.parent.parent.args[0];
+      if (!existsSync(options.input)) {
+        throw new InvalidArgumentError(`File not found: ${options.input}`);
+      }
+      const content = readFileSync(options.input, "utf-8");
+      const client2 = getApiClient();
+      const _spinner = startSpinner("Uploading environment variables...");
+      const apps = await client2.application.allByOrganization.query();
+      const app = findApp4(apps, appIdentifier);
+      if (!app) {
+        failSpinner();
+        const suggestions = findSimilar(
+          appIdentifier,
+          apps.map((a) => a.name)
+        );
+        throw new NotFoundError("Application", appIdentifier, suggestions);
+      }
+      const result = await client2.envVariable.import.mutate({
+        applicationId: app.applicationId,
+        content,
+        format: "dotenv",
+        merge: !options.replace
+      });
+      succeedSpinner(`Imported ${result.imported} variables`);
+      if (isJsonMode()) {
+        outputData(result);
+      } else {
+        quietOutput(String(result.imported));
+        if (result.skipped > 0) {
+          log(colors.dim(`Skipped ${result.skipped} (already exist)`));
+        }
+      }
+    } catch (err) {
+      handleError(err);
+    }
+  });
+}
+function findApp4(apps, identifier) {
+  const lowerIdentifier = identifier.toLowerCase();
+  return apps.find(
+    (app) => app.applicationId === identifier || app.applicationId.startsWith(identifier) || app.name.toLowerCase() === lowerIdentifier || app.appName?.toLowerCase() === lowerIdentifier
+  );
+}
+function maskValue(value) {
+  if (!value) return colors.dim("-");
+  if (value.length <= 4) return "****";
+  return `${value.slice(0, 2)}****${value.slice(-2)}`;
+}
+function formatDate4(date) {
+  const d = new Date(date);
+  return d.toLocaleDateString("en-US", { month: "short", day: "numeric" });
+}
+
 // src/commands/orgs.ts
 function registerOrgsCommands(program2) {
   const orgs = program2.command("orgs").description("Manage organizations");
@@ -2146,7 +2880,7 @@ function registerOrgsCommands(program2) {
       if (!isLoggedIn()) throw new AuthError();
       const client2 = getApiClient();
       const profile = getCurrentProfile();
-      const spinner = startSpinner("Fetching organizations...");
+      const _spinner = startSpinner("Fetching organizations...");
       const organizations = await client2.organization.all.query();
       succeedSpinner();
       if (isJsonMode()) {
@@ -2168,7 +2902,11 @@ function registerOrgsCommands(program2) {
         ])
       );
       log("");
-      log(colors.dim(`${organizations.length} organization${organizations.length === 1 ? "" : "s"}`));
+      log(
+        colors.dim(
+          `${organizations.length} organization${organizations.length === 1 ? "" : "s"}`
+        )
+      );
       log("");
       log(`Current: ${colors.bold(profile?.organizationName || "None")}`);
     } catch (err) {
@@ -2179,7 +2917,7 @@ function registerOrgsCommands(program2) {
     try {
       if (!isLoggedIn()) throw new AuthError();
       const client2 = getApiClient();
-      const spinner = startSpinner("Switching organization...");
+      const _spinner = startSpinner("Switching organization...");
       const organizations = await client2.organization.all.query();
       const org = findOrg(organizations, orgIdentifier);
       if (!org) {
@@ -2225,7 +2963,7 @@ function registerEnvsCommands(program2) {
       if (!isLoggedIn()) throw new AuthError();
       const client2 = getApiClient();
       const profile = getCurrentProfile();
-      const spinner = startSpinner("Fetching environments...");
+      const _spinner = startSpinner("Fetching environments...");
       const environments = await client2.environment.all.query();
       succeedSpinner();
       if (isJsonMode()) {
@@ -2256,7 +2994,7 @@ function registerEnvsCommands(program2) {
     try {
       if (!isLoggedIn()) throw new AuthError();
       const client2 = getApiClient();
-      const spinner = startSpinner("Switching environment...");
+      const _spinner = startSpinner("Switching environment...");
       const environments = await client2.environment.all.query();
       const env = findEnv(environments, envIdentifier);
       if (!env) {
@@ -2303,7 +3041,7 @@ function findEnv(envs, identifier) {
 
 // src/index.ts
 var program = new Command();
-program.name("tarout").description("Tarout PaaS Command Line Interface").version("0.1.2").option("--json", "Output as JSON (machine-readable)").option("-y, --yes", "Skip all confirmation prompts").option("-q, --quiet", "Minimal output").option("-v, --verbose", "Extra debug information").option("--no-color", "Disable colored output").hook("preAction", (thisCommand) => {
+program.name("tarout").description("Tarout PaaS Command Line Interface").version("0.1.3").option("--json", "Output as JSON (machine-readable)").option("-y, --yes", "Skip all confirmation prompts").option("-q, --quiet", "Minimal output").option("-v, --verbose", "Extra debug information").option("--no-color", "Disable colored output").hook("preAction", (thisCommand) => {
   const opts = thisCommand.opts();
   setGlobalOptions({
     json: opts.json || false,