appwrite-utils-cli 0.10.0 → 0.10.1

package/README.md

@@ -147,6 +147,8 @@ This updated CLI ensures that developers have robust tools at their fingertips t
 
 ## Changelog
 
+- 0.10.01: Fixed `predeployCommands` to work
+- 0.10.001: Updated `deployFunction` to not updateConfig if it's already present
 - 0.10.0: Fixed `synchronize configurations` for functions, now you do not need to deploy the function first
 - 0.9.999: Fixed Functions, looks for `./functions` in addition to `appwriteConfigFolder/functions`
 - 0.9.998: Fixed transfer finally, added `--targetDbId` and `--sourceDbId` as aliases

package/dist/functions/deployments.js

@@ -3,6 +3,7 @@ import { InputFile } from "node-appwrite/file";
 import { create as createTarball } from "tar";
 import { join } from "node:path";
 import fs from "node:fs";
+import { platform } from "node:os";
 import {} from "appwrite-utils";
 import chalk from "chalk";
 import cliProgress from "cli-progress";
@@ -46,20 +47,20 @@ export const deployFunction = async (client, functionId, codePath, activate = tr
     const fileObject = InputFile.fromBuffer(new Uint8Array(fileBuffer), `function-${functionId}.tar.gz`);
     try {
         console.log(chalk.blue("🚀 Creating deployment..."));
+        progressBar.start(1, 0);
         const functionResponse = await functions.createDeployment(functionId, fileObject, activate, entrypoint, commands, (progress) => {
             const chunks = progress.chunksUploaded;
             const total = progress.chunksTotal;
-            if (chunks && total) {
-                if (chunks === 0) {
+            if (chunks !== undefined && total) {
+                if (chunks === 0 && total !== 0) {
                     progressBar.start(total, 0);
                 }
-                else if (chunks === total) {
-                    progressBar.update(total);
-                    progressBar.stop();
-                    console.log(chalk.green("✅ Upload complete!"));
-                }
                 else {
                     progressBar.update(chunks);
+                    if (chunks === total) {
+                        progressBar.stop();
+                        console.log(chalk.green("✅ Upload complete!"));
+                    }
                 }
             }
         });
@@ -85,22 +86,29 @@ export const deployLocalFunction = async (client, functionName, functionConfig,
         functionConfig.dirPath ||
         findFunctionDirectory(process.cwd(), functionName) ||
         join(process.cwd(), "functions", functionName.toLowerCase().replace(/\s+/g, "-"));
+    if (!fs.existsSync(resolvedPath)) {
+        throw new Error(`Function directory not found at ${resolvedPath}`);
+    }
     if (functionConfig.predeployCommands?.length) {
         console.log(chalk.blue("Executing predeploy commands..."));
+        const isWindows = platform() === "win32";
         for (const command of functionConfig.predeployCommands) {
             try {
                 console.log(chalk.gray(`Executing: ${command}`));
                 execSync(command, {
                     cwd: resolvedPath,
                     stdio: "inherit",
+                    shell: isWindows ? "cmd.exe" : "/bin/sh",
+                    windowsHide: true,
                 });
             }
             catch (error) {
-                console.error(chalk.red(`Failed to execute predeploy command: ${command}`));
-                throw error;
+                console.error(chalk.red(`Failed to execute predeploy command: ${command}`), error);
+                throw new Error(``);
             }
         }
     }
+    // Only create function if it doesn't exist
     if (!functionExists) {
         await createFunction(client, functionConfig.$id, functionConfig.name, functionConfig.runtime, functionConfig.execute, functionConfig.events, functionConfig.schedule, functionConfig.timeout, functionConfig.enabled, functionConfig.logging, functionConfig.entrypoint, functionConfig.commands);
     }

package/dist/interactiveCLI.js

@@ -298,7 +298,17 @@ export class InteractiveCLI {
             join(process.cwd(), functionName), // ./functionName
             join(basePath, "functions", functionName), // appwriteFolder/functions/functionName
             join(basePath, functionName), // appwriteFolder/functionName
+            join(basePath, functionName.toLowerCase()), // appwriteFolder/functionName.toLowerCase()
+            join(basePath, functionName.toLowerCase().replace(/\s+/g, "")), // appwriteFolder/functionName.toLowerCase().replace(/\s+/g, "")
+            join(process.cwd(), functionName.toLowerCase()), // ./functionName.toLowerCase()
         ];
+        // Create different variations of the function name for comparison
+        const functionNameVariations = new Set([
+            functionName.toLowerCase(),
+            functionName.toLowerCase().replace(/\s+/g, ""),
+            functionName.toLowerCase().replace(/[^a-z0-9]/g, ""),
+            functionName.toLowerCase().replace(/[-_\s]+/g, ""),
+        ]);
         // Check common locations first
         for (const path of commonPaths) {
             try {
@@ -331,7 +341,15 @@ export class InteractiveCLI {
                     if (entry.isDirectory() &&
                         !entry.name.startsWith(".") &&
                         entry.name !== "node_modules") {
-                        if (entry.name === functionName) {
+                        const entryNameVariations = new Set([
+                            entry.name.toLowerCase(),
+                            entry.name.toLowerCase().replace(/\s+/g, ""),
+                            entry.name.toLowerCase().replace(/[^a-z0-9]/g, ""),
+                            entry.name.toLowerCase().replace(/[-_\s]+/g, ""),
+                        ]);
+                        // Check if any variation of the entry name matches any variation of the function name
+                        const hasMatch = [...functionNameVariations].some((fnVar) => [...entryNameVariations].includes(fnVar));
+                        if (hasMatch) {
                             console.log(chalk.green(`Found function at: ${fullPath}`));
                             return fullPath;
                         }
@@ -361,126 +379,64 @@ export class InteractiveCLI {
             console.log(chalk.red("Invalid function configuration"));
             return;
         }
-        const { shouldDownload } = await inquirer.prompt([
-            {
-                type: "confirm",
-                name: "shouldDownload",
-                message: "Would you like to download the latest deployment?",
-                default: false,
-            },
-        ]);
-        if (shouldDownload) {
-            try {
-                console.log(chalk.blue("Downloading latest deployment..."));
-                const { path: downloadedPath, function: remoteFunction } = await downloadLatestFunctionDeployment(this.controller.appwriteServer, functionConfig.$id, join(this.controller.getAppwriteFolderPath(), "functions"));
-                console.log(chalk.green(`✨ Function downloaded to ${downloadedPath}`));
-                // Update the config and functions array safely
-                this.controller.config.functions =
-                    this.controller.config.functions || [];
-                const newFunction = {
-                    $id: remoteFunction.$id,
-                    name: remoteFunction.name,
-                    runtime: remoteFunction.runtime,
-                    execute: remoteFunction.execute || [],
-                    events: remoteFunction.events || [],
-                    schedule: remoteFunction.schedule || "",
-                    timeout: remoteFunction.timeout || 15,
-                    enabled: remoteFunction.enabled !== false,
-                    logging: remoteFunction.logging !== false,
-                    entrypoint: remoteFunction.entrypoint || "src/index.ts",
-                    commands: remoteFunction.commands || "npm install",
-                    dirPath: downloadedPath,
-                    scopes: (remoteFunction.scopes || []),
-                    installationId: remoteFunction.installationId,
-                    providerRepositoryId: remoteFunction.providerRepositoryId,
-                    providerBranch: remoteFunction.providerBranch,
-                    providerSilentMode: remoteFunction.providerSilentMode,
-                    providerRootDirectory: remoteFunction.providerRootDirectory,
-                    specification: remoteFunction.specification,
-                };
-                const existingIndex = this.controller.config.functions.findIndex((f) => f?.$id === remoteFunction.$id);
-                if (existingIndex >= 0) {
-                    this.controller.config.functions[existingIndex] = newFunction;
-                }
-                else {
-                    this.controller.config.functions.push(newFunction);
-                }
-                const schemaGenerator = new SchemaGenerator(this.controller.config, this.controller.getAppwriteFolderPath());
-                schemaGenerator.updateConfig(this.controller.config);
-                console.log(chalk.green("✨ Updated appwriteConfig.ts with new function"));
-                await this.controller.reloadConfig();
-                functionConfig.dirPath = downloadedPath;
-            }
-            catch (error) {
-                console.error(chalk.red("Failed to download function deployment:"), error);
-                return;
-            }
+        // Ensure functions array exists
+        if (!this.controller.config.functions) {
+            this.controller.config.functions = [];
         }
-        else {
-            console.log(chalk.yellow("Skipping download, updating config only..."));
-            try {
-                // Update the config with remote function info
-                this.controller.config.functions =
-                    this.controller.config.functions || [];
-                const remoteFunction = await getFunction(this.controller.appwriteServer, functionConfig.$id);
-                const newFunction = {
-                    $id: remoteFunction.$id,
-                    name: remoteFunction.name,
-                    runtime: remoteFunction.runtime,
-                    execute: remoteFunction.execute || [],
-                    events: remoteFunction.events || [],
-                    schedule: remoteFunction.schedule || "",
-                    timeout: remoteFunction.timeout || 15,
-                    enabled: remoteFunction.enabled !== false,
-                    logging: remoteFunction.logging !== false,
-                    entrypoint: remoteFunction.entrypoint || "src/index.ts",
-                    commands: remoteFunction.commands || "npm install",
-                    scopes: (remoteFunction.scopes || []),
-                    installationId: remoteFunction.installationId,
-                    providerRepositoryId: remoteFunction.providerRepositoryId,
-                    providerBranch: remoteFunction.providerBranch,
-                    providerSilentMode: remoteFunction.providerSilentMode,
-                    providerRootDirectory: remoteFunction.providerRootDirectory,
-                    specification: remoteFunction.specification,
-                };
-                const existingIndex = this.controller.config.functions.findIndex((f) => f?.$id === remoteFunction.$id);
-                if (existingIndex >= 0) {
-                    this.controller.config.functions[existingIndex] = newFunction;
-                }
-                else {
-                    this.controller.config.functions.push(newFunction);
-                }
-                const schemaGenerator = new SchemaGenerator(this.controller.config, this.controller.getAppwriteFolderPath());
-                schemaGenerator.updateConfig(this.controller.config);
-                console.log(chalk.green("✨ Updated appwriteConfig.ts with function info"));
-                await this.controller.reloadConfig();
+        let functionPath = join(this.controller.getAppwriteFolderPath(), "functions", functionConfig.name);
+        if (!fs.existsSync(functionPath)) {
+            console.log(chalk.yellow(`Function not found in primary location, searching subdirectories...`));
+            const foundPath = await this.findFunctionInSubdirectories(this.controller.getAppwriteFolderPath(), functionConfig.name.toLowerCase());
+            if (foundPath) {
+                console.log(chalk.green(`Found function at: ${foundPath}`));
+                functionPath = foundPath;
+                functionConfig.dirPath = foundPath;
             }
-            catch (error) {
-                console.error(chalk.red("Failed to update function config:"), error);
-                return;
-            }
-        }
-        // Only try to deploy if we didn't just download
-        if (!shouldDownload) {
-            let functionPath = join(this.controller.getAppwriteFolderPath(), "functions", functionConfig.name);
-            if (!fs.existsSync(functionPath)) {
-                console.log(chalk.yellow(`Function not found in primary location, searching subdirectories...`));
-                const foundPath = await this.findFunctionInSubdirectories(this.controller.getAppwriteFolderPath(), functionConfig.name);
-                if (foundPath) {
-                    console.log(chalk.green(`Found function at: ${foundPath}`));
-                    functionPath = foundPath;
-                    functionConfig.dirPath = foundPath;
+            else {
+                const { shouldDownload } = await inquirer.prompt([
+                    {
+                        type: "confirm",
+                        name: "shouldDownload",
+                        message: "Function not found locally. Would you like to download the latest deployment?",
+                        default: false,
+                    },
+                ]);
+                if (shouldDownload) {
+                    try {
+                        console.log(chalk.blue("Downloading latest deployment..."));
+                        const { path: downloadedPath, function: remoteFunction } = await downloadLatestFunctionDeployment(this.controller.appwriteServer, functionConfig.$id, join(this.controller.getAppwriteFolderPath(), "functions"));
+                        console.log(chalk.green(`✨ Function downloaded to ${downloadedPath}`));
+                        const existingIndex = this.controller.config.functions.findIndex((f) => f?.$id === remoteFunction.$id);
+                        if (existingIndex >= 0) {
+                            // Only update the dirPath if function exists
+                            this.controller.config.functions[existingIndex].dirPath =
+                                downloadedPath;
+                        }
+                        await this.controller.reloadConfig();
+                        functionConfig.dirPath = downloadedPath;
+                        functionPath = downloadedPath;
+                    }
+                    catch (error) {
+                        console.error(chalk.red("Failed to download function deployment:"), error);
+                        return;
+                    }
                 }
                 else {
-                    console.log(chalk.red(`Function ${functionConfig.name} not found locally in any subdirectory. Cannot deploy.`));
+                    console.log(chalk.red(`Function ${functionConfig.name} not found locally. Cannot deploy.`));
                     return;
                 }
             }
-            if (!this.controller.appwriteServer) {
-                console.log(chalk.red("Appwrite server not initialized"));
-                return;
-            }
+        }
+        if (!this.controller.appwriteServer) {
+            console.log(chalk.red("Appwrite server not initialized"));
+            return;
+        }
+        try {
             await deployLocalFunction(this.controller.appwriteServer, functionConfig.name, functionConfig);
+            console.log(chalk.green("✨ Function deployed successfully!"));
+        }
+        catch (error) {
+            console.error(chalk.red("Failed to deploy function:"), error);
         }
     }
     async deleteFunction() {
@@ -499,52 +455,33 @@ export class InteractiveCLI {
             }
         }
     }
-    async selectFunctions(message, multiSelect = true, preferLocal = false) {
-        await this.initControllerIfNeeded();
-        const configFunctions = this.getLocalFunctions();
-        let remoteFunctions = [];
-        try {
-            const functions = await this.controller.listAllFunctions();
-            remoteFunctions = functions;
-        }
-        catch (error) {
-            console.log(chalk.yellow(`Note: Remote functions not available, using only local functions`));
-        }
-        // Combine functions based on whether we're deploying or not
-        const allFunctions = preferLocal
-            ? [
-                ...configFunctions,
-                ...remoteFunctions.map((f) => AppwriteFunctionSchema.parse(f)),
-            ]
-            : [
-                ...remoteFunctions.map((f) => AppwriteFunctionSchema.parse(f)),
-                ...configFunctions.filter((f) => !remoteFunctions.some((rf) => rf.name === f.name)),
-            ];
-        if (allFunctions.length === 0) {
-            console.log(chalk.red("No functions available"));
-            return [];
-        }
-        const choices = allFunctions
-            .sort((a, b) => a.name.localeCompare(b.name))
-            .map((func) => ({
-            name: func.name,
-            value: func,
-        }));
+    async selectFunctions(message, multiple = true, includeRemote = false) {
+        const remoteFunctions = includeRemote
+            ? await listFunctions(this.controller.appwriteServer, [
+                Query.limit(1000),
+            ])
+            : { functions: [] };
+        const localFunctions = this.getLocalFunctions();
+        // Combine functions, preferring local ones
+        const allFunctions = [
+            ...localFunctions,
+            ...remoteFunctions.functions.filter((rf) => !localFunctions.some((lf) => lf.name === rf.name)),
+        ];
         const { selectedFunctions } = await inquirer.prompt([
             {
-                type: multiSelect ? "checkbox" : "list",
+                type: multiple ? "checkbox" : "list",
                 name: "selectedFunctions",
-                message: chalk.blue(message),
-                choices,
+                message,
+                choices: allFunctions.map((f) => ({
+                    name: `${f.name} (${f.$id})${localFunctions.some((lf) => lf.name === f.name)
+                        ? " (Local)"
+                        : " (Remote)"}`,
+                    value: f,
+                })),
                 loop: true,
-                pageSize: 10,
             },
         ]);
-        // For single selection, ensure we return an array
-        if (!multiSelect) {
-            return selectedFunctions ? [selectedFunctions] : [];
-        }
-        return selectedFunctions || [];
+        return multiple ? selectedFunctions : [selectedFunctions];
     }
     getLocalFunctions() {
         const configFunctions = this.controller.config?.functions || [];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "appwrite-utils-cli",
   "description": "Appwrite Utility Functions to help with database management, data conversion, data import, migrations, and much more. Meant to be used as a CLI tool, I do not recommend installing this in frontend environments.",
-  "version": "0.10.0",
+  "version": "0.10.01",
   "main": "src/main.ts",
   "type": "module",
   "repository": {

package/src/functions/deployments.ts

@@ -3,6 +3,7 @@ import { InputFile } from "node-appwrite/file";
 import { create as createTarball } from "tar";
 import { join } from "node:path";
 import fs from "node:fs";
+import { platform } from "node:os";
 import { type AppwriteFunction, type Specification } from "appwrite-utils";
 import chalk from "chalk";
 import cliProgress from "cli-progress";
@@ -76,6 +77,7 @@ export const deployFunction = async (
 
   try {
     console.log(chalk.blue("🚀 Creating deployment..."));
+    progressBar.start(1, 0);
     const functionResponse = await functions.createDeployment(
       functionId,
       fileObject,
@@ -85,15 +87,15 @@ export const deployFunction = async (
       (progress) => {
         const chunks = progress.chunksUploaded;
         const total = progress.chunksTotal;
-        if (chunks && total) {
-          if (chunks === 0) {
+        if (chunks !== undefined && total) {
+          if (chunks === 0 && total !== 0) {
             progressBar.start(total, 0);
-          } else if (chunks === total) {
-            progressBar.update(total);
-            progressBar.stop();
-            console.log(chalk.green("✅ Upload complete!"));
           } else {
             progressBar.update(chunks);
+            if (chunks === total) {
+              progressBar.stop();
+              console.log(chalk.green("✅ Upload complete!"));
+            }
           }
         }
       }
@@ -132,24 +134,34 @@ export const deployLocalFunction = async (
       functionName.toLowerCase().replace(/\s+/g, "-")
     );
 
+  if (!fs.existsSync(resolvedPath)) {
+    throw new Error(`Function directory not found at ${resolvedPath}`);
+  }
+
   if (functionConfig.predeployCommands?.length) {
     console.log(chalk.blue("Executing predeploy commands..."));
+    const isWindows = platform() === "win32";
+
     for (const command of functionConfig.predeployCommands) {
       try {
         console.log(chalk.gray(`Executing: ${command}`));
         execSync(command, {
           cwd: resolvedPath,
           stdio: "inherit",
+          shell: isWindows ? "cmd.exe" : "/bin/sh",
+          windowsHide: true,
         });
       } catch (error) {
         console.error(
-          chalk.red(`Failed to execute predeploy command: ${command}`)
+          chalk.red(`Failed to execute predeploy command: ${command}`),
+          error
         );
-        throw error;
+        throw new Error(``);
       }
     }
   }
 
+  // Only create function if it doesn't exist
   if (!functionExists) {
     await createFunction(
       client,

package/src/interactiveCLI.ts

@@ -398,8 +398,19 @@ export class InteractiveCLI {
       join(process.cwd(), functionName), // ./functionName
       join(basePath, "functions", functionName), // appwriteFolder/functions/functionName
       join(basePath, functionName), // appwriteFolder/functionName
+      join(basePath, functionName.toLowerCase()), // appwriteFolder/functionName.toLowerCase()
+      join(basePath, functionName.toLowerCase().replace(/\s+/g, "")), // appwriteFolder/functionName.toLowerCase().replace(/\s+/g, "")
+      join(process.cwd(), functionName.toLowerCase()), // ./functionName.toLowerCase()
     ];
 
+    // Create different variations of the function name for comparison
+    const functionNameVariations = new Set([
+      functionName.toLowerCase(),
+      functionName.toLowerCase().replace(/\s+/g, ""),
+      functionName.toLowerCase().replace(/[^a-z0-9]/g, ""),
+      functionName.toLowerCase().replace(/[-_\s]+/g, ""),
+    ]);
+
     // Check common locations first
     for (const path of commonPaths) {
       try {
@@ -445,7 +456,19 @@ export class InteractiveCLI {
             !entry.name.startsWith(".") &&
             entry.name !== "node_modules"
           ) {
-            if (entry.name === functionName) {
+            const entryNameVariations = new Set([
+              entry.name.toLowerCase(),
+              entry.name.toLowerCase().replace(/\s+/g, ""),
+              entry.name.toLowerCase().replace(/[^a-z0-9]/g, ""),
+              entry.name.toLowerCase().replace(/[-_\s]+/g, ""),
+            ]);
+
+            // Check if any variation of the entry name matches any variation of the function name
+            const hasMatch = [...functionNameVariations].some((fnVar) =>
+              [...entryNameVariations].includes(fnVar)
+            );
+
+            if (hasMatch) {
               console.log(chalk.green(`Found function at: ${fullPath}`));
               return fullPath;
             }
@@ -487,182 +510,101 @@ export class InteractiveCLI {
       return;
     }
 
-    const { shouldDownload } = await inquirer.prompt([
-      {
-        type: "confirm",
-        name: "shouldDownload",
-        message: "Would you like to download the latest deployment?",
-        default: false,
-      },
-    ]);
-
-    if (shouldDownload) {
-      try {
-        console.log(chalk.blue("Downloading latest deployment..."));
-        const { path: downloadedPath, function: remoteFunction } =
-          await downloadLatestFunctionDeployment(
-            this.controller.appwriteServer!,
-            functionConfig.$id,
-            join(this.controller.getAppwriteFolderPath(), "functions")
-          );
-        console.log(chalk.green(`✨ Function downloaded to ${downloadedPath}`));
-
-        // Update the config and functions array safely
-        this.controller.config.functions =
-          this.controller.config.functions || [];
-
-        const newFunction = {
-          $id: remoteFunction.$id,
-          name: remoteFunction.name,
-          runtime: remoteFunction.runtime as Runtime,
-          execute: remoteFunction.execute || [],
-          events: remoteFunction.events || [],
-          schedule: remoteFunction.schedule || "",
-          timeout: remoteFunction.timeout || 15,
-          enabled: remoteFunction.enabled !== false,
-          logging: remoteFunction.logging !== false,
-          entrypoint: remoteFunction.entrypoint || "src/index.ts",
-          commands: remoteFunction.commands || "npm install",
-          dirPath: downloadedPath,
-          scopes: (remoteFunction.scopes || []) as FunctionScope[],
-          installationId: remoteFunction.installationId,
-          providerRepositoryId: remoteFunction.providerRepositoryId,
-          providerBranch: remoteFunction.providerBranch,
-          providerSilentMode: remoteFunction.providerSilentMode,
-          providerRootDirectory: remoteFunction.providerRootDirectory,
-          specification: remoteFunction.specification as Specification,
-        };
-
-        const existingIndex = this.controller.config.functions.findIndex(
-          (f) => f?.$id === remoteFunction.$id
-        );
-
-        if (existingIndex >= 0) {
-          this.controller.config.functions[existingIndex] = newFunction;
-        } else {
-          this.controller.config.functions.push(newFunction);
-        }
-
-        const schemaGenerator = new SchemaGenerator(
-          this.controller.config,
-          this.controller.getAppwriteFolderPath()
-        );
-        schemaGenerator.updateConfig(this.controller.config);
-        console.log(
-          chalk.green("✨ Updated appwriteConfig.ts with new function")
-        );
-
-        await this.controller.reloadConfig();
-        functionConfig.dirPath = downloadedPath;
-      } catch (error) {
-        console.error(
-          chalk.red("Failed to download function deployment:"),
-          error
-        );
-        return;
-      }
-    } else {
-      console.log(chalk.yellow("Skipping download, updating config only..."));
-      try {
-        // Update the config with remote function info
-        this.controller.config.functions =
-          this.controller.config.functions || [];
-
-        const remoteFunction = await getFunction(
-          this.controller.appwriteServer!,
-          functionConfig.$id
-        );
+    // Ensure functions array exists
+    if (!this.controller.config.functions) {
+      this.controller.config.functions = [];
+    }
 
-        const newFunction = {
-          $id: remoteFunction.$id,
-          name: remoteFunction.name,
-          runtime: remoteFunction.runtime as Runtime,
-          execute: remoteFunction.execute || [],
-          events: remoteFunction.events || [],
-          schedule: remoteFunction.schedule || "",
-          timeout: remoteFunction.timeout || 15,
-          enabled: remoteFunction.enabled !== false,
-          logging: remoteFunction.logging !== false,
-          entrypoint: remoteFunction.entrypoint || "src/index.ts",
-          commands: remoteFunction.commands || "npm install",
-          scopes: (remoteFunction.scopes || []) as FunctionScope[],
-          installationId: remoteFunction.installationId,
-          providerRepositoryId: remoteFunction.providerRepositoryId,
-          providerBranch: remoteFunction.providerBranch,
-          providerSilentMode: remoteFunction.providerSilentMode,
-          providerRootDirectory: remoteFunction.providerRootDirectory,
-          specification: remoteFunction.specification as Specification,
-        };
-
-        const existingIndex = this.controller.config.functions.findIndex(
-          (f) => f?.$id === remoteFunction.$id
-        );
+    let functionPath = join(
+      this.controller.getAppwriteFolderPath(),
+      "functions",
+      functionConfig.name
+    );
 
-        if (existingIndex >= 0) {
-          this.controller.config.functions[existingIndex] = newFunction;
-        } else {
-          this.controller.config.functions.push(newFunction);
-        }
+    if (!fs.existsSync(functionPath)) {
+      console.log(
+        chalk.yellow(
+          `Function not found in primary location, searching subdirectories...`
+        )
+      );
+      const foundPath = await this.findFunctionInSubdirectories(
+        this.controller.getAppwriteFolderPath(),
+        functionConfig.name.toLowerCase()
+      );
 
-        const schemaGenerator = new SchemaGenerator(
-          this.controller.config,
-          this.controller.getAppwriteFolderPath()
-        );
-        schemaGenerator.updateConfig(this.controller.config);
-        console.log(
-          chalk.green("✨ Updated appwriteConfig.ts with function info")
-        );
+      if (foundPath) {
+        console.log(chalk.green(`Found function at: ${foundPath}`));
+        functionPath = foundPath;
+        functionConfig.dirPath = foundPath;
+      } else {
+        const { shouldDownload } = await inquirer.prompt([
+          {
+            type: "confirm",
+            name: "shouldDownload",
+            message:
+              "Function not found locally. Would you like to download the latest deployment?",
+            default: false,
+          },
+        ]);
 
-        await this.controller.reloadConfig();
-      } catch (error) {
-        console.error(chalk.red("Failed to update function config:"), error);
-        return;
-      }
-    }
+        if (shouldDownload) {
+          try {
+            console.log(chalk.blue("Downloading latest deployment..."));
+            const { path: downloadedPath, function: remoteFunction } =
+              await downloadLatestFunctionDeployment(
+                this.controller.appwriteServer!,
+                functionConfig.$id,
+                join(this.controller.getAppwriteFolderPath(), "functions")
+              );
+            console.log(
+              chalk.green(`✨ Function downloaded to ${downloadedPath}`)
+            );
 
-    // Only try to deploy if we didn't just download
-    if (!shouldDownload) {
-      let functionPath = join(
-        this.controller.getAppwriteFolderPath(),
-        "functions",
-        functionConfig.name
-      );
+            const existingIndex = this.controller.config.functions.findIndex(
+              (f) => f?.$id === remoteFunction.$id
+            );
 
-      if (!fs.existsSync(functionPath)) {
-        console.log(
-          chalk.yellow(
-            `Function not found in primary location, searching subdirectories...`
-          )
-        );
-        const foundPath = await this.findFunctionInSubdirectories(
-          this.controller.getAppwriteFolderPath(),
-          functionConfig.name
-        );
+            if (existingIndex >= 0) {
+              // Only update the dirPath if function exists
+              this.controller.config.functions[existingIndex].dirPath =
+                downloadedPath;
+            }
 
-        if (foundPath) {
-          console.log(chalk.green(`Found function at: ${foundPath}`));
-          functionPath = foundPath;
-          functionConfig.dirPath = foundPath;
+            await this.controller.reloadConfig();
+            functionConfig.dirPath = downloadedPath;
+            functionPath = downloadedPath;
+          } catch (error) {
+            console.error(
+              chalk.red("Failed to download function deployment:"),
+              error
+            );
+            return;
+          }
         } else {
           console.log(
             chalk.red(
-              `Function ${functionConfig.name} not found locally in any subdirectory. Cannot deploy.`
+              `Function ${functionConfig.name} not found locally. Cannot deploy.`
             )
           );
           return;
         }
       }
+    }
 
-      if (!this.controller.appwriteServer) {
-        console.log(chalk.red("Appwrite server not initialized"));
-        return;
-      }
+    if (!this.controller.appwriteServer) {
+      console.log(chalk.red("Appwrite server not initialized"));
+      return;
+    }
 
+    try {
       await deployLocalFunction(
         this.controller.appwriteServer,
         functionConfig.name,
         functionConfig
       );
+      console.log(chalk.green("✨ Function deployed successfully!"));
+    } catch (error) {
+      console.error(chalk.red("Failed to deploy function:"), error);
     }
   }
 
@@ -695,67 +637,42 @@ export class InteractiveCLI {
 
   private async selectFunctions(
     message: string,
-    multiSelect = true,
-    preferLocal = false
+    multiple: boolean = true,
+    includeRemote: boolean = false
   ): Promise<AppwriteFunction[]> {
-    await this.initControllerIfNeeded();
-
-    const configFunctions = this.getLocalFunctions();
-    let remoteFunctions: Models.Function[] = [];
-
-    try {
-      const functions = await this.controller!.listAllFunctions();
-      remoteFunctions = functions;
-    } catch (error) {
-      console.log(
-        chalk.yellow(
-          `Note: Remote functions not available, using only local functions`
-        )
-      );
-    }
-
-    // Combine functions based on whether we're deploying or not
-    const allFunctions = preferLocal
-      ? [
-          ...configFunctions,
-          ...remoteFunctions.map((f) => AppwriteFunctionSchema.parse(f)),
-        ]
-      : [
-          ...remoteFunctions.map((f) => AppwriteFunctionSchema.parse(f)),
-          ...configFunctions.filter(
-            (f) => !remoteFunctions.some((rf) => rf.name === f.name)
-          ),
-        ];
-
-    if (allFunctions.length === 0) {
-      console.log(chalk.red("No functions available"));
-      return [];
-    }
+    const remoteFunctions = includeRemote
+      ? await listFunctions(this.controller!.appwriteServer!, [
+          Query.limit(1000),
+        ])
+      : { functions: [] };
+    const localFunctions = this.getLocalFunctions();
 
-    const choices = allFunctions
-      .sort((a, b) => a.name.localeCompare(b.name))
-      .map((func) => ({
-        name: func.name,
-        value: func,
-      }));
+    // Combine functions, preferring local ones
+    const allFunctions = [
+      ...localFunctions,
+      ...remoteFunctions.functions.filter(
+        (rf) => !localFunctions.some((lf) => lf.name === rf.name)
+      ),
+    ];
 
     const { selectedFunctions } = await inquirer.prompt([
       {
-        type: multiSelect ? "checkbox" : "list",
+        type: multiple ? "checkbox" : "list",
         name: "selectedFunctions",
-        message: chalk.blue(message),
-        choices,
+        message,
+        choices: allFunctions.map((f) => ({
+          name: `${f.name} (${f.$id})${
+            localFunctions.some((lf) => lf.name === f.name)
+              ? " (Local)"
+              : " (Remote)"
+          }`,
+          value: f,
+        })),
         loop: true,
-        pageSize: 10,
       },
     ]);
 
-    // For single selection, ensure we return an array
-    if (!multiSelect) {
-      return selectedFunctions ? [selectedFunctions] : [];
-    }
-
-    return selectedFunctions || [];
+    return multiple ? selectedFunctions : [selectedFunctions];
   }
 
   private getLocalFunctions(): AppwriteFunction[] {