chirag-appwrite-cli 0.2.1 → 0.3.0

package/lib/commands/push.ts

@@ -1,9 +1,11 @@
 import fs from "fs";
+import path from "path";
 import { parse as parseDotenv } from "dotenv";
 import chalk from "chalk";
 import inquirer from "inquirer";
 import { Command } from "commander";
 import ID from "../id.js";
+import { EXECUTABLE_NAME } from "../constants.js";
 import {
   localConfig,
   globalConfig,
@@ -15,7 +17,8 @@ import {
   KeysCollection,
   KeysTable,
 } from "../config.js";
-import type { SettingsType, ConfigType } from "./config.js";
+import { ConfigSchema, type SettingsType, type ConfigType } from "./config.js";
+import { parseWithBetterErrors } from "./utils/error-formatter.js";
 import { createSettingsObject } from "../utils.js";
 import { Spinner, SPINNER_DOTS } from "../spinner.js";
 import { paginate } from "../paginate.js";
@@ -24,7 +27,9 @@ import {
   questionsPushBuckets,
   questionsPushTeams,
   questionsPushFunctions,
+  questionsPushFunctionsCode,
   questionsPushSites,
+  questionsPushSitesCode,
   questionsGetEntrypoint,
   questionsPushCollections,
   questionsPushTables,
@@ -74,6 +79,7 @@ import { checkAndApplyTablesDBChanges } from "./utils/database-sync.js";
 
 const POLL_DEBOUNCE = 2000; // Milliseconds
 const POLL_DEFAULT_VALUE = 30;
+const DEPLOYMENT_TIMEOUT_MS = 10 * 60 * 1000; // 10 minutes
 
 export interface PushOptions {
   all?: boolean;
@@ -86,6 +92,7 @@ export interface PushOptions {
   teams?: boolean;
   topics?: boolean;
   skipDeprecated?: boolean;
+  skipConfirmation?: boolean;
   functionOptions?: {
     async?: boolean;
     code?: boolean;
@@ -96,6 +103,9 @@ export interface PushOptions {
     code?: boolean;
     withVariables?: boolean;
   };
+  tableOptions?: {
+    attempts?: number;
+  };
 }
 
 interface PushSiteOptions {
@@ -114,15 +124,54 @@ interface PushFunctionOptions {
 
 interface PushTableOptions {
   attempts?: number;
+  skipConfirmation?: boolean;
 }
 
 export class Push {
   private projectClient: Client;
   private consoleClient: Client;
+  private silent: boolean;
 
-  constructor(projectClient: Client, consoleClient: Client) {
+  constructor(projectClient: Client, consoleClient: Client, silent = false) {
     this.projectClient = projectClient;
     this.consoleClient = consoleClient;
+    this.silent = silent;
+  }
+
+  /**
+   * Log a message (respects silent mode)
+   */
+  private log(message: string): void {
+    if (!this.silent) {
+      log(message);
+    }
+  }
+
+  /**
+   * Log a success message (respects silent mode)
+   */
+  private success(message: string): void {
+    if (!this.silent) {
+      success(message);
+    }
+  }
+
+  /**
+   * Log a warning message (respects silent mode)
+   */
+  private warn(message: string): void {
+    if (!this.silent) {
+      warn(message);
+    }
+  }
+
+  /**
+   * Log an error message (respects silent mode)
+   */
+  private error(message: string): void {
+    if (!this.silent) {
+      error(message);
+    }
   }
 
   public async pushResources(
@@ -143,12 +192,15 @@ export class Push {
       (config.projectName || config.settings)
     ) {
       try {
-        log("Pushing settings ...");
+        this.log("Pushing settings ...");
         await this.pushSettings({
           projectId: config.projectId,
           projectName: config.projectName,
           settings: config.settings,
         });
+        this.success(
+          `Successfully pushed ${chalk.bold("all")} project settings.`,
+        );
         results.settings = { success: true };
       } catch (e: any) {
         allErrors.push(e);
@@ -163,8 +215,11 @@ export class Push {
       config.buckets.length > 0
     ) {
       try {
-        log("Pushing buckets ...");
+        this.log("Pushing buckets ...");
         const result = await this.pushBuckets(config.buckets);
+        this.success(
+          `Successfully pushed ${chalk.bold(result.successfullyPushed)} buckets.`,
+        );
         results.buckets = result;
         allErrors.push(...result.errors);
       } catch (e: any) {
@@ -180,8 +235,11 @@ export class Push {
       config.teams.length > 0
     ) {
       try {
-        log("Pushing teams ...");
+        this.log("Pushing teams ...");
         const result = await this.pushTeams(config.teams);
+        this.success(
+          `Successfully pushed ${chalk.bold(result.successfullyPushed)} teams.`,
+        );
         results.teams = result;
         allErrors.push(...result.errors);
       } catch (e: any) {
@@ -197,8 +255,11 @@ export class Push {
       config.topics.length > 0
     ) {
       try {
-        log("Pushing topics ...");
+        this.log("Pushing topics ...");
         const result = await this.pushMessagingTopics(config.topics);
+        this.success(
+          `Successfully pushed ${chalk.bold(result.successfullyPushed)} topics.`,
+        );
         results.topics = result;
         allErrors.push(...result.errors);
       } catch (e: any) {
@@ -214,11 +275,14 @@ export class Push {
       config.functions.length > 0
     ) {
       try {
-        log("Pushing functions ...");
+        this.log("Pushing functions ...");
         const result = await this.pushFunctions(
           config.functions,
           options.functionOptions,
         );
+        this.success(
+          `Successfully pushed ${chalk.bold(result.successfullyPushed)} functions.`,
+        );
         results.functions = result;
         allErrors.push(...result.errors);
       } catch (e: any) {
@@ -239,8 +303,11 @@ export class Push {
       config.sites.length > 0
     ) {
       try {
-        log("Pushing sites ...");
+        this.log("Pushing sites ...");
         const result = await this.pushSites(config.sites, options.siteOptions);
+        this.success(
+          `Successfully pushed ${chalk.bold(result.successfullyPushed)} sites.`,
+        );
         results.sites = result;
         allErrors.push(...result.errors);
       } catch (e: any) {
@@ -261,8 +328,14 @@ export class Push {
       config.tables.length > 0
     ) {
       try {
-        log("Pushing tables ...");
-        const result = await this.pushTables(config.tables);
+        this.log("Pushing tables ...");
+        const result = await this.pushTables(config.tables, {
+          attempts: options.tableOptions?.attempts,
+          skipConfirmation: options.skipConfirmation,
+        });
+        this.success(
+          `Successfully pushed ${chalk.bold(result.successfullyPushed)} tables.`,
+        );
         results.tables = result;
         allErrors.push(...result.errors);
       } catch (e: any) {
@@ -271,15 +344,14 @@ export class Push {
       }
     }
 
-    // Push collections (unless skipDeprecated is true)
+    // Push collections (skipDeprecated only applies when pushing all, explicit collections option takes precedence)
     if (
-      !skipDeprecated &&
-      (shouldPushAll || options.collections) &&
+      (options.collections || (shouldPushAll && !skipDeprecated)) &&
       config.collections &&
       config.collections.length > 0
     ) {
       try {
-        log("Pushing collections ...");
+        this.log("Pushing collections ...");
         // Add database names to collections
         const collectionsWithDbNames = config.collections.map(
           (collection: any) => {
@@ -292,7 +364,12 @@ export class Push {
             };
           },
         );
-        const result = await this.pushCollections(collectionsWithDbNames);
+        const result = await this.pushCollections(collectionsWithDbNames, {
+          skipConfirmation: options.skipConfirmation,
+        });
+        this.success(
+          `Successfully pushed ${chalk.bold(result.successfullyPushed)} collections.`,
+        );
         results.collections = result;
         allErrors.push(...result.errors);
       } catch (e: any) {
@@ -318,6 +395,7 @@ export class Push {
     const settings = config.settings ?? {};
 
     if (projectName) {
+      this.log("Applying project name ...");
       await projectsService.update({
         projectId: projectId,
         name: projectName,
@@ -325,6 +403,7 @@ export class Push {
     }
 
     if (settings.services) {
+      this.log("Applying service statuses ...");
       for (let [service, status] of Object.entries(settings.services)) {
         await projectsService.updateServiceStatus({
           projectId: projectId,
@@ -336,17 +415,18 @@ export class Push {
 
     if (settings.auth) {
       if (settings.auth.security) {
+        this.log("Applying auth security settings ...");
         await projectsService.updateAuthDuration({
           projectId,
-          duration: settings.auth.security.duration,
+          duration: Number(settings.auth.security.duration),
         });
         await projectsService.updateAuthLimit({
           projectId,
-          limit: settings.auth.security.limit,
+          limit: Number(settings.auth.security.limit),
         });
         await projectsService.updateAuthSessionsLimit({
           projectId,
-          limit: settings.auth.security.sessionsLimit,
+          limit: Number(settings.auth.security.sessionsLimit),
         });
         await projectsService.updateAuthPasswordDictionary({
           projectId,
@@ -354,7 +434,7 @@ export class Push {
         });
         await projectsService.updateAuthPasswordHistory({
           projectId,
-          limit: settings.auth.security.passwordHistory,
+          limit: Number(settings.auth.security.passwordHistory),
         });
         await projectsService.updatePersonalDataCheck({
           projectId,
@@ -371,6 +451,7 @@ export class Push {
       }
 
       if (settings.auth.methods) {
+        this.log("Applying auth methods statuses ...");
         for (let [method, status] of Object.entries(settings.auth.methods)) {
           await projectsService.updateAuthStatus({
             projectId,
@@ -391,7 +472,7 @@ export class Push {
 
     for (const bucket of buckets) {
       try {
-        log(`Pushing bucket ${chalk.bold(bucket["name"])} ...`);
+        this.log(`Pushing bucket ${chalk.bold(bucket["name"])} ...`);
         const storageService = await getStorageService(this.projectClient);
 
         try {
@@ -430,7 +511,7 @@ export class Push {
         successfullyPushed++;
       } catch (e: any) {
         errors.push(e);
-        error(`Failed to push bucket ${bucket["name"]}: ${e.message}`);
+        this.error(`Failed to push bucket ${bucket["name"]}: ${e.message}`);
       }
     }
 
@@ -449,7 +530,7 @@ export class Push {
 
     for (const team of teams) {
       try {
-        log(`Pushing team ${chalk.bold(team["name"])} ...`);
+        this.log(`Pushing team ${chalk.bold(team["name"])} ...`);
         const teamsService = await getTeamsService(this.projectClient);
 
         try {
@@ -472,7 +553,7 @@ export class Push {
         successfullyPushed++;
       } catch (e: any) {
         errors.push(e);
-        error(`Failed to push team ${team["name"]}: ${e.message}`);
+        this.error(`Failed to push team ${team["name"]}: ${e.message}`);
       }
     }
 
@@ -491,7 +572,7 @@ export class Push {
 
     for (const topic of topics) {
       try {
-        log(`Pushing topic ${chalk.bold(topic["name"])} ...`);
+        this.log(`Pushing topic ${chalk.bold(topic["name"])} ...`);
         const messagingService = await getMessagingService(this.projectClient);
 
         try {
@@ -513,11 +594,11 @@ export class Push {
           }
         }
 
-        success(`Created ${topic.name} ( ${topic["$id"]} )`);
+        this.success(`Pushed ${topic.name} ( ${topic["$id"]} )`);
         successfullyPushed++;
       } catch (e: any) {
         errors.push(e);
-        error(`Failed to push topic ${topic["name"]}: ${e.message}`);
+        this.error(`Failed to push topic ${topic["name"]}: ${e.message}`);
       }
     }
 
@@ -632,21 +713,21 @@ export class Push {
             let domain = "";
             try {
               const consoleService = await getConsoleService(
-                this.projectClient,
+                this.consoleClient,
               );
               const variables = await consoleService.variables();
               domain = ID.unique() + "." + variables["_APP_DOMAIN_FUNCTIONS"];
-            } catch (error) {
-              console.error("Error fetching console variables.");
-              throw error;
+            } catch (err) {
+              this.error("Error fetching console variables.");
+              throw err;
             }
 
             try {
               const proxyService = await getProxyService(this.projectClient);
               await proxyService.createFunctionRule(domain, func.$id);
-            } catch (error) {
-              console.error("Error creating function rule.");
-              throw error;
+            } catch (err) {
+              this.error("Error creating function rule.");
+              throw err;
             }
 
             updaterRow.update({ status: "Created" });
@@ -730,6 +811,29 @@ export class Push {
           return;
         }
 
+        if (!func.path) {
+          errors.push(
+            new Error(`Function '${func.name}' has no path configured`),
+          );
+          updaterRow.fail({
+            errorMessage: `No path configured for function`,
+          });
+          return;
+        }
+
+        if (
+          !fs.existsSync(func.path) ||
+          fs.readdirSync(func.path).length === 0
+        ) {
+          errors.push(
+            new Error(`Deployment not found or empty at path: ${func.path}`),
+          );
+          updaterRow.fail({
+            errorMessage: `path not found or empty: ${path.relative(process.cwd(), path.resolve(func.path))}`,
+          });
+          return;
+        }
+
         try {
           updaterRow.update({ status: "Pushing" }).replaceSpinner(SPINNER_DOTS);
           const functionsServiceDeploy = await getFunctionsService(
@@ -761,7 +865,7 @@ export class Push {
           switch (e.code) {
             case "ENOENT":
               updaterRow.fail({
-                errorMessage: "Not found in the current directory. Skipping...",
+                errorMessage: `Deployment not found at path: ${path.resolve(func.path)}`,
               });
               break;
             default:
@@ -780,7 +884,21 @@ export class Push {
               end: "Checking deployment status...",
             });
 
+            const timeoutDeadline = Date.now() + DEPLOYMENT_TIMEOUT_MS;
+
             while (true) {
+              if (Date.now() > timeoutDeadline) {
+                failedDeployments.push({
+                  name: func["name"],
+                  $id: func["$id"],
+                  deployment: deploymentId,
+                });
+                updaterRow.fail({
+                  errorMessage: "Deployment timed out after 10 minutes",
+                });
+                break;
+              }
+
               const functionsServicePoll = await getFunctionsService(
                 this.projectClient,
               );
@@ -830,7 +948,7 @@ export class Push {
               }
 
               await new Promise((resolve) =>
-                setTimeout(resolve, POLL_DEBOUNCE * 1.5),
+                setTimeout(resolve, POLL_DEBOUNCE),
               );
             }
           } catch (e: any) {
@@ -960,21 +1078,21 @@ export class Push {
             let domain = "";
             try {
               const consoleService = await getConsoleService(
-                this.projectClient,
+                this.consoleClient,
               );
               const variables = await consoleService.variables();
               domain = ID.unique() + "." + variables["_APP_DOMAIN_SITES"];
-            } catch (error) {
-              console.error("Error fetching console variables.");
-              throw error;
+            } catch (err) {
+              this.error("Error fetching console variables.");
+              throw err;
             }
 
             try {
               const proxyService = await getProxyService(this.projectClient);
               await proxyService.createSiteRule(domain, site.$id);
-            } catch (error) {
-              console.error("Error creating site rule.");
-              throw error;
+            } catch (err) {
+              this.error("Error creating site rule.");
+              throw err;
             }
 
             updaterRow.update({ status: "Created" });
@@ -1054,6 +1172,27 @@ export class Push {
           return;
         }
 
+        if (!site.path) {
+          errors.push(new Error(`Site '${site.name}' has no path configured`));
+          updaterRow.fail({
+            errorMessage: `No path configured for site`,
+          });
+          return;
+        }
+
+        if (
+          !fs.existsSync(site.path) ||
+          fs.readdirSync(site.path).length === 0
+        ) {
+          errors.push(
+            new Error(`Deployment not found or empty at path: ${site.path}`),
+          );
+          updaterRow.fail({
+            errorMessage: `path not found or empty: ${path.relative(process.cwd(), path.resolve(site.path))}`,
+          });
+          return;
+        }
+
         try {
           updaterRow.update({ status: "Pushing" }).replaceSpinner(SPINNER_DOTS);
           const sitesServiceDeploy = await getSitesService(this.projectClient);
@@ -1083,7 +1222,7 @@ export class Push {
           switch (e.code) {
             case "ENOENT":
               updaterRow.fail({
-                errorMessage: "Not found in the current directory. Skipping...",
+                errorMessage: `Deployment not found at path: ${path.resolve(site.path)}`,
               });
               break;
             default:
@@ -1102,7 +1241,21 @@ export class Push {
               end: "Checking deployment status...",
             });
 
+            const timeoutDeadline = Date.now() + DEPLOYMENT_TIMEOUT_MS;
+
             while (true) {
+              if (Date.now() > timeoutDeadline) {
+                failedDeployments.push({
+                  name: site["name"],
+                  $id: site["$id"],
+                  deployment: deploymentId,
+                });
+                updaterRow.fail({
+                  errorMessage: "Deployment timed out after 10 minutes",
+                });
+                break;
+              }
+
               const sitesServicePoll = await getSitesService(
                 this.projectClient,
               );
@@ -1119,12 +1272,14 @@ export class Push {
                 const proxyServiceUrl = await getProxyService(
                   this.projectClient,
                 );
-                const res = await proxyServiceUrl.listRules([
-                  Query.limit(1),
-                  Query.equal("deploymentResourceType", "site"),
-                  Query.equal("deploymentResourceId", site["$id"]),
-                  Query.equal("trigger", "manual"),
-                ]);
+                const res = await proxyServiceUrl.listRules({
+                  queries: [
+                    Query.limit(1),
+                    Query.equal("deploymentResourceType", "site"),
+                    Query.equal("deploymentResourceId", site["$id"]),
+                    Query.equal("trigger", "manual"),
+                  ],
+                });
 
                 if (Number(res.total) === 1) {
                   url = `https://${res.rules[0].domain}`;
@@ -1150,7 +1305,7 @@ export class Push {
               }
 
               await new Promise((resolve) =>
-                setTimeout(resolve, POLL_DEBOUNCE * 1.5),
+                setTimeout(resolve, POLL_DEBOUNCE),
               );
             }
           } catch (e: any) {
@@ -1178,14 +1333,15 @@ export class Push {
 
   public async pushTables(
     tables: any[],
-    attempts?: number,
+    options: PushTableOptions = {},
   ): Promise<{
     successfullyPushed: number;
     errors: any[];
   }> {
+    const { attempts, skipConfirmation = false } = options;
     const pollMaxDebounces = attempts ?? POLL_DEFAULT_VALUE;
     const pools = new Pools(pollMaxDebounces);
-    const attributes = new Attributes(pools);
+    const attributes = new Attributes(pools, skipConfirmation);
 
     let tablesChanged = new Set();
     const errors: any[] = [];
@@ -1212,15 +1368,15 @@ export class Push {
             changes.push("permissions");
 
           if (changes.length > 0) {
-            await tablesService.updateTable(
-              table["databaseId"],
-              table["$id"],
-              table.name,
-              table.rowSecurity,
-              table["$permissions"],
-            );
+            await tablesService.updateTable({
+              databaseId: table["databaseId"],
+              tableId: table["$id"],
+              name: table.name,
+              rowSecurity: table.rowSecurity,
+              permissions: table["$permissions"],
+            });
 
-            success(
+            this.success(
               `Updated ${table.name} ( ${table["$id"]} ) - ${changes.join(", ")}`,
             );
             tablesChanged.add(table["$id"]);
@@ -1230,19 +1386,21 @@ export class Push {
           table.isExisted = true;
         } catch (e: any) {
           if (Number(e.code) === 404) {
-            log(
+            this.log(
               `Table ${table.name} does not exist in the project. Creating ... `,
             );
             const tablesService = await getTablesDBService(this.projectClient);
-            await tablesService.createTable(
-              table["databaseId"],
-              table["$id"],
-              table.name,
-              table.rowSecurity,
-              table["$permissions"],
-            );
+            await tablesService.createTable({
+              databaseId: table["databaseId"],
+              tableId: table["$id"],
+              name: table.name,
+              rowSecurity: table.rowSecurity,
+              permissions: table["$permissions"]
+                ? [...table["$permissions"]]
+                : undefined,
+            });
 
-            success(`Created ${table.name} ( ${table["$id"]} )`);
+            this.success(`Created ${table.name} ( ${table["$id"]} )`);
             tablesChanged.add(table["$id"]);
           } else {
             errors.push(e);
@@ -1280,7 +1438,7 @@ export class Push {
         }
       }
 
-      log(
+      this.log(
         `Pushing table ${table.name} ( ${table["databaseId"]} - ${table["$id"]} ) attributes`,
       );
 
@@ -1298,7 +1456,7 @@ export class Push {
         throw e;
       }
       tablesChanged.add(table["$id"]);
-      success(`Successfully pushed ${table.name} ( ${table["$id"]} )`);
+      this.success(`Successfully pushed ${table.name} ( ${table["$id"]} )`);
     }
 
     return {
@@ -1307,12 +1465,16 @@ export class Push {
     };
   }
 
-  public async pushCollections(collections: any[]): Promise<{
+  public async pushCollections(
+    collections: any[],
+    options: { skipConfirmation?: boolean } = {},
+  ): Promise<{
     successfullyPushed: number;
     errors: any[];
   }> {
+    const { skipConfirmation = false } = options;
     const pools = new Pools(POLL_DEFAULT_VALUE);
-    const attributes = new Attributes(pools);
+    const attributes = new Attributes(pools, skipConfirmation);
 
     const errors: any[] = [];
 
@@ -1336,16 +1498,20 @@ export class Push {
           if (database.name !== localDatabaseName) {
             await databasesService.update(databaseId, localDatabaseName);
 
-            success(`Updated ${localDatabaseName} ( ${databaseId} ) name`);
+            this.success(`Updated ${localDatabaseName} ( ${databaseId} ) name`);
           }
-        } catch (err) {
-          log(`Database ${databaseId} not found. Creating it now ...`);
+        } catch (err: any) {
+          if (Number(err.code) === 404) {
+            this.log(`Database ${databaseId} not found. Creating it now ...`);
 
-          const localDatabaseName =
-            collections.find((c: any) => c.databaseId === databaseId)
-              ?.databaseName ?? databaseId;
+            const localDatabaseName =
+              collections.find((c: any) => c.databaseId === databaseId)
+                ?.databaseName ?? databaseId;
 
-          await databasesService.create(databaseId, localDatabaseName);
+            await databasesService.create(databaseId, localDatabaseName);
+          } else {
+            throw err;
+          }
         }
       }),
     );
@@ -1369,26 +1535,28 @@ export class Push {
               collection.name,
             );
 
-            success(`Updated ${collection.name} ( ${collection["$id"]} ) name`);
+            this.success(
+              `Updated ${collection.name} ( ${collection["$id"]} ) name`,
+            );
           }
           collection.remoteVersion = remoteCollection;
 
           collection.isExisted = true;
         } catch (e: any) {
           if (Number(e.code) === 404) {
-            log(
+            this.log(
               `Collection ${collection.name} does not exist in the project. Creating ... `,
             );
             const databasesService = await getDatabasesService(
               this.projectClient,
             );
-            await databasesService.createCollection(
-              collection["databaseId"],
-              collection["$id"],
-              collection.name,
-              collection.documentSecurity,
-              collection["$permissions"],
-            );
+            await databasesService.createCollection({
+              databaseId: collection["databaseId"],
+              collectionId: collection["$id"],
+              name: collection.name,
+              documentSecurity: collection.documentSecurity,
+              permissions: collection["$permissions"],
+            });
           } else {
             errors.push(e);
             throw e;
@@ -1426,7 +1594,7 @@ export class Push {
         }
       }
 
-      log(
+      this.log(
         `Pushing collection ${collection.name} ( ${collection["databaseId"]} - ${collection["$id"]} ) attributes`,
       );
 
@@ -1447,7 +1615,7 @@ export class Push {
         throw e;
       }
       numberOfCollections++;
-      success(
+      this.success(
         `Successfully pushed ${collection.name} ( ${collection["$id"]} )`,
       );
     }
@@ -1459,10 +1627,10 @@ export class Push {
   }
 }
 
-async function createPushInstance(): Promise<Push> {
+async function createPushInstance(silent = false): Promise<Push> {
   const projectClient = await sdkForProject();
   const consoleClient = await sdkForConsole();
-  return new Push(projectClient, consoleClient);
+  return new Push(projectClient, consoleClient, silent);
 }
 
 const pushResources = async ({
@@ -1473,13 +1641,54 @@ const pushResources = async ({
   if (cliConfig.all) {
     checkDeployConditions(localConfig);
 
+    const functions = localConfig.getFunctions();
+    let allowFunctionsCodePush: boolean | null =
+      cliConfig.force === true ? true : null;
+    if (functions.length > 0 && allowFunctionsCodePush === null) {
+      const codeAnswer = await inquirer.prompt(questionsPushFunctionsCode);
+      allowFunctionsCodePush = codeAnswer.override;
+    }
+
+    const sites = localConfig.getSites();
+    let allowSitesCodePush: boolean | null =
+      cliConfig.force === true ? true : null;
+    if (sites.length > 0 && allowSitesCodePush === null) {
+      const codeAnswer = await inquirer.prompt(questionsPushSitesCode);
+      allowSitesCodePush = codeAnswer.override;
+    }
+
     const pushInstance = await createPushInstance();
-    const config = localConfig.getProject() as ConfigType;
+    const project = localConfig.getProject();
+    const config: ConfigType = {
+      projectId: project.projectId ?? "",
+      projectName: project.projectName,
+      settings: project.projectSettings,
+      functions,
+      sites,
+      collections: localConfig.getCollections(),
+      databases: localConfig.getDatabases(),
+      tables: localConfig.getTables(),
+      tablesDB: localConfig.getTablesDBs(),
+      buckets: localConfig.getBuckets(),
+      teams: localConfig.getTeams(),
+      topics: localConfig.getMessagingTopics(),
+    };
+
+    parseWithBetterErrors<ConfigType>(
+      ConfigSchema,
+      config,
+      "Configuration validation failed",
+      config,
+    );
 
     await pushInstance.pushResources(config, {
+      all: cliConfig.all,
       skipDeprecated,
-      functionOptions: { code: true, withVariables: false },
-      siteOptions: { code: true, withVariables: false },
+      functionOptions: {
+        code: allowFunctionsCodePush === true,
+        withVariables: false,
+      },
+      siteOptions: { code: allowSitesCodePush === true, withVariables: false },
     });
   } else {
     const actions: Record<string, (options?: any) => Promise<void>> = {
@@ -1555,25 +1764,6 @@ const pushSettings = async (): Promise<void> => {
 
     const pushInstance = await createPushInstance();
     const config = localConfig.getProject();
-    const settings = config.projectSettings ?? {};
-
-    if (config.projectName) {
-      log("Applying project name ...");
-    }
-
-    if (settings.services) {
-      log("Applying service statuses ...");
-    }
-
-    if (settings.auth) {
-      if (settings.auth.security) {
-        log("Applying auth security settings ...");
-      }
-
-      if (settings.auth.methods) {
-        log("Applying auth methods statuses ...");
-      }
-    }
 
     await pushInstance.pushSettings({
       projectId: config.projectId,
@@ -1619,7 +1809,7 @@ const pushSite = async ({
   if (siteIds.length === 0) {
     log("No sites found.");
     hint(
-      "Use 'appwrite pull sites' to synchronize existing one, or use 'appwrite init site' to create a new one.",
+      `Use '${EXECUTABLE_NAME} pull sites' to synchronize existing one, or use '${EXECUTABLE_NAME} init site' to create a new one.`,
     );
     return;
   }
@@ -1662,12 +1852,20 @@ const pushSite = async ({
     return;
   }
 
+  let allowCodePush: boolean | null = cliConfig.force === true ? true : null;
+  if (code !== false && allowCodePush === null) {
+    const codeAnswer = await inquirer.prompt(questionsPushSitesCode);
+    allowCodePush = codeAnswer.override;
+  }
+
+  const shouldPushCode = code !== false && allowCodePush === true;
+
   log("Pushing sites ...");
 
   const pushInstance = await createPushInstance();
   const result = await pushInstance.pushSites(sites, {
     async: asyncDeploy,
-    code,
+    code: shouldPushCode,
     withVariables,
   });
 
@@ -1740,7 +1938,7 @@ const pushFunction = async ({
   if (functionIds.length === 0) {
     log("No functions found.");
     hint(
-      "Use 'appwrite pull functions' to synchronize existing one, or use 'appwrite init function' to create a new one.",
+      `Use '${EXECUTABLE_NAME} pull functions' to synchronize existing one, or use '${EXECUTABLE_NAME} init function' to create a new one.`,
     );
     return;
   }
@@ -1782,12 +1980,20 @@ const pushFunction = async ({
     return;
   }
 
+  let allowCodePush: boolean | null = cliConfig.force === true ? true : null;
+  if (code !== false && allowCodePush === null) {
+    const codeAnswer = await inquirer.prompt(questionsPushFunctionsCode);
+    allowCodePush = codeAnswer.override;
+  }
+
+  const shouldPushCode = code !== false && allowCodePush === true;
+
   log("Pushing functions ...");
 
   const pushInstance = await createPushInstance();
   const result = await pushInstance.pushFunctions(functions, {
     async: asyncDeploy,
-    code,
+    code: shouldPushCode,
     withVariables,
   });
 
@@ -1861,7 +2067,7 @@ const pushTable = async ({
     const validTablesDBs = localTablesDBs.filter((db: any) =>
       remoteDatabaseIds.has(db.$id),
     );
-    localConfig.set("tables", validTablesDBs);
+    localConfig.set("tablesDB", validTablesDBs);
 
     success("Configuration resynced successfully.");
     console.log();
@@ -1956,7 +2162,7 @@ const pushTable = async ({
   if (tables.length === 0) {
     log("No tables found.");
     hint(
-      "Use 'appwrite pull tables' to synchronize existing one, or use 'appwrite init table' to create a new one.",
+      `Use '${EXECUTABLE_NAME} pull tables' to synchronize existing one, or use '${EXECUTABLE_NAME} init table' to create a new one.`,
     );
     return;
   }
@@ -1982,7 +2188,7 @@ const pushTable = async ({
   log("Pushing tables ...");
 
   const pushInstance = await createPushInstance();
-  const result = await pushInstance.pushTables(tables, attempts);
+  const result = await pushInstance.pushTables(tables, { attempts });
 
   const { successfullyPushed, errors } = result;
 
@@ -1997,9 +2203,9 @@ const pushTable = async ({
   }
 };
 
-const pushCollection = async ({}: PushTableOptions = {}): Promise<void> => {
+const pushCollection = async (): Promise<void> => {
   warn(
-    "appwrite push collection has been deprecated. Please consider using 'appwrite push tables' instead",
+    `${EXECUTABLE_NAME} push collection has been deprecated. Please consider using '${EXECUTABLE_NAME} push tables' instead`,
   );
   const collections: any[] = [];
 
@@ -2023,7 +2229,7 @@ const pushCollection = async ({}: PushTableOptions = {}): Promise<void> => {
   if (collections.length === 0) {
     log("No collections found.");
     hint(
-      "Use 'appwrite pull collections' to synchronize existing one, or use 'appwrite init collection' to create a new one.",
+      `Use '${EXECUTABLE_NAME} pull collections' to synchronize existing one, or use '${EXECUTABLE_NAME} init collection' to create a new one.`,
     );
     return;
   }
@@ -2092,7 +2298,7 @@ const pushBucket = async (): Promise<void> => {
   if (bucketIds.length === 0) {
     log("No buckets found.");
     hint(
-      "Use 'appwrite pull buckets' to synchronize existing one, or use 'appwrite init bucket' to create a new one.",
+      `Use '${EXECUTABLE_NAME} pull buckets' to synchronize existing one, or use '${EXECUTABLE_NAME} init bucket' to create a new one.`,
     );
     return;
   }
@@ -2156,7 +2362,7 @@ const pushTeam = async (): Promise<void> => {
   if (teamIds.length === 0) {
     log("No teams found.");
     hint(
-      "Use 'appwrite pull teams' to synchronize existing one, or use 'appwrite init team' to create a new one.",
+      `Use '${EXECUTABLE_NAME} pull teams' to synchronize existing one, or use '${EXECUTABLE_NAME} init team' to create a new one.`,
     );
     return;
   }
@@ -2220,7 +2426,7 @@ const pushMessagingTopic = async (): Promise<void> => {
   if (topicsIds.length === 0) {
     log("No topics found.");
     hint(
-      "Use 'appwrite pull topics' to synchronize existing one, or use 'appwrite init topic' to create a new one.",
+      `Use '${EXECUTABLE_NAME} pull topics' to synchronize existing one, or use '${EXECUTABLE_NAME} init topic' to create a new one.`,
     );
     return;
   }
@@ -2345,11 +2551,11 @@ push
   .action(actionRunner(pushMessagingTopic));
 
 export const deploy = new Command("deploy")
-  .description("Removed. Use appwrite push instead")
+  .description(`Removed. Use ${EXECUTABLE_NAME} push instead`)
   .action(
     actionRunner(async () => {
       warn(
-        "appwrite deploy has been removed. Please use 'appwrite push' instead",
+        `${EXECUTABLE_NAME} deploy has been removed. Please use '${EXECUTABLE_NAME} push' instead`,
       );
     }),
   );