@uagents/syncenv-cli 0.1.5 → 0.1.7

package/dist/index.js

@@ -14,10 +14,12 @@ import {
   isKEKCached,
   lockKEK,
   unlockAndStoreKEK
-} from "./chunk-JBMZAAVP.js";
+} from "./chunk-LWTV6MO2.js";
 import {
   clearAuthState,
+  clearConfig,
   client,
+  deleteConfig,
   getConfig,
   getConfigPath,
   getOrUnlockUserKEK,
@@ -25,10 +27,11 @@ import {
   isAuthenticated,
   loadConfig,
   loadProjectConfig,
+  resolveProjectIdentifier,
   saveProjectConfig,
   setConfig,
   withAuthGuard
-} from "./chunk-OVEYHV4C.js";
+} from "./chunk-YXE467TO.js";
 import {
   applyMergeStrategy,
   interactiveMerge,
@@ -36,11 +39,11 @@ import {
 } from "./chunk-F7ZZUTRW.js";
 
 // src/index.ts
-import chalk8 from "chalk";
-import { Command as Command7 } from "commander";
 import { readFileSync } from "fs";
 import { dirname as dirname2, join as join2 } from "path";
 import { fileURLToPath } from "url";
+import chalk10 from "chalk";
+import { Command as Command9 } from "commander";
 
 // src/commands/auth.ts
 import chalk2 from "chalk";
@@ -134,8 +137,8 @@ authCommands.command("signup").description("Guide to create a new account via we
   console.log("  \u2022 Secure password setup");
   console.log("  \u2022 User-friendly interface");
   console.log();
-  const apiUrl = getConfig("apiUrl") || "https://syncenv.uagents.app";
-  const signupUrl = `${apiUrl}/signup`;
+  const apiUrl = getConfig("apiUrl") || "https://syncenv-api.uagents.app";
+  const signupUrl = apiUrl.replace("-api", "") + "/signup";
   console.log(chalk2.cyan("\u{1F310} Please visit:"));
   console.log(chalk2.bold(signupUrl));
   console.log();
@@ -161,7 +164,8 @@ authCommands.command("signup").description("Guide to create a new account via we
   success("Waiting for you to complete registration...");
   info("Once done, run: syncenv auth login");
 });
-authCommands.command("login").description("Login to your account").option("-e, --email <email>", "email address").action(async (options) => {
+authCommands.command("login").description("Login to your account").option("-e, --email <email>", "email address").option("--debug", "enable debug mode with verbose logging").action(async (options) => {
+  const isDebug = options.debug || process.env.SYNCENV_DEBUG === "true";
   try {
     let email = options.email;
     if (!email) {
@@ -186,29 +190,95 @@ authCommands.command("login").description("Login to your account").option("-e, -
         mask: "*"
       }
     ]);
+    if (isDebug) {
+      console.log(chalk2.dim("\n[DEBUG] Configuration:"));
+      console.log(chalk2.dim(`  API URL: ${getConfig("apiUrl")}`));
+      console.log(chalk2.dim(`  Email: ${email}`));
+      console.log(chalk2.dim(`  Debug Mode: ${isDebug}
+`));
+    }
     const spinner = createSpinner("Authenticating...");
     spinner.start();
     try {
       const apiUrl = getConfig("apiUrl");
-      const loginResponse = await fetch(`${apiUrl}/api/auth/sign-in/email`, {
+      const webOrigin = apiUrl.replace("-api", "");
+      const origin = apiUrl.startsWith("http://localhost") ? apiUrl : webOrigin;
+      const loginUrl = `${apiUrl}/api/auth/sign-in/email`;
+      const requestHeaders = {
+        "Content-Type": "application/json",
+        Origin: origin
+      };
+      if (isDebug) {
+        spinner.stop();
+        console.log(chalk2.dim("\n[DEBUG] Login Request:"));
+        console.log(chalk2.dim(`  URL: ${loginUrl}`));
+        console.log(chalk2.dim(`  Method: POST`));
+        console.log(chalk2.dim(`  Headers:`));
+        console.log(chalk2.dim(`    Content-Type: ${requestHeaders["Content-Type"]}`));
+        console.log(chalk2.dim(`    Origin: ${requestHeaders.Origin}`));
+        console.log(chalk2.dim(`  Body: { email: "${email}", password: "***" }
+`));
+        spinner.start("Authenticating...");
+      }
+      const loginResponse = await fetch(loginUrl, {
         method: "POST",
-        headers: { "Content-Type": "application/json" },
+        headers: requestHeaders,
         body: JSON.stringify({ email, password })
       });
+      if (isDebug) {
+        spinner.stop();
+        console.log(chalk2.dim("[DEBUG] Login Response:"));
+        console.log(chalk2.dim(`  Status: ${loginResponse.status} ${loginResponse.statusText}`));
+        console.log(chalk2.dim(`  Headers:`));
+        loginResponse.headers.forEach((value, key) => {
+          if (key.toLowerCase() === "set-cookie") {
+            console.log(chalk2.dim(`    ${key}: [redacted]`));
+          } else {
+            console.log(chalk2.dim(`    ${key}: ${value}`));
+          }
+        });
+        console.log("");
+        spinner.start("Authenticating...");
+      }
       if (!loginResponse.ok) {
-        const errorData = await loginResponse.json().catch(() => ({ error: "Login failed" }));
+        const errorText = await loginResponse.text().catch(() => "Login failed");
+        let errorData = {};
+        try {
+          errorData = JSON.parse(errorText);
+        } catch {
+          errorData = { error: errorText };
+        }
+        if (isDebug) {
+          spinner.stop();
+          console.log(chalk2.dim("[DEBUG] Error Response Body:"));
+          console.log(chalk2.dim(`  ${errorText}
+`));
+        }
         throw new Error(errorData.error || errorData.message || "Login failed");
       }
       const setCookie = loginResponse.headers.getSetCookie?.() || (loginResponse.headers.get("set-cookie") ? [loginResponse.headers.get("set-cookie")] : []);
       if (setCookie.length > 0) {
-        const { storeCookies } = await import("./cookie-store-Z6DNTUGS.js");
+        const { storeCookies } = await import("./cookie-store-UGGEBXBV.js");
         storeCookies(setCookie);
       }
       const result = await loginResponse.json();
+      if (isDebug) {
+        spinner.stop();
+        console.log(chalk2.dim("[DEBUG] Login Success:"));
+        console.log(chalk2.dim(`  User ID: ${result.user.id}`));
+        console.log(chalk2.dim(`  Email: ${result.user.email}`));
+        console.log(chalk2.dim(`  Name: ${result.user.name}
+`));
+        spinner.start("Finalizing...");
+      }
       setConfig("userId", result.user.id);
       setConfig("userEmail", result.user.email);
       spinner.succeed("Authenticated");
       success("Session active");
+      if (isDebug) {
+        info(`User: ${result.user.email}`);
+        info(`Cookies stored: ${setCookie.length > 0 ? "Yes" : "No"}`);
+      }
     } catch (err) {
       spinner.fail("Authentication failed");
       throw err;
@@ -218,8 +288,14 @@ authCommands.command("login").description("Login to your account").option("-e, -
     process.exit(1);
   }
 });
-authCommands.command("logout").description("Logout and clear session").action(async () => {
+authCommands.command("logout").description("Logout and clear session").option("--debug", "enable debug mode with verbose logging").action(async (options) => {
+  const isDebug = options.debug || process.env.SYNCENV_DEBUG === "true";
   try {
+    if (isDebug) {
+      console.log(chalk2.dim("\n[DEBUG] Logout Command"));
+      console.log(chalk2.dim(`[DEBUG] Authenticated: ${isAuthenticated()}
+`));
+    }
     if (!isAuthenticated()) {
       info("Not logged in.");
       return;
@@ -228,18 +304,38 @@ authCommands.command("logout").description("Logout and clear session").action(as
     spinner.start();
     try {
       await client.request("POST", "/api/auth/signout");
-    } catch {
+      if (isDebug) {
+        console.log(chalk2.dim("[DEBUG] Server signout successful"));
+      }
+    } catch (err) {
+      if (isDebug) {
+        console.log(chalk2.dim(`[DEBUG] Server signout error (ignored): ${err.message}`));
+      }
     }
     await clearAuthState();
+    if (isDebug) {
+      console.log(chalk2.dim("[DEBUG] Local auth state cleared"));
+    }
     spinner.succeed("Logged out");
     success("Session terminated and local keys cleared");
   } catch (err) {
+    if (isDebug) {
+      console.log(chalk2.dim(`
+[DEBUG] Logout error: ${err.message}`));
+      console.log(chalk2.dim(`[DEBUG] Error stack: ${err.stack}`));
+    }
     error("Logout failed:", err.message);
     process.exit(1);
   }
 });
-authCommands.command("status").description("Check authentication status").action(async () => {
+authCommands.command("status").description("Check authentication status").option("--debug", "enable debug mode with verbose logging").action(async (options) => {
+  const isDebug = options.debug || process.env.SYNCENV_DEBUG === "true";
   try {
+    if (isDebug) {
+      console.log(chalk2.dim("\n[DEBUG] Status Command"));
+      console.log(chalk2.dim(`[DEBUG] Authenticated: ${isAuthenticated()}
+`));
+    }
     if (!isAuthenticated()) {
       info("Not authenticated. Run `syncenv auth login` to login.");
       return;
@@ -247,6 +343,9 @@ authCommands.command("status").description("Check authentication status").action
     const { data: session } = await withAuthGuard(
       () => client.request("GET", "/api/auth/get-session")
     );
+    if (isDebug) {
+      console.log(chalk2.dim("[DEBUG] Session fetched from server"));
+    }
     if (session.session) {
       console.log(
         `${chalk2.green("\u2713")} Authenticated as ${chalk2.cyan(session.session.user.email)}`
@@ -256,12 +355,23 @@ authCommands.command("status").description("Check authentication status").action
       info("Session expired. Please login again.");
     }
   } catch (err) {
+    if (isDebug) {
+      console.log(chalk2.dim(`
+[DEBUG] Status error: ${err.message}`));
+      console.log(chalk2.dim(`[DEBUG] Error stack: ${err.stack}`));
+    }
     error("Failed to check status:", err.message);
     process.exit(1);
   }
 });
-authCommands.command("change-password").description("Change your account password").action(async () => {
+authCommands.command("change-password").description("Change your account password").option("--debug", "enable debug mode with verbose logging").action(async (options) => {
+  const isDebug = options.debug || process.env.SYNCENV_DEBUG === "true";
   try {
+    if (isDebug) {
+      console.log(chalk2.dim("\n[DEBUG] Change Password Command"));
+      console.log(chalk2.dim(`[DEBUG] Authenticated: ${isAuthenticated()}
+`));
+    }
     if (!isAuthenticated()) {
       error("Not authenticated. Run `syncenv auth login` first.");
       process.exit(1);
@@ -312,8 +422,14 @@ authCommands.command("change-password").description("Change your account passwor
           }
         })
       );
+      if (isDebug) {
+        console.log(chalk2.dim("[DEBUG] Account password changed successfully"));
+      }
       try {
         const userKeys = await withAuthGuard(() => client.userKeys.get());
+        if (isDebug) {
+          console.log(chalk2.dim("[DEBUG] User has encryption keys, re-encrypting..."));
+        }
         spinner.text = "Re-encrypting encryption keys...";
         const { unlockUserKEK: unlockUserKEK2, reencryptUserKEK: reencryptUserKEK2 } = await import("./crypto-X7MZU7DV.js");
         const userKek = await unlockUserKEK2(
@@ -328,10 +444,16 @@ authCommands.command("change-password").description("Change your account passwor
           info("Run `syncenv user-keys rotate` to fix this.");
           return;
         }
+        if (isDebug) {
+          console.log(chalk2.dim("[DEBUG] User KEK decrypted with old password"));
+        }
         const { encryptedUserKek, kekIv, kekSalt } = await reencryptUserKEK2(
           userKek,
           answers.newPassword
         );
+        if (isDebug) {
+          console.log(chalk2.dim("[DEBUG] User KEK re-encrypted with new password"));
+        }
         await withAuthGuard(
           () => client.userKeys.update({
             encryptedUserKek,
@@ -339,60 +461,310 @@ authCommands.command("change-password").description("Change your account passwor
             kekSalt
           })
         );
-        const { saveEncryptedKEK, saveKEKPassword, getKEKPassword } = await import("./secure-storage-UEK3LD5L.js");
+        if (isDebug) {
+          console.log(chalk2.dim("[DEBUG] Updated encrypted keys on server"));
+        }
+        const { saveEncryptedKEK, saveKEKPassword, getKEKPassword } = await import("./secure-storage-AR7HZFTA.js");
         saveEncryptedKEK({ encryptedUserKek, kekIv, kekSalt });
         const existingPassword = await getKEKPassword();
         if (existingPassword) {
           await saveKEKPassword(answers.newPassword);
+          if (isDebug) {
+            console.log(chalk2.dim("[DEBUG] Updated stored password in keychain"));
+          }
         }
       } catch (err) {
         if (!err.message?.includes("404")) {
           throw err;
         }
+        if (isDebug) {
+          console.log(
+            chalk2.dim("[DEBUG] User has no encryption keys (404), skipping key re-encryption")
+          );
+        }
       }
       spinner.succeed("Password changed successfully");
       success("Your account password has been updated");
     } catch (err) {
+      if (isDebug) {
+        console.log(chalk2.dim(`
+[DEBUG] Change password error: ${err.message}`));
+        console.log(chalk2.dim(`[DEBUG] Error stack: ${err.stack}`));
+      }
       spinner.fail("Failed to change password");
       throw err;
     }
   } catch (err) {
+    if (isDebug) {
+      console.log(chalk2.dim(`
+[DEBUG] Outer change password error: ${err.message}`));
+      console.log(chalk2.dim(`[DEBUG] Error stack: ${err.stack}`));
+    }
     error("Change password failed:", err.message);
     process.exit(1);
   }
 });
 
-// src/commands/doctor.ts
-import fs from "fs/promises";
+// src/commands/config.ts
 import chalk3 from "chalk";
 import { Command as Command2 } from "commander";
-var doctorCommand = new Command2("doctor").description("Diagnose configuration and connectivity issues").action(async () => {
+import inquirer2 from "inquirer";
+var CONFIG_KEYS = {
+  apiUrl: {
+    description: "API base URL",
+    defaultValue: "https://syncenv-api.uagents.app",
+    validate: (val) => {
+      try {
+        new URL(val);
+        return true;
+      } catch {
+        return "Please enter a valid URL";
+      }
+    }
+  },
+  autoLockMinutes: {
+    description: "Auto-lock timeout in minutes (0 to disable)",
+    defaultValue: "30",
+    validate: (val) => {
+      const num = parseInt(val);
+      if (isNaN(num) || num < 0) return "Please enter a positive number or 0";
+      return true;
+    },
+    transform: (val) => parseInt(val)
+  }
+};
+var ALL_KEYS = ["apiUrl", "autoLockMinutes"];
+var configCommands = new Command2("config").description("Manage CLI configuration");
+configCommands.command("list").alias("ls").description("List all configuration values").option("--debug", "enable debug mode with verbose logging").action(async (options) => {
+  const isDebug = options.debug || process.env.SYNCENV_DEBUG === "true";
+  try {
+    if (isDebug) {
+      console.log(chalk3.dim("\n[DEBUG] Config List Command\n"));
+    }
+    console.log(chalk3.bold("\nConfiguration:"));
+    console.log(chalk3.dim("\u2500".repeat(60)));
+    for (const [key, meta] of Object.entries(CONFIG_KEYS)) {
+      const value = getConfig(key);
+      const displayValue = value !== void 0 ? chalk3.green(String(value)) : chalk3.gray("(not set)");
+      console.log(`${key.padEnd(20)} ${displayValue}`);
+      console.log(chalk3.dim(`  ${meta.description}`));
+      if (value === void 0) {
+        console.log(chalk3.dim(`  Default: ${meta.defaultValue}`));
+      }
+      console.log();
+    }
+    console.log(chalk3.dim(`Config file: ${getConfigPath()}`));
+    console.log();
+  } catch (err) {
+    if (isDebug) {
+      console.log(chalk3.dim(`
+[DEBUG] List error: ${err.message}`));
+      console.log(chalk3.dim(`[DEBUG] Error stack: ${err.stack}`));
+    }
+    error("Failed to list config:", err.message);
+    process.exit(1);
+  }
+});
+configCommands.command("get <key>").description("Get a configuration value").option("--debug", "enable debug mode with verbose logging").action(async (key, options) => {
+  const isDebug = options.debug || process.env.SYNCENV_DEBUG === "true";
+  try {
+    if (isDebug) {
+      console.log(chalk3.dim("\n[DEBUG] Config Get Command"));
+      console.log(chalk3.dim(`[DEBUG] Key: ${key}
+`));
+    }
+    if (!ALL_KEYS.includes(key)) {
+      error(`Unknown config key: ${key}`);
+      info(`Valid keys: ${ALL_KEYS.join(", ")}`);
+      process.exit(1);
+    }
+    const value = getConfig(key);
+    const meta = CONFIG_KEYS[key];
+    if (value === void 0) {
+      console.log(chalk3.gray("(not set)"));
+      info(`Default: ${meta.defaultValue}`);
+    } else {
+      console.log(String(value));
+    }
+  } catch (err) {
+    if (isDebug) {
+      console.log(chalk3.dim(`
+[DEBUG] Get error: ${err.message}`));
+      console.log(chalk3.dim(`[DEBUG] Error stack: ${err.stack}`));
+    }
+    error("Failed to get config:", err.message);
+    process.exit(1);
+  }
+});
+configCommands.command("set <key> [value]").description("Set a configuration value").option("--debug", "enable debug mode with verbose logging").action(async (key, value, options) => {
+  const isDebug = options.debug || process.env.SYNCENV_DEBUG === "true";
+  try {
+    if (isDebug) {
+      console.log(chalk3.dim("\n[DEBUG] Config Set Command"));
+      console.log(chalk3.dim(`[DEBUG] Key: ${key}`));
+      console.log(chalk3.dim(`[DEBUG] Value: ${value}
+`));
+    }
+    if (!ALL_KEYS.includes(key)) {
+      error(`Unknown config key: ${key}`);
+      info(`Valid keys: ${ALL_KEYS.join(", ")}`);
+      process.exit(1);
+    }
+    const meta = CONFIG_KEYS[key];
+    let finalValue = value;
+    if (!value) {
+      const currentValue = getConfig(key);
+      const { inputValue } = await inquirer2.prompt([
+        {
+          type: "input",
+          name: "inputValue",
+          message: `Enter value for ${key}:`,
+          default: currentValue !== void 0 ? String(currentValue) : meta.defaultValue,
+          validate: meta.validate
+        }
+      ]);
+      finalValue = inputValue;
+    }
+    const validation = meta.validate?.(String(finalValue));
+    if (validation !== true) {
+      error(`Invalid value: ${validation}`);
+      process.exit(1);
+    }
+    const transformedValue = meta.transform ? meta.transform(String(finalValue)) : finalValue;
+    setConfig(key, transformedValue);
+    success(`${key} set to: ${transformedValue}`);
+  } catch (err) {
+    if (isDebug) {
+      console.log(chalk3.dim(`
+[DEBUG] Set error: ${err.message}`));
+      console.log(chalk3.dim(`[DEBUG] Error stack: ${err.stack}`));
+    }
+    error("Failed to set config:", err.message);
+    process.exit(1);
+  }
+});
+configCommands.command("delete <key>").alias("rm").description("Delete a configuration value (reset to default)").option("--debug", "enable debug mode with verbose logging").action(async (key, options) => {
+  const isDebug = options.debug || process.env.SYNCENV_DEBUG === "true";
+  try {
+    if (isDebug) {
+      console.log(chalk3.dim("\n[DEBUG] Config Delete Command"));
+      console.log(chalk3.dim(`[DEBUG] Key: ${key}
+`));
+    }
+    if (!ALL_KEYS.includes(key)) {
+      error(`Unknown config key: ${key}`);
+      info(`Valid keys: ${ALL_KEYS.join(", ")}`);
+      process.exit(1);
+    }
+    const currentValue = getConfig(key);
+    if (currentValue === void 0) {
+      warning(`${key} is not set`);
+      return;
+    }
+    const { confirm } = await inquirer2.prompt([
+      {
+        type: "confirm",
+        name: "confirm",
+        message: `Reset ${key} to default?`,
+        default: false
+      }
+    ]);
+    if (!confirm) {
+      info("Cancelled.");
+      return;
+    }
+    deleteConfig(key);
+    success(`${key} reset to default`);
+    const meta = CONFIG_KEYS[key];
+    info(`Default value: ${meta.defaultValue}`);
+  } catch (err) {
+    if (isDebug) {
+      console.log(chalk3.dim(`
+[DEBUG] Delete error: ${err.message}`));
+      console.log(chalk3.dim(`[DEBUG] Error stack: ${err.stack}`));
+    }
+    error("Failed to delete config:", err.message);
+    process.exit(1);
+  }
+});
+configCommands.command("reset").description("Reset all configuration to defaults").option("-f, --force", "skip confirmation").option("--debug", "enable debug mode with verbose logging").action(async (options) => {
+  const isDebug = options.debug || process.env.SYNCENV_DEBUG === "true";
+  try {
+    if (isDebug) {
+      console.log(chalk3.dim("\n[DEBUG] Config Reset Command\n"));
+    }
+    if (!options.force) {
+      const { confirm } = await inquirer2.prompt([
+        {
+          type: "confirm",
+          name: "confirm",
+          message: "Reset ALL configuration to defaults? This cannot be undone.",
+          default: false
+        }
+      ]);
+      if (!confirm) {
+        info("Cancelled.");
+        return;
+      }
+    }
+    clearConfig();
+    success("All configuration reset to defaults");
+    info(`Config file: ${getConfigPath()}`);
+  } catch (err) {
+    if (isDebug) {
+      console.log(chalk3.dim(`
+[DEBUG] Reset error: ${err.message}`));
+      console.log(chalk3.dim(`[DEBUG] Error stack: ${err.stack}`));
+    }
+    error("Failed to reset config:", err.message);
+    process.exit(1);
+  }
+});
+configCommands.command("path").description("Show configuration file path").action(() => {
+  console.log(getConfigPath());
+});
+
+// src/commands/doctor.ts
+import fs from "fs/promises";
+import chalk4 from "chalk";
+import { Command as Command3 } from "commander";
+var doctorCommand = new Command3("doctor").description("Diagnose configuration and connectivity issues").option("--debug", "enable debug mode with verbose logging").action(async (options) => {
+  const isDebug = options.debug || process.env.SYNCENV_DEBUG === "true";
   let exitCode = 0;
-  console.log(chalk3.bold("\n\u{1F50D} SyncEnv Doctor\n"));
+  if (isDebug) {
+    console.log(chalk4.dim("\n[DEBUG] Doctor Command\n"));
+  }
+  console.log(chalk4.bold("\n\u{1F50D} SyncEnv Doctor\n"));
   const nodeVersion = process.version;
   const majorVersion = parseInt(nodeVersion.slice(1).split(".")[0]);
-  console.log(chalk3.dim("Checking Node.js version..."));
+  console.log(chalk4.dim("Checking Node.js version..."));
+  if (isDebug) {
+    console.log(chalk4.dim(`[DEBUG] Node.js version: ${nodeVersion}`));
+  }
   if (majorVersion >= 18) {
     success(`Node.js ${nodeVersion}`);
   } else {
     error(`Node.js ${nodeVersion} (>= 18 required)`);
     exitCode = 1;
   }
-  console.log(chalk3.dim("\nChecking configuration..."));
+  console.log(chalk4.dim("\nChecking configuration..."));
   const configPath = getConfigPath();
+  if (isDebug) {
+    console.log(chalk4.dim(`[DEBUG] Config path: ${configPath}`));
+  }
   try {
     await fs.access(configPath);
     success(`Config file exists: ${configPath}`);
   } catch {
     warning(`Config file not found: ${configPath}`);
   }
-  console.log(chalk3.dim("\nChecking project configuration..."));
+  console.log(chalk4.dim("\nChecking project configuration..."));
   const hasConfig = await hasProjectConfig();
   if (hasConfig) {
     try {
       const config = await loadProjectConfig();
       if (config) {
-        success(`.envsyncrc found`);
+        success(`.syncenvrc found`);
         info(`  Project: ${config.project.name}`);
         if (config.project.id) {
           info(`  Project ID: ${config.project.id}`);
@@ -402,13 +774,13 @@ var doctorCommand = new Command2("doctor").description("Diagnose configuration a
         info(`  Default env: ${config.defaults.environment}`);
       }
     } catch (err) {
-      error(`.envsyncrc exists but is invalid: ${err.message}`);
+      error(`.syncenvrc exists but is invalid: ${err.message}`);
       exitCode = 1;
     }
   } else {
-    warning(`.envsyncrc not found - run \`syncenv init\``);
+    warning(`.syncenvrc not found - run \`syncenv init\``);
   }
-  console.log(chalk3.dim("\nChecking authentication..."));
+  console.log(chalk4.dim("\nChecking authentication..."));
   if (isAuthenticated()) {
     const userEmail = getConfig("userEmail");
     success(`Authenticated as ${userEmail}`);
@@ -428,8 +800,11 @@ var doctorCommand = new Command2("doctor").description("Diagnose configuration a
   } else {
     warning(`Not authenticated - run \`syncenv auth login\``);
   }
-  console.log(chalk3.dim("\nChecking API connectivity..."));
-  const apiUrl = process.env.SYNCENV_API_URL || getConfig("apiUrl") || "http://localhost:8787";
+  console.log(chalk4.dim("\nChecking API connectivity..."));
+  const apiUrl = process.env.SYNCENV_API_URL || getConfig("apiUrl") || "https://syncenv-api.uagents.app";
+  if (isDebug) {
+    console.log(chalk4.dim(`[DEBUG] API URL: ${apiUrl}`));
+  }
   try {
     const response = await fetch(apiUrl);
     if (response.ok) {
@@ -443,6 +818,9 @@ var doctorCommand = new Command2("doctor").description("Diagnose configuration a
   } catch (err) {
     error(`Cannot connect to API at ${apiUrl}`);
     info(`  Error: ${err.message}`);
+    if (isDebug) {
+      console.log(chalk4.dim(`[DEBUG] Connection error details: ${err.stack}`));
+    }
     exitCode = 1;
   }
   console.log("");
@@ -456,9 +834,9 @@ var doctorCommand = new Command2("doctor").description("Diagnose configuration a
 
 // src/commands/env.ts
 import fs2 from "fs/promises";
-import chalk4 from "chalk";
-import { Command as Command3 } from "commander";
-import inquirer2 from "inquirer";
+import chalk5 from "chalk";
+import { Command as Command4 } from "commander";
+import inquirer3 from "inquirer";
 
 // src/state/index.ts
 import { existsSync } from "fs";
@@ -466,7 +844,7 @@ import { readFile, writeFile, mkdir } from "fs/promises";
 import { homedir } from "os";
 import { join, dirname } from "path";
 var STATE_VERSION = 1;
-var STATE_DIR = ".envsync";
+var STATE_DIR = ".syncenv";
 var STATE_FILE = "state.json";
 var StateManager = class {
   statePath;
@@ -641,17 +1019,23 @@ function createStateManager(options) {
 var globalState = createStateManager();
 
 // src/commands/env.ts
-var envCommands = new Command3("env").description("Environment variable commands");
-envCommands.command("push").description("Push .env file to server").option("-p, --project <id>", "project ID").option("-e, --env <name>", "environment name").option("-f, --file <path>", "file path").option("-m, --message <message>", "change description").option("--force", "force push without conflict check").option("--strategy <strategy>", "merge strategy on conflict: local-wins, remote-wins, fail-on-conflict").action(async (options) => {
+var envCommands = new Command4("env").description("Environment variable commands");
+envCommands.command("push").description("Push .env file to server").option("-p, --project <identifier>", "project ID or name").option("-e, --env <name>", "environment name").option("-f, --file <path>", "file path").option("-m, --message <message>", "change description").option("--force", "force push without conflict check").option(
+  "--strategy <strategy>",
+  "merge strategy on conflict: local-wins, remote-wins, fail-on-conflict"
+).action(async (options) => {
   try {
     if (!isAuthenticated()) {
       error("Not authenticated. Run `syncenv auth login` first.");
       process.exit(1);
     }
     const config = await loadProjectConfig();
-    const projectId = options.project || config?.project.id || getConfig("defaultProject");
+    const projectId = options.project || config?.project.id;
     if (!projectId) {
-      error("No project specified. Use --project or run `syncenv init`");
+      error("No project specified.");
+      info("Use one of the following:");
+      info("  --project <id>    Specify project ID for this command");
+      info("  syncenv project use <id>  Set default project for current directory");
       process.exit(1);
     }
     const envName = options.env || config?.defaults.environment || "dev";
@@ -708,10 +1092,24 @@ envCommands.command("push").description("Push .env file to server").option("-p,
           warning(`Remote has been modified (version ${localVersion} \u2192 ${remoteVersion})`);
           info("Attempting to merge...\n");
           try {
-            const baseDownload = await client.environments.downloadContent(environment.id, localVersion);
-            const baseContent = decryptContent(baseDownload.content, baseDownload.encryptionIv, dek);
-            const remoteDownload = await client.environments.downloadContent(environment.id, remoteVersion);
-            const remoteContent = decryptContent(remoteDownload.content, remoteDownload.encryptionIv, dek);
+            const baseDownload = await client.environments.downloadContent(
+              environment.id,
+              localVersion
+            );
+            const baseContent = decryptContent(
+              baseDownload.content,
+              baseDownload.encryptionIv,
+              dek
+            );
+            const remoteDownload = await client.environments.downloadContent(
+              environment.id,
+              remoteVersion
+            );
+            const remoteContent = decryptContent(
+              remoteDownload.content,
+              remoteDownload.encryptionIv,
+              dek
+            );
             const mergeInput = {
               base: parseEnvFile(baseContent),
               local: parseEnvFile(content),
@@ -719,10 +1117,10 @@ envCommands.command("push").description("Push .env file to server").option("-p,
             };
             const mergeResult = threeWayMerge(mergeInput);
             if (mergeResult.autoMerged) {
-              info(chalk4.green("\u2713 Auto-merged successfully"));
-              info(chalk4.dim(`  Added: ${mergeResult.statistics.added}`));
-              info(chalk4.dim(`  Modified: ${mergeResult.statistics.modified}`));
-              info(chalk4.dim(`  Deleted: ${mergeResult.statistics.deleted}`));
+              info(chalk5.green("\u2713 Auto-merged successfully"));
+              info(chalk5.dim(`  Added: ${mergeResult.statistics.added}`));
+              info(chalk5.dim(`  Modified: ${mergeResult.statistics.modified}`));
+              info(chalk5.dim(`  Deleted: ${mergeResult.statistics.deleted}`));
               const mergedEncrypted = encryptContent(mergeResult.mergedContent, dek);
               spinner.start("Uploading merged content...");
               const envId = environment.id;
@@ -734,7 +1132,13 @@ envCommands.command("push").description("Push .env file to server").option("-p,
                   changeSummary: options.message || `Merged with remote version ${remoteVersion}`
                 })
               );
-              await stateManager.recordSync(projectId, envId, updateResult.version, generateContentHash(mergeResult.mergedContent), "merge");
+              await stateManager.recordSync(
+                projectId,
+                envId,
+                updateResult.version,
+                generateContentHash(mergeResult.mergedContent),
+                "merge"
+              );
               spinner.succeed("Merged and uploaded");
               success(`Environment "${envName}" updated to version ${updateResult.version}`);
               return;
@@ -760,7 +1164,13 @@ envCommands.command("push").description("Push .env file to server").option("-p,
                   changeSummary: options.message || `Merged with remote version ${remoteVersion} (with conflict resolution)`
                 })
               );
-              await stateManager.recordSync(projectId, envId, updateResult.version, generateContentHash(interactiveResult.content), "merge");
+              await stateManager.recordSync(
+                projectId,
+                envId,
+                updateResult.version,
+                generateContentHash(interactiveResult.content),
+                "merge"
+              );
               spinner.succeed("Resolved and uploaded");
               success(`Environment "${envName}" updated to version ${updateResult.version}`);
               return;
@@ -822,16 +1232,19 @@ envCommands.command("push").description("Push .env file to server").option("-p,
     process.exit(1);
   }
 });
-envCommands.command("pull").description("Pull .env file from server").option("-p, --project <id>", "project ID").option("-e, --env <name>", "environment name").option("-f, --file <path>", "output file path").option("-v, --version <number>", "specific version to pull").option("-m, --merge", "merge with existing file (using three-way merge if possible)").option("-y, --yes", "skip confirmation").action(async (options) => {
+envCommands.command("pull").description("Pull .env file from server").option("-p, --project <identifier>", "project ID or name").option("-e, --env <name>", "environment name").option("-f, --file <path>", "output file path").option("-v, --version <number>", "specific version to pull").option("-m, --merge", "merge with existing file (using three-way merge if possible)").option("-y, --yes", "skip confirmation").action(async (options) => {
   try {
     if (!isAuthenticated()) {
       error("Not authenticated. Run `syncenv auth login` first.");
       process.exit(1);
     }
     const config = await loadProjectConfig();
-    const projectId = options.project || config?.project.id || getConfig("defaultProject");
+    const projectId = options.project || config?.project.id;
     if (!projectId) {
-      error("No project specified. Use --project or run `syncenv init`");
+      error("No project specified.");
+      info("Use one of the following:");
+      info("  --project <id>    Specify project ID for this command");
+      info("  syncenv project use <id>  Set default project for current directory");
       process.exit(1);
     }
     const envName = options.env || config?.defaults.environment || "dev";
@@ -879,7 +1292,7 @@ envCommands.command("pull").description("Pull .env file from server").option("-p
     try {
       existingContent = await fs2.readFile(filePath, "utf-8");
       if (!options.yes && !options.merge) {
-        const { action } = await inquirer2.prompt([
+        const { action } = await inquirer3.prompt([
           {
             type: "list",
             name: "action",
@@ -909,19 +1322,19 @@ envCommands.command("pull").description("Pull .env file from server").option("-p
         info("No changes to merge.");
         return;
       }
-      console.log(chalk4.bold("\nMerge changes:"));
+      console.log(chalk5.bold("\nMerge changes:"));
       for (const key of diff.added) {
-        console.log(chalk4.green(`  + ${key}=${localEnv[key]}`));
+        console.log(chalk5.green(`  + ${key}=${localEnv[key]}`));
       }
       for (const key of diff.removed) {
-        console.log(chalk4.red(`  - ${key}`));
+        console.log(chalk5.red(`  - ${key}`));
       }
       for (const key of diff.modified) {
-        console.log(chalk4.yellow(`  ~ ${key}`));
-        console.log(chalk4.dim(`    local:  ${localEnv[key]}`));
-        console.log(chalk4.dim(`    remote: ${remoteEnv[key]}`));
+        console.log(chalk5.yellow(`  ~ ${key}`));
+        console.log(chalk5.dim(`    local:  ${localEnv[key]}`));
+        console.log(chalk5.dim(`    remote: ${remoteEnv[key]}`));
       }
-      const { mergeAction } = await inquirer2.prompt([
+      const { mergeAction } = await inquirer3.prompt([
         {
           type: "list",
           name: "mergeAction",
@@ -962,16 +1375,19 @@ envCommands.command("pull").description("Pull .env file from server").option("-p
     process.exit(1);
   }
 });
-envCommands.command("history").description("Show version history").option("-p, --project <id>", "project ID").option("-e, --env <name>", "environment name").option("-l, --limit <number>", "number of versions to show", "10").action(async (options) => {
+envCommands.command("history").description("Show version history").option("-p, --project <identifier>", "project ID or name").option("-e, --env <name>", "environment name").option("-l, --limit <number>", "number of versions to show", "10").action(async (options) => {
   try {
     if (!isAuthenticated()) {
       error("Not authenticated. Run `syncenv auth login` first.");
       process.exit(1);
     }
     const config = await loadProjectConfig();
-    const projectId = options.project || config?.project.id || getConfig("defaultProject");
+    const projectId = options.project || config?.project.id;
     if (!projectId) {
       error("No project specified.");
+      info("Use one of the following:");
+      info("  --project <id>    Specify project ID for this command");
+      info("  syncenv project use <id>  Set default project for current directory");
       process.exit(1);
     }
     const envName = options.env || config?.defaults.environment || "dev";
@@ -986,14 +1402,16 @@ envCommands.command("history").description("Show version history").option("-p, -
       spinner.fail(`Environment "${envName}" not found`);
       process.exit(1);
     }
-    const versions = await withAuthGuard(() => client.sync.getVersions(environment.id, parseInt(options.limit)));
+    const versions = await withAuthGuard(
+      () => client.sync.getVersions(environment.id, parseInt(options.limit))
+    );
     spinner.stop();
     if (versions.length === 0) {
       info("No versions found.");
       return;
     }
-    console.log(chalk4.bold("\nVERSION   DATE              AUTHOR        MESSAGE"));
-    console.log(chalk4.dim("\u2500".repeat(70)));
+    console.log(chalk5.bold("\nVERSION   DATE              AUTHOR        MESSAGE"));
+    console.log(chalk5.dim("\u2500".repeat(70)));
     for (const version2 of versions.slice(0, limit)) {
       const ver = String(version2.versionNumber).padEnd(9);
       const date = formatRelativeTime(version2.createdAt).padEnd(17);
@@ -1007,16 +1425,19 @@ envCommands.command("history").description("Show version history").option("-p, -
     process.exit(1);
   }
 });
-envCommands.command("diff <v1> <v2>").description("Compare two versions (not supported yet)").option("-p, --project <id>", "project ID").option("-e, --env <name>", "environment name").action(async (v1, v2, options) => {
+envCommands.command("diff <v1> <v2>").description("Compare two versions (not supported yet)").option("-p, --project <identifier>", "project ID or name").option("-e, --env <name>", "environment name").action(async (v1, v2, options) => {
   try {
     if (!isAuthenticated()) {
       error("Not authenticated. Run `syncenv auth login` first.");
       process.exit(1);
     }
     const config = await loadProjectConfig();
-    const projectId = options.project || config?.project.id || getConfig("defaultProject");
+    const projectId = options.project || config?.project.id;
     if (!projectId) {
       error("No project specified.");
+      info("Use one of the following:");
+      info("  --project <id>    Specify project ID for this command");
+      info("  syncenv project use <id>  Set default project for current directory");
       process.exit(1);
     }
     const envName = options.env || config?.defaults.environment || "dev";
@@ -1037,22 +1458,22 @@ envCommands.command("diff <v1> <v2>").description("Compare two versions (not sup
       client.environments.downloadContent(environment.id, version2)
     ]);
     spinner.stop();
-    console.log(chalk4.bold(`
+    console.log(chalk5.bold(`
 Comparing versions ${version1} and ${version2}`));
-    console.log(chalk4.dim("\u2500".repeat(50)));
-    console.log(chalk4.dim(`
+    console.log(chalk5.dim("\u2500".repeat(50)));
+    console.log(chalk5.dim(`
 Version ${version1}:`));
     console.log(`  Content hash: ${generateContentHash(download1.content).slice(0, 16)}...`);
     console.log(`  Date: ${(/* @__PURE__ */ new Date()).toLocaleString()}`);
-    console.log(chalk4.dim(`
+    console.log(chalk5.dim(`
 Version ${version2}:`));
     console.log(`  Content hash: ${generateContentHash(download2.content).slice(0, 16)}...`);
     console.log(`  Date: ${(/* @__PURE__ */ new Date()).toLocaleString()}`);
     if (download1.content !== download2.content) {
-      console.log(chalk4.yellow("\n\u26A0 Content differs between versions"));
+      console.log(chalk5.yellow("\n\u26A0 Content differs between versions"));
       info("Use `syncenv env pull --version <number>` to view a specific version");
     } else {
-      console.log(chalk4.green("\n\u2713 Content is identical"));
+      console.log(chalk5.green("\n\u2713 Content is identical"));
     }
     console.log("");
   } catch (err) {
@@ -1060,22 +1481,25 @@ Version ${version2}:`));
     process.exit(1);
   }
 });
-envCommands.command("rollback <version>").description("Rollback to a specific version").option("-p, --project <id>", "project ID").option("-e, --env <name>", "environment name").option("-y, --yes", "skip confirmation").action(async (version2, options) => {
+envCommands.command("rollback <version>").description("Rollback to a specific version").option("-p, --project <identifier>", "project ID or name").option("-e, --env <name>", "environment name").option("-y, --yes", "skip confirmation").action(async (version2, options) => {
   try {
     if (!isAuthenticated()) {
       error("Not authenticated. Run `syncenv auth login` first.");
       process.exit(1);
     }
     const config = await loadProjectConfig();
-    const projectId = options.project || config?.project.id || getConfig("defaultProject");
+    const projectId = options.project || config?.project.id;
     if (!projectId) {
       error("No project specified.");
+      info("Use one of the following:");
+      info("  --project <id>    Specify project ID for this command");
+      info("  syncenv project use <id>  Set default project for current directory");
       process.exit(1);
     }
     const envName = options.env || config?.defaults.environment || "dev";
     const targetVersion = parseInt(version2);
     if (!options.yes) {
-      const { confirm } = await inquirer2.prompt([
+      const { confirm } = await inquirer3.prompt([
         {
           type: "confirm",
           name: "confirm",
@@ -1131,16 +1555,19 @@ envCommands.command("rollback <version>").description("Rollback to a specific ve
     process.exit(1);
   }
 });
-envCommands.command("list-envs").description("List all environments for a project").option("-p, --project <id>", "project ID").action(async (options) => {
+envCommands.command("list-envs").description("List all environments for a project").option("-p, --project <identifier>", "project ID or name").action(async (options) => {
   try {
     if (!isAuthenticated()) {
       error("Not authenticated. Run `syncenv auth login` first.");
       process.exit(1);
     }
     const config = await loadProjectConfig();
-    const projectId = options.project || config?.project.id || getConfig("defaultProject");
+    const projectId = options.project || config?.project.id;
     if (!projectId) {
-      error("No project specified. Use --project or run `syncenv init`");
+      error("No project specified.");
+      info("Use one of the following:");
+      info("  --project <id>    Specify project ID for this command");
+      info("  syncenv project use <id>  Set default project for current directory");
       process.exit(1);
     }
     const spinner = createSpinner("Fetching environments...");
@@ -1155,11 +1582,11 @@ envCommands.command("list-envs").description("List all environments for a projec
       return;
     }
     const project = await withAuthGuard(() => client.projects.get(projectId));
-    console.log(chalk4.bold(`
+    console.log(chalk5.bold(`
 Environments for ${project.name}`));
-    console.log(chalk4.dim("\u2500".repeat(70)));
-    console.log(chalk4.bold("NAME        VERSION   SIZE      LAST MODIFIED     DESCRIPTION"));
-    console.log(chalk4.dim("\u2500".repeat(70)));
+    console.log(chalk5.dim("\u2500".repeat(70)));
+    console.log(chalk5.bold("NAME        VERSION   SIZE      LAST MODIFIED     DESCRIPTION"));
+    console.log(chalk5.dim("\u2500".repeat(70)));
     for (const env of environments) {
       const name = env.name.padEnd(11).slice(0, 11);
       const version2 = `v${env.currentVersion || 1}`.padEnd(9);
@@ -1174,21 +1601,24 @@ Environments for ${project.name}`));
     process.exit(1);
   }
 });
-envCommands.command("create-env").description("Create a new environment for a project").option("-p, --project <id>", "project ID").option("-n, --name <name>", "environment name").option("-d, --description <description>", "environment description").action(async (options) => {
+envCommands.command("create-env").description("Create a new environment for a project").option("-p, --project <identifier>", "project ID or name").option("-n, --name <name>", "environment name").option("-d, --description <description>", "environment description").action(async (options) => {
   try {
     if (!isAuthenticated()) {
       error("Not authenticated. Run `syncenv auth login` first.");
       process.exit(1);
     }
     const config = await loadProjectConfig();
-    const projectId = options.project || config?.project.id || getConfig("defaultProject");
+    const projectId = options.project || config?.project.id;
     if (!projectId) {
-      error("No project specified. Use --project or run `syncenv init`");
+      error("No project specified.");
+      info("Use one of the following:");
+      info("  --project <id>    Specify project ID for this command");
+      info("  syncenv project use <id>  Set default project for current directory");
       process.exit(1);
     }
     let envName = options.name;
     if (!envName) {
-      const answer = await inquirer2.prompt([
+      const answer = await inquirer3.prompt([
         {
           type: "input",
           name: "name",
@@ -1205,7 +1635,7 @@ envCommands.command("create-env").description("Create a new environment for a pr
     }
     let description = options.description;
     if (!description) {
-      const answer = await inquirer2.prompt([
+      const answer = await inquirer3.prompt([
         {
           type: "input",
           name: "description",
@@ -1242,7 +1672,7 @@ envCommands.command("create-env").description("Create a new environment for a pr
           requireConfirmation: envName === "production"
         };
         await saveProjectConfig(config);
-        info(`Updated .envsyncrc with environment "${envName}"`);
+        info(`Updated .syncenvrc with environment "${envName}"`);
       }
     } catch (err) {
       spinner.fail("Failed to create environment");
@@ -1261,7 +1691,7 @@ envCommands.command("delete-env <id>").description("Delete an environment").opti
     }
     const env = await withAuthGuard(() => client.environments.get(id));
     if (!options.force) {
-      const { confirm } = await inquirer2.prompt([
+      const { confirm } = await inquirer3.prompt([
         {
           type: "input",
           name: "confirm",
@@ -1282,23 +1712,30 @@ envCommands.command("delete-env <id>").description("Delete an environment").opti
     if (config && config.environments[env.name]) {
       delete config.environments[env.name];
       await saveProjectConfig(config);
-      info("Updated .envsyncrc");
+      info("Updated .syncenvrc");
     }
   } catch (err) {
     error("Failed to delete environment:", err.message);
     process.exit(1);
   }
 });
-envCommands.command("sync").description("Sync with remote (pull + merge + push in one command)").option("-p, --project <id>", "project ID").option("-e, --env <name>", "environment name").option("-f, --file <path>", "file path").option("--dry-run", "preview changes without applying").option("--strategy <strategy>", "conflict resolution: local-wins, remote-wins, fail-on-conflict", "interactive").option("-y, --yes", "skip confirmation prompts").action(async (options) => {
+envCommands.command("sync").description("Sync with remote (pull + merge + push in one command)").option("-p, --project <identifier>", "project ID or name").option("-e, --env <name>", "environment name").option("-f, --file <path>", "file path").option("--dry-run", "preview changes without applying").option(
+  "--strategy <strategy>",
+  "conflict resolution: local-wins, remote-wins, fail-on-conflict",
+  "interactive"
+).option("-y, --yes", "skip confirmation prompts").action(async (options) => {
   try {
     if (!isAuthenticated()) {
       error("Not authenticated. Run `syncenv auth login` first.");
       process.exit(1);
     }
     const config = await loadProjectConfig();
-    const projectId = options.project || config?.project.id || getConfig("defaultProject");
+    const projectId = options.project || config?.project.id;
     if (!projectId) {
-      error("No project specified. Use --project or run `syncenv init`");
+      error("No project specified.");
+      info("Use one of the following:");
+      info("  --project <id>    Specify project ID for this command");
+      info("  syncenv project use <id>  Set default project for current directory");
       process.exit(1);
     }
     const envName = options.env || config?.defaults.environment || "dev";
@@ -1336,7 +1773,13 @@ envCommands.command("sync").description("Sync with remote (pull + merge + push i
       const decrypted = decryptContent(download.content, download.encryptionIv, dek2);
       if (!options.dryRun) {
         await fs2.writeFile(filePath, decrypted, "utf-8");
-        await stateManager.recordSync(projectId, environment.id, download.version || 1, download.contentHash || "", "pull");
+        await stateManager.recordSync(
+          projectId,
+          environment.id,
+          download.version || 1,
+          download.contentHash || "",
+          "pull"
+        );
       }
       spinner.succeed("Pulled from remote");
       success(`Written to ${filePath}`);
@@ -1354,12 +1797,19 @@ envCommands.command("sync").description("Sync with remote (pull + merge + push i
     const dek = decryptDEK(project.encryptedDek, project.dekIv, userKek);
     const remoteVersion = environment.currentVersion || 1;
     const remoteDownload = await client.environments.downloadContent(environment.id);
-    const remoteContent = decryptContent(remoteDownload.content, remoteDownload.encryptionIv, dek);
+    const remoteContent = decryptContent(
+      remoteDownload.content,
+      remoteDownload.encryptionIv,
+      dek
+    );
     let mergedContent;
     let mergeSource = "push";
     if (localState && localState.lastSync.version < remoteVersion) {
       spinner.text = "Merging changes...";
-      const baseDownload = await client.environments.downloadContent(environment.id, localState.lastSync.version);
+      const baseDownload = await client.environments.downloadContent(
+        environment.id,
+        localState.lastSync.version
+      );
       const baseContent = decryptContent(baseDownload.content, baseDownload.encryptionIv, dek);
       const mergeInput = {
         base: parseEnvFile(baseContent),
@@ -1414,12 +1864,14 @@ envCommands.command("sync").description("Sync with remote (pull + merge + push i
       }
       mergedContent = localContent;
       if (!options.yes) {
-        const { confirm } = await inquirer2.prompt([{
-          type: "confirm",
-          name: "confirm",
-          message: `Push local changes to "${envName}"?`,
-          default: true
-        }]);
+        const { confirm } = await inquirer3.prompt([
+          {
+            type: "confirm",
+            name: "confirm",
+            message: `Push local changes to "${envName}"?`,
+            default: true
+          }
+        ]);
         if (!confirm) {
           info("Cancelled.");
           return;
@@ -1437,7 +1889,13 @@ envCommands.command("sync").description("Sync with remote (pull + merge + push i
         changeSummary: mergeSource === "merge" ? "Synced with merge" : "Synced local changes"
       })
     );
-    await stateManager.recordSync(projectId, environment.id, result.version, newContentHash, mergeSource);
+    await stateManager.recordSync(
+      projectId,
+      environment.id,
+      result.version,
+      newContentHash,
+      mergeSource
+    );
     spinner.succeed("Sync complete");
     success(`Environment "${envName}" updated to version ${result.version}`);
   } catch (err) {
@@ -1448,13 +1906,20 @@ envCommands.command("sync").description("Sync with remote (pull + merge + push i
 
 // src/commands/init.ts
 import path from "path";
-import chalk5 from "chalk";
-import { Command as Command4 } from "commander";
-import inquirer3 from "inquirer";
-var initCommand = new Command4("init").description("Initialize a new project configuration").option("-y, --yes", "skip prompts and use defaults").action(async (options) => {
+import chalk6 from "chalk";
+import { Command as Command5 } from "commander";
+import inquirer4 from "inquirer";
+import { ApiError } from "@uagents/syncenv-client";
+var initCommand = new Command5("init").description("Initialize a new project configuration").option("-y, --yes", "skip prompts and use defaults").option("--debug", "enable debug mode with verbose logging").action(async (options) => {
+  const isDebug = options.debug || process.env.SYNCENV_DEBUG === "true";
   try {
+    if (isDebug) {
+      console.log(chalk6.dim("\n[DEBUG] Init Command"));
+      console.log(chalk6.dim(`[DEBUG] Yes mode: ${options.yes || false}
+`));
+    }
     if (await hasProjectConfig()) {
-      const { overwrite } = await inquirer3.prompt([
+      const { overwrite } = await inquirer4.prompt([
         {
           type: "confirm",
           name: "overwrite",
@@ -1467,24 +1932,38 @@ var initCommand = new Command4("init").description("Initialize a new project con
         return;
       }
     }
-    let projectName;
+    let projectName2;
     let environments;
+    let envFileMappings = {};
     if (options.yes) {
-      projectName = path.basename(process.cwd());
+      projectName2 = path.basename(process.cwd());
       environments = ["dev", "staging", "production"];
+      envFileMappings = {
+        dev: ".env",
+        staging: ".env.staging",
+        production: ".env.production"
+      };
+      if (isDebug) {
+        console.log(
+          chalk6.dim(`[DEBUG] Using defaults: ${projectName2}, [${environments.join(", ")}]`)
+        );
+      }
     } else {
-      const answers = await inquirer3.prompt([
+      const { projectName: pname } = await inquirer4.prompt([
         {
           type: "input",
           name: "projectName",
           message: "Project name:",
           default: path.basename(process.cwd()),
           validate: (input) => input.length > 0 || "Project name is required"
-        },
+        }
+      ]);
+      projectName2 = pname;
+      const { environments: envs } = await inquirer4.prompt([
         {
           type: "checkbox",
           name: "environments",
-          message: "Select default environments:",
+          message: "Select environments to create:",
           choices: [
             { name: "dev", checked: true },
             { name: "staging", checked: true },
@@ -1492,70 +1971,164 @@ var initCommand = new Command4("init").description("Initialize a new project con
             { name: "test", checked: false }
           ],
           validate: (input) => input.length > 0 || "Select at least one environment"
-        },
-        {
-          type: "confirm",
-          name: "pushOnChange",
-          message: "Auto-push on change?",
-          default: false
-        },
-        {
-          type: "confirm",
-          name: "confirmOverwrite",
-          message: "Confirm before overwriting files?",
-          default: true
         }
       ]);
-      projectName = answers.projectName;
-      environments = answers.environments;
-      const envConfig = {};
+      environments = envs;
+      console.log(chalk6.dim("\nConfigure environment file mappings:"));
       for (const env of environments) {
-        const fileName = env === "dev" ? ".env" : `.env.${env}`;
-        envConfig[env] = {
-          file: fileName,
-          requireConfirmation: env === "production"
-        };
+        const defaultFile = env === "dev" ? ".env" : `.env.${env}`;
+        const { fileName } = await inquirer4.prompt([
+          {
+            type: "input",
+            name: "fileName",
+            message: `File for "${env}" environment:`,
+            default: defaultFile,
+            validate: (input) => input.length > 0 || "File name is required"
+          }
+        ]);
+        envFileMappings[env] = fileName;
       }
-      const config = {
-        project: {
-          name: projectName,
-          id: ""
-          // Will be set after creating project on server
-        },
-        defaults: {
-          environment: "dev",
-          pushOnChange: answers.pushOnChange,
-          confirmOverwrite: answers.confirmOverwrite
-        },
-        encryption: {
-          algorithm: "AES-256-GCM",
-          keyDerivation: "Argon2id"
-        },
-        environments: envConfig
+    }
+    const envConfig = {};
+    for (const env of environments) {
+      envConfig[env] = {
+        file: envFileMappings[env],
+        requireConfirmation: env === "production"
       };
-      await saveProjectConfig(config);
-      success(`Created ${chalk5.cyan(".envsyncrc")}`);
-      console.log("");
-      console.log(chalk5.dim("Next steps:"));
-      console.log(chalk5.dim("  1. Run `syncenv signup` to create an account"));
-      console.log(
-        chalk5.dim("  2. Run `syncenv project create` to create the project on the server")
+    }
+    const config = {
+      project: {
+        name: projectName2,
+        id: ""
+        // Will be set after creating project on server
+      },
+      defaults: {
+        environment: "dev",
+        pushOnChange: false,
+        confirmOverwrite: true
+      },
+      encryption: {
+        algorithm: "AES-256-GCM",
+        keyDerivation: "Argon2id"
+      },
+      environments: envConfig
+    };
+    await saveProjectConfig(config);
+    success(`Created ${chalk6.cyan(".syncenvrc")}`);
+    if (isDebug) {
+      console.log(chalk6.dim("[DEBUG] Config saved successfully"));
+    }
+    console.log("");
+    console.log(chalk6.bold("Configuration Summary:"));
+    console.log(`  Project: ${projectName2}`);
+    console.log(`  Environments:`);
+    for (const env of environments) {
+      console.log(`    - ${env}: ${envFileMappings[env]}`);
+    }
+    console.log("");
+    if (!isAuthenticated()) {
+      warning("Not authenticated. Skipping remote resource creation.");
+      info("Run `syncenv auth login` to authenticate, then:");
+      info("  1. Run `syncenv project create` to create the project on the server");
+      info("  2. Run `syncenv env push` to upload your .env file");
+      return;
+    }
+    const { createRemote } = await inquirer4.prompt([
+      {
+        type: "confirm",
+        name: "createRemote",
+        message: "Create project on remote server?",
+        default: true
+      }
+    ]);
+    if (!createRemote) {
+      info("Skipping remote project creation.");
+      info("You can create it later with:");
+      info("  syncenv project create  # Create project on server");
+      info("  syncenv env push        # Push environment files");
+      return;
+    }
+    console.log("");
+    info("Creating remote project...");
+    if (isDebug) {
+      console.log(chalk6.dim("[DEBUG] Getting/unlocking User KEK..."));
+    }
+    const userKek = await getOrUnlockUserKEK();
+    if (!userKek) {
+      error("Your encryption keys are locked.");
+      info("Run `syncenv user-keys unlock` to unlock your keys.");
+      process.exit(1);
+    }
+    if (isDebug) {
+      console.log(chalk6.dim("[DEBUG] User KEK acquired"));
+    }
+    const spinner = createSpinner("Creating project on server...");
+    spinner.start();
+    try {
+      const { generateDEK, encryptDEK } = await import("./crypto-X7MZU7DV.js");
+      const dek = generateDEK();
+      const dekEncryption = encryptDEK(dek, userKek);
+      const project = await withAuthGuard(
+        () => client.projects.create({
+          name: projectName2,
+          slug: projectName2.toLowerCase().replace(/\s+/g, "-"),
+          description: "",
+          encryptedDek: dekEncryption.encrypted,
+          dekIv: dekEncryption.iv
+        })
       );
-      console.log(chalk5.dim("  3. Run `syncenv push` to upload your .env file"));
+      spinner.succeed(`Project "${projectName2}" created on server`);
+      const updatedConfig = await loadProjectConfig();
+      if (updatedConfig) {
+        updatedConfig.project.id = project.id;
+        await saveProjectConfig(updatedConfig);
+        if (isDebug) {
+          console.log(chalk6.dim(`[DEBUG] Updated .syncenvrc with project ID: ${project.id}`));
+        }
+      }
+      console.log("");
+      success("Project created on server successfully!");
+      info("Environments will be created automatically when you push:");
+      info("  syncenv env push -e dev");
+      info("  syncenv env push -e staging");
+      info("  syncenv env push -e production");
+    } catch (err) {
+      spinner.fail("Failed to create project on server");
+      throw err;
     }
   } catch (err) {
+    if (isDebug) {
+      console.log(chalk6.dim(`
+[DEBUG] Init error: ${err.message}`));
+      console.log(chalk6.dim(`[DEBUG] Error stack: ${err.stack}`));
+    }
+    if (err instanceof ApiError && err.statusCode === 409) {
+      error(`Project "${projectName}" already exists on the server`);
+      info('Use `syncenv project use "' + projectName + '"` to use the existing project');
+      info("Or choose a different project name");
+      process.exit(1);
+    }
     error("Failed to initialize project:", err.message);
     process.exit(1);
   }
 });
 
 // src/commands/project.ts
-import chalk6 from "chalk";
-import { Command as Command5 } from "commander";
-import inquirer4 from "inquirer";
-var projectCommands = new Command5("project").description("Project management commands");
-projectCommands.command("list").alias("ls").description("List all projects").option("-s, --search <query>", "search projects by name").option("-l, --limit <number>", "number of projects to show", "20").option("--cursor <cursor>", "cursor for pagination").action(async (options) => {
+import chalk7 from "chalk";
+import { Command as Command6 } from "commander";
+import inquirer5 from "inquirer";
+import { ApiError as ApiError2 } from "@uagents/syncenv-client";
+var projectCommands = new Command6("project").description("Project management commands");
+projectCommands.command("list").alias("ls").description("List all projects").option("-s, --search <query>", "search projects by name").option("-l, --limit <number>", "number of projects to show", "20").option("--cursor <cursor>", "cursor for pagination").option("--debug", "enable debug mode with verbose logging").action(async (options) => {
+  const isDebug = options.debug || process.env.SYNCENV_DEBUG === "true";
   try {
+    if (isDebug) {
+      console.log(chalk7.dim("\n[DEBUG] List Projects Command"));
+      console.log(chalk7.dim(`[DEBUG] Authenticated: ${isAuthenticated()}`));
+      console.log(chalk7.dim(`[DEBUG] Search: ${options.search || "none"}`));
+      console.log(chalk7.dim(`[DEBUG] Limit: ${options.limit}
+`));
+    }
     if (!isAuthenticated()) {
       error("Not authenticated. Run `syncenv auth login` first.");
       process.exit(1);
@@ -1573,6 +2146,11 @@ projectCommands.command("list").alias("ls").description("List all projects").opt
       })
     );
     spinner.stop();
+    if (isDebug) {
+      console.log(chalk7.dim(`[DEBUG] Found ${result.data.length} projects`));
+      console.log(chalk7.dim(`[DEBUG] Has more: ${result.hasMore}
+`));
+    }
     if (result.data.length === 0) {
       if (options.search) {
         info(`No projects found matching "${options.search}"`);
@@ -1581,8 +2159,8 @@ projectCommands.command("list").alias("ls").description("List all projects").opt
       }
       return;
     }
-    console.log(chalk6.bold("\nNAME          DESCRIPTION              UPDATED"));
-    console.log(chalk6.dim("\u2500".repeat(70)));
+    console.log(chalk7.bold("\nNAME          DESCRIPTION              UPDATED"));
+    console.log(chalk7.dim("\u2500".repeat(70)));
     for (const project of result.data) {
       const name = project.name.padEnd(13).slice(0, 13);
       const description = (project.description || "-").padEnd(24).slice(0, 24);
@@ -1590,31 +2168,43 @@ projectCommands.command("list").alias("ls").description("List all projects").opt
       console.log(`${name} ${description} ${updated}`);
     }
     if (result.hasMore) {
-      console.log(chalk6.dim(`
+      console.log(chalk7.dim(`
 ... and more projects available`));
       info(`Use --cursor ${result.nextCursor} to see more`);
     }
     console.log("");
   } catch (err) {
+    if (isDebug) {
+      console.log(chalk7.dim(`
+[DEBUG] List error: ${err.message}`));
+      console.log(chalk7.dim(`[DEBUG] Error stack: ${err.stack}`));
+    }
     error("Failed to list projects:", err.message);
     process.exit(1);
   }
 });
-projectCommands.command("create [name]").description("Create a new project").option("-d, --description <description>", "project description").action(async (name, options) => {
+projectCommands.command("create [name]").description("Create a new project").option("-d, --description <description>", "project description").option("--debug", "enable debug mode with verbose logging").action(async (name, options) => {
+  const isDebug = options.debug || process.env.SYNCENV_DEBUG === "true";
   try {
+    if (isDebug) {
+      console.log(chalk7.dim("\n[DEBUG] Create Project Command"));
+      console.log(chalk7.dim(`[DEBUG] Authenticated: ${isAuthenticated()}`));
+      console.log(chalk7.dim(`[DEBUG] Name: ${name || "not provided"}
+`));
+    }
     if (!isAuthenticated()) {
       error("Not authenticated. Run `syncenv auth login` first.");
       process.exit(1);
     }
-    let projectName = name;
+    let projectName2 = name;
     let description = options.description;
-    if (!projectName) {
+    if (!projectName2) {
       const existingConfig = await loadProjectConfig();
       if (existingConfig) {
-        projectName = existingConfig.project.name;
-        info(`Using project name from .envsyncrc: ${projectName}`);
+        projectName2 = existingConfig.project.name;
+        info(`Using project name from .syncenvrc: ${projectName2}`);
       } else {
-        const answer = await inquirer4.prompt([
+        const answer = await inquirer5.prompt([
           {
             type: "input",
             name: "name",
@@ -1622,11 +2212,11 @@ projectCommands.command("create [name]").description("Create a new project").opt
             validate: (input) => input.length > 0 || "Name is required"
           }
         ]);
-        projectName = answer.name;
+        projectName2 = answer.name;
       }
     }
     if (!description) {
-      const answer = await inquirer4.prompt([
+      const answer = await inquirer5.prompt([
         {
           type: "input",
           name: "description",
@@ -1635,36 +2225,46 @@ projectCommands.command("create [name]").description("Create a new project").opt
       ]);
       description = answer.description;
     }
+    if (isDebug) {
+      console.log(chalk7.dim("[DEBUG] Getting/unlocking User KEK..."));
+    }
     const userKek = await getOrUnlockUserKEK();
     if (!userKek) {
       error("Your encryption keys are locked.");
       info("Run `syncenv user-keys unlock` to unlock your keys before creating a project.");
       process.exit(1);
     }
+    if (isDebug) {
+      console.log(chalk7.dim("[DEBUG] User KEK acquired\n"));
+    }
     const spinner = createSpinner("Creating project...");
     spinner.start();
     const { generateDEK, encryptDEK } = await import("./crypto-X7MZU7DV.js");
     const dek = generateDEK();
     const dekEncryption = encryptDEK(dek, userKek);
+    if (isDebug) {
+      console.log(chalk7.dim("[DEBUG] Generated DEK and encrypted with User KEK"));
+      console.log(chalk7.dim(`[DEBUG] DEK IV: ${dekEncryption.iv.substring(0, 16)}...`));
+    }
     const project = await withAuthGuard(
       () => client.projects.create({
-        name: projectName,
-        slug: projectName.toLowerCase().replace(/\s+/g, "-"),
+        name: projectName2,
+        slug: projectName2.toLowerCase().replace(/\s+/g, "-"),
         description,
         encryptedDek: dekEncryption.encrypted,
         dekIv: dekEncryption.iv
       })
     );
-    spinner.succeed(`Project "${projectName}" created`);
+    spinner.succeed(`Project "${projectName2}" created`);
     const config = await loadProjectConfig();
     if (config) {
       config.project.id = project.id;
       await saveProjectConfig(config);
-      success("Updated .envsyncrc with project ID");
+      success("Updated .syncenvrc with project ID");
     } else {
       await saveProjectConfig({
         project: {
-          name: projectName,
+          name: projectName2,
           id: project.id
         },
         defaults: {
@@ -1680,27 +2280,48 @@ projectCommands.command("create [name]").description("Create a new project").opt
           dev: { file: ".env" }
         }
       });
-      success("Created .envsyncrc");
+      success("Created .syncenvrc");
     }
     info(`Project ID: ${project.id}`);
     info("Default environments: dev, staging, prod");
   } catch (err) {
+    if (isDebug) {
+      console.log(chalk7.dim(`
+[DEBUG] Create error: ${err.message}`));
+      console.log(chalk7.dim(`[DEBUG] Error stack: ${err.stack}`));
+    }
+    if (err instanceof ApiError2 && err.statusCode === 409) {
+      error(`Project "${projectName}" already exists`);
+      info("Use `syncenv project list` to see your projects");
+      info('Or use `syncenv project use "' + projectName + '"` to use the existing project');
+      process.exit(1);
+    }
     error("Failed to create project:", err.message);
     process.exit(1);
   }
 });
-projectCommands.command("get <id>").description("Get project details").action(async (id) => {
+projectCommands.command("get <identifier>").description("Get project details (by ID or name)").option("--debug", "enable debug mode with verbose logging").action(async (identifier, options) => {
+  const isDebug = options.debug || process.env.SYNCENV_DEBUG === "true";
   try {
+    if (isDebug) {
+      console.log(chalk7.dim("\n[DEBUG] Get Project Command"));
+      console.log(chalk7.dim(`[DEBUG] Identifier: ${identifier}
+`));
+    }
     if (!isAuthenticated()) {
       error("Not authenticated. Run `syncenv auth login` first.");
       process.exit(1);
     }
     const spinner = createSpinner("Fetching project...");
     spinner.start();
-    const project = await withAuthGuard(() => client.projects.get(id));
+    const project = await resolveProjectIdentifier(identifier);
     spinner.stop();
-    console.log(chalk6.bold("\nProject Details"));
-    console.log(chalk6.dim("\u2500".repeat(40)));
+    if (isDebug) {
+      console.log(chalk7.dim(`[DEBUG] Project resolved: ${project.name} (${project.id})
+`));
+    }
+    console.log(chalk7.bold("\nProject Details"));
+    console.log(chalk7.dim("\u2500".repeat(40)));
     console.log(`Name:        ${project.name}`);
     console.log(`ID:          ${project.id}`);
     console.log(`Slug:        ${project.slug}`);
@@ -1710,28 +2331,40 @@ projectCommands.command("get <id>").description("Get project details").action(as
     console.log(`Created:     ${new Date(project.createdAt).toLocaleString()}`);
     console.log(`Updated:     ${new Date(project.updatedAt).toLocaleString()}`);
     const { data: environments } = await withAuthGuard(
-      () => client.environments.listByProject(id)
+      () => client.environments.listByProject(project.id)
     );
     if (environments?.length > 0) {
-      console.log(chalk6.bold("\nEnvironments:"));
+      console.log(chalk7.bold("\nEnvironments:"));
       for (const env of environments) {
         console.log(`  \u2022 ${env.name} (v${env.currentVersion || 1})`);
       }
     }
   } catch (err) {
+    if (isDebug) {
+      console.log(chalk7.dim(`
+[DEBUG] Get error: ${err.message}`));
+      console.log(chalk7.dim(`[DEBUG] Error stack: ${err.stack}`));
+    }
     error("Failed to get project:", err.message);
     process.exit(1);
   }
 });
-projectCommands.command("delete <id>").description("Delete a project").option("-f, --force", "skip confirmation").action(async (id, options) => {
+projectCommands.command("delete <identifier>").description("Delete a project (by ID or name)").option("-f, --force", "skip confirmation").option("--debug", "enable debug mode with verbose logging").action(async (identifier, options) => {
+  const isDebug = options.debug || process.env.SYNCENV_DEBUG === "true";
   try {
+    if (isDebug) {
+      console.log(chalk7.dim("\n[DEBUG] Delete Project Command"));
+      console.log(chalk7.dim(`[DEBUG] Identifier: ${identifier}`));
+      console.log(chalk7.dim(`[DEBUG] Force: ${options.force}
+`));
+    }
     if (!isAuthenticated()) {
       error("Not authenticated. Run `syncenv auth login` first.");
       process.exit(1);
     }
-    const project = await withAuthGuard(() => client.projects.get(id));
+    const project = await resolveProjectIdentifier(identifier);
     if (!options.force) {
-      const { confirm } = await inquirer4.prompt([
+      const { confirm } = await inquirer5.prompt([
         {
           type: "input",
           name: "confirm",
@@ -1746,62 +2379,329 @@ projectCommands.command("delete <id>").description("Delete a project").option("-
     }
     const spinner = createSpinner("Deleting project...");
     spinner.start();
-    await withAuthGuard(() => client.projects.delete(id));
+    await withAuthGuard(() => client.projects.delete(project.id));
     spinner.succeed(`Project "${project.name}" deleted`);
     const config = await loadProjectConfig();
-    if (config && config.project.id === id) {
+    if (config && config.project.id === project.id) {
       config.project.id = "";
       await saveProjectConfig(config);
-      info("Cleared project ID from .envsyncrc");
+      info("Cleared project ID from .syncenvrc");
     }
   } catch (err) {
+    if (isDebug) {
+      console.log(chalk7.dim(`
+[DEBUG] Delete error: ${err.message}`));
+      console.log(chalk7.dim(`[DEBUG] Error stack: ${err.stack}`));
+    }
     error("Failed to delete project:", err.message);
     process.exit(1);
   }
 });
-projectCommands.command("use <id>").description("Set default project").action(async (id) => {
+projectCommands.command("use <identifier>").description("Set default project for current directory (updates .syncenvrc)").option("--debug", "enable debug mode with verbose logging").action(async (identifier, options) => {
+  const isDebug = options.debug || process.env.SYNCENV_DEBUG === "true";
   try {
+    if (isDebug) {
+      console.log(chalk7.dim("\n[DEBUG] Use Project Command"));
+      console.log(chalk7.dim(`[DEBUG] Identifier: ${identifier}
+`));
+    }
     if (!isAuthenticated()) {
       error("Not authenticated. Run `syncenv auth login` first.");
       process.exit(1);
     }
-    const project = await withAuthGuard(() => client.projects.get(id));
-    setConfig("defaultProject", id);
-    success(`Set "${project.name}" as default project`);
+    const project = await resolveProjectIdentifier(identifier);
+    const config = await loadProjectConfig();
+    if (config) {
+      config.project.id = project.id;
+      config.project.name = project.name;
+      await saveProjectConfig(config);
+      if (isDebug) {
+        console.log(chalk7.dim("[DEBUG] Updated .syncenvrc with project ID"));
+      }
+      success(`Set "${project.name}" as project for current directory`);
+      info("This project will be used by default when running commands in this directory");
+    } else {
+      await saveProjectConfig({
+        project: {
+          name: project.name,
+          id: project.id
+        },
+        defaults: {
+          environment: "dev",
+          pushOnChange: false,
+          confirmOverwrite: true
+        },
+        encryption: {
+          algorithm: "AES-256-GCM",
+          keyDerivation: "Argon2id"
+        },
+        environments: {
+          dev: { file: ".env" }
+        }
+      });
+      if (isDebug) {
+        console.log(chalk7.dim("[DEBUG] Created new .syncenvrc with project ID"));
+      }
+      success(`Created .syncenvrc with "${project.name}" as project`);
+    }
   } catch (err) {
+    if (isDebug) {
+      console.log(chalk7.dim(`
+[DEBUG] Use error: ${err.message}`));
+      console.log(chalk7.dim(`[DEBUG] Error stack: ${err.stack}`));
+    }
     error("Failed to set default project:", err.message);
     process.exit(1);
   }
 });
 
+// src/commands/setup.ts
+import chalk8 from "chalk";
+import { Command as Command7 } from "commander";
+import inquirer6 from "inquirer";
+var setupCommand = new Command7("setup").description("First-time setup wizard (login + encryption keys)").option("--debug", "enable debug mode with verbose logging").action(async (options) => {
+  const isDebug = options.debug || process.env.SYNCENV_DEBUG === "true";
+  console.log(chalk8.bold("\n\u{1F527} SyncEnv Setup Wizard\n"));
+  console.log(chalk8.dim("This wizard will help you set up SyncEnv for the first time.\n"));
+  try {
+    let userEmail = getConfig("userEmail");
+    if (!isAuthenticated() || !userEmail) {
+      info("Step 1: Authentication");
+      console.log(chalk8.dim("You need to log in to use SyncEnv.\n"));
+      const { hasAccount } = await inquirer6.prompt([
+        {
+          type: "confirm",
+          name: "hasAccount",
+          message: "Do you already have a SyncEnv account?",
+          default: true
+        }
+      ]);
+      if (!hasAccount) {
+        console.log("");
+        info("Let's create your account first!");
+        console.log(chalk8.dim("Opening browser for registration...\n"));
+        const apiUrl = getConfig("apiUrl") || "https://syncenv-api.uagents.app";
+        const signupUrl = apiUrl.replace("-api", "") + "/signup";
+        console.log(chalk8.cyan("\u{1F310} Please visit:"));
+        console.log(chalk8.bold(signupUrl));
+        console.log("");
+        const { openedBrowser } = await inquirer6.prompt([
+          {
+            type: "confirm",
+            name: "openedBrowser",
+            message: "Have you completed registration in the browser?",
+            default: true
+          }
+        ]);
+        if (!openedBrowser) {
+          warning("Please complete registration before continuing.");
+          info(`Visit: ${signupUrl}`);
+          process.exit(1);
+        }
+      }
+      console.log("");
+      info("Please log in with your credentials:\n");
+      const { email, password: password2 } = await inquirer6.prompt([
+        {
+          type: "input",
+          name: "email",
+          message: "Email:",
+          validate: (input) => input.includes("@") || "Please enter a valid email"
+        },
+        {
+          type: "password",
+          name: "password",
+          message: "Password:",
+          mask: "*",
+          validate: (input) => input.length > 0 || "Password is required"
+        }
+      ]);
+      const spinner = createSpinner("Logging in...");
+      spinner.start();
+      try {
+        const apiUrl = getConfig("apiUrl") || "https://syncenv-api.uagents.app";
+        const webOrigin = apiUrl.replace("-api", "");
+        const origin = apiUrl.startsWith("http://localhost") ? apiUrl : webOrigin;
+        const loginResponse = await fetch(`${apiUrl}/api/auth/sign-in/email`, {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+            Origin: origin
+          },
+          body: JSON.stringify({ email, password: password2 })
+        });
+        if (!loginResponse.ok) {
+          const errorData = await loginResponse.json().catch(() => ({ error: "Login failed" }));
+          throw new Error(errorData.error || errorData.message || "Login failed");
+        }
+        const setCookie = loginResponse.headers.getSetCookie?.() || (loginResponse.headers.get("set-cookie") ? [loginResponse.headers.get("set-cookie")] : []);
+        if (setCookie.length > 0) {
+          const { storeCookies } = await import("./cookie-store-UGGEBXBV.js");
+          storeCookies(setCookie);
+        }
+        const result = await loginResponse.json();
+        setConfig("userId", result.user.id);
+        setConfig("userEmail", result.user.email);
+        userEmail = result.user.email;
+        spinner.succeed("Logged in successfully");
+      } catch (err) {
+        spinner.fail("Login failed");
+        throw err;
+      }
+    } else {
+      success(`Already authenticated as ${userEmail}`);
+    }
+    console.log("");
+    info("Step 2: Encryption Keys");
+    console.log(
+      chalk8.dim("SyncEnv uses end-to-end encryption to protect your environment variables.\n")
+    );
+    const hasKeys = await checkUserKeys(isDebug);
+    if (hasKeys) {
+      warning("You already have encryption keys set up.");
+      const { resetKeys } = await inquirer6.prompt([
+        {
+          type: "confirm",
+          name: "resetKeys",
+          message: "Do you want to reset your encryption keys?",
+          default: false
+        }
+      ]);
+      if (!resetKeys) {
+        info("Setup complete! Your existing keys will be used.");
+        printNextSteps();
+        return;
+      }
+    }
+    console.log("");
+    info("Creating encryption keys...");
+    console.log(chalk8.dim("Your login password will be used to encrypt your keys.\n"));
+    const { password } = await inquirer6.prompt([
+      {
+        type: "password",
+        name: "password",
+        message: "Enter your login password:",
+        mask: "*",
+        validate: (input) => {
+          if (input.length < 8) return "Password must be at least 8 characters";
+          return true;
+        }
+      }
+    ]);
+    const keySpinner = createSpinner("Generating encryption keys...");
+    keySpinner.start();
+    try {
+      const { encryptedUserKek, kekIv, kekSalt } = await setupUserKEK(password);
+      await withAuthGuard(
+        () => client.userKeys.create({
+          encryptedUserKek,
+          kekIv,
+          kekSalt
+        })
+      );
+      await unlockAndStoreKEK(
+        password,
+        { encryptedUserKek, kekIv, kekSalt },
+        true
+        // Remember in keychain
+      );
+      keySpinner.succeed("Encryption keys created successfully");
+    } catch (err) {
+      keySpinner.fail("Failed to create encryption keys");
+      throw err;
+    }
+    console.log("");
+    success("\u{1F389} Setup complete!");
+    console.log("");
+    console.log(chalk8.bold("Your encryption keys:"));
+    console.log("  \u2713 Generated and encrypted with your password");
+    console.log("  \u2713 Stored securely on server");
+    console.log("  \u2713 Cached locally for convenience");
+    console.log("");
+    printNextSteps();
+  } catch (err) {
+    if (isDebug) {
+      console.log(chalk8.dim(`
+[DEBUG] Setup error: ${err.message}`));
+      console.log(chalk8.dim(`[DEBUG] Error stack: ${err.stack}`));
+    }
+    error("Setup failed:", err.message);
+    process.exit(1);
+  }
+});
+async function checkUserKeys(debug = false) {
+  try {
+    if (debug) {
+      console.log(chalk8.dim("[DEBUG] Checking if user keys exist..."));
+    }
+    await withAuthGuard(() => client.userKeys.get());
+    return true;
+  } catch (err) {
+    if (err.message?.includes("404") || err.status === 404) {
+      return false;
+    }
+    throw err;
+  }
+}
+function printNextSteps() {
+  console.log(chalk8.bold("Next steps:"));
+  console.log("  1. Run `syncenv init` to initialize a project");
+  console.log("  2. Run `syncenv env push` to upload your .env file");
+  console.log("");
+  info("For help, run: syncenv --help");
+}
+
 // src/commands/user-keys.ts
-import chalk7 from "chalk";
-import { Command as Command6 } from "commander";
-import inquirer5 from "inquirer";
-var userKeysCommands = new Command6("user-keys").description(
+import chalk9 from "chalk";
+import { Command as Command8 } from "commander";
+import inquirer7 from "inquirer";
+var userKeysCommands = new Command8("user-keys").description(
   "User encryption key management commands"
 );
-async function hasUserKeys() {
+async function hasUserKeys(debug = false) {
   try {
+    if (debug) {
+      console.log(chalk9.dim("[DEBUG] Checking if user keys exist..."));
+      console.log(chalk9.dim(`[DEBUG] API URL: ${client.getBaseUrl?.() || "N/A"}`));
+    }
     await withAuthGuard(() => client.userKeys.get());
+    if (debug) {
+      console.log(chalk9.dim("[DEBUG] User keys found on server"));
+    }
     return true;
   } catch (err) {
-    if (err.message?.includes("404")) {
+    if (debug) {
+      console.log(chalk9.dim(`[DEBUG] Error checking keys: ${err.message}`));
+      console.log(chalk9.dim(`[DEBUG] Error status: ${err.status || err.statusCode || "unknown"}`));
+    }
+    if (err.message?.includes("404") || err.status === 404 || err.statusCode === 404) {
+      if (debug) {
+        console.log(chalk9.dim("[DEBUG] User keys not found (404)"));
+      }
       return false;
     }
     throw err;
   }
 }
-userKeysCommands.command("setup").description("Initialize your encryption keys (first time setup)").action(async () => {
+userKeysCommands.command("setup").description("Initialize your encryption keys (first time setup)").option("--debug", "enable debug mode with verbose logging").action(async (options) => {
+  const isDebug = options.debug || process.env.SYNCENV_DEBUG === "true";
   try {
+    if (isDebug) {
+      console.log(chalk9.dim("\n[DEBUG] Setup Command"));
+      console.log(chalk9.dim(`[DEBUG] Authenticated: ${isAuthenticated()}
+`));
+    }
     if (!isAuthenticated()) {
       error("Not authenticated. Run `syncenv auth login` first.");
       process.exit(1);
     }
-    const hasKeys = await hasUserKeys();
+    if (isDebug) {
+      console.log(chalk9.dim("[DEBUG] Checking if user keys already exist..."));
+    }
+    const hasKeys = await hasUserKeys(isDebug);
     if (hasKeys) {
       warning("You already have encryption keys set up.");
-      const { overwrite } = await inquirer5.prompt([
+      const { overwrite } = await inquirer7.prompt([
         {
           type: "confirm",
           name: "overwrite",
@@ -1814,11 +2714,12 @@ userKeysCommands.command("setup").description("Initialize your encryption keys (
         return;
       }
     }
-    const { password } = await inquirer5.prompt([
+    info("Your login password will be used to encrypt your encryption keys.");
+    const { password } = await inquirer7.prompt([
       {
         type: "password",
         name: "password",
-        message: "Create encryption password:",
+        message: "Enter your login password:",
         mask: "*",
         validate: (input) => {
           if (input.length < 8) return "Password must be at least 8 characters";
@@ -1826,11 +2727,11 @@ userKeysCommands.command("setup").description("Initialize your encryption keys (
         }
       }
     ]);
-    await inquirer5.prompt([
+    await inquirer7.prompt([
       {
         type: "password",
         name: "confirmPassword",
-        message: "Confirm encryption password:",
+        message: "Confirm your login password:",
         mask: "*",
         validate: (input) => {
           if (input !== password) return "Passwords do not match";
@@ -1857,68 +2758,138 @@ userKeysCommands.command("setup").description("Initialize your encryption keys (
       );
       spinner.succeed("Encryption keys set up successfully");
       success("Your encryption keys are ready");
-      info("Your keys are encrypted with your password and stored securely");
-      warning("Remember your encryption password! It cannot be recovered.");
+      info("Your keys are encrypted with your login password and stored securely");
+      info("Use your login password to unlock keys in the future");
     } catch (err) {
+      if (isDebug) {
+        console.log(chalk9.dim(`
+[DEBUG] Setup error: ${err.message}`));
+        console.log(chalk9.dim(`[DEBUG] Error stack: ${err.stack}`));
+      }
       spinner.fail("Failed to set up encryption keys");
       throw err;
     }
   } catch (err) {
+    if (isDebug) {
+      console.log(chalk9.dim(`
+[DEBUG] Outer setup error: ${err.message}`));
+      console.log(chalk9.dim(`[DEBUG] Error stack: ${err.stack}`));
+    }
     error("Setup failed:", err.message);
     process.exit(1);
   }
 });
-userKeysCommands.command("unlock").description("Unlock your encryption keys for this session").option("--remember", "Remember KEK in system keychain (allows unlocking without password)").action(async (options) => {
+userKeysCommands.command("unlock").description("Unlock your encryption keys for this session").option(
+  "--no-remember",
+  "Do not remember KEK in system keychain (will require password next time)"
+).option("--debug", "enable debug mode with verbose logging").action(async (options) => {
+  const isDebug = options.debug || process.env.SYNCENV_DEBUG === "true";
+  const remember = options.remember !== false;
   try {
+    if (isDebug) {
+      console.log(chalk9.dim("\n[DEBUG] Unlock Command"));
+      console.log(chalk9.dim(`[DEBUG] Authenticated: ${isAuthenticated()}`));
+      console.log(chalk9.dim(`[DEBUG] Remember option: ${remember}
+`));
+    }
     if (!isAuthenticated()) {
       error("Not authenticated. Run `syncenv auth login` first.");
       process.exit(1);
     }
-    const hasKeys = await hasUserKeys();
+    if (isDebug) {
+      console.log(chalk9.dim("[DEBUG] Checking user keys..."));
+    }
+    const hasKeys = await hasUserKeys(isDebug);
     if (!hasKeys) {
       error("You do not have encryption keys set up yet.");
       info("Run `syncenv user-keys setup` to create your keys.");
       process.exit(1);
     }
+    if (isDebug) {
+      console.log(chalk9.dim("[DEBUG] Checking if keys already cached..."));
+    }
     const cached = await getUserKEK();
     if (cached) {
       const remaining = Math.round(getKEKTimeRemaining() / 6e4);
       info(`Your encryption keys are already unlocked (${remaining} minutes remaining).`);
       return;
     }
-    const userKeys = await withAuthGuard(() => client.userKeys.get());
-    const { password } = await inquirer5.prompt([
+    if (isDebug) {
+      console.log(chalk9.dim("[DEBUG] Keys not cached, need to unlock from server"));
+    }
+    if (isDebug) {
+      console.log(chalk9.dim("[DEBUG] Fetching user keys from server..."));
+    }
+    let userKeys;
+    try {
+      userKeys = await withAuthGuard(() => client.userKeys.get());
+      if (isDebug) {
+        console.log(chalk9.dim("[DEBUG] User keys retrieved successfully"));
+        console.log(chalk9.dim(`[DEBUG] Key version: ${userKeys.version || 1}`));
+        console.log(chalk9.dim(`[DEBUG] Has encryptedUserKek: ${!!userKeys.encryptedUserKek}`));
+        console.log(chalk9.dim(`[DEBUG] Has kekIv: ${!!userKeys.kekIv}`));
+        console.log(chalk9.dim(`[DEBUG] Has kekSalt: ${!!userKeys.kekSalt}`));
+      }
+    } catch (err) {
+      if (isDebug) {
+        console.log(chalk9.dim(`[DEBUG] Failed to fetch user keys: ${err.message}`));
+        console.log(
+          chalk9.dim(`[DEBUG] Error status: ${err.status || err.statusCode || "unknown"}`)
+        );
+        console.log(chalk9.dim(`[DEBUG] Error body: ${JSON.stringify(err.body || {})}`));
+      }
+      throw err;
+    }
+    const { password } = await inquirer7.prompt([
       {
         type: "password",
         name: "password",
-        message: "Enter your encryption password:",
+        message: "Enter your login password:",
         mask: "*"
       }
     ]);
     const spinner = createSpinner("Unlocking encryption keys...");
     spinner.start();
     try {
-      await unlockAndStoreKEK(password, userKeys, options.remember);
+      await unlockAndStoreKEK(password, userKeys, remember);
       spinner.succeed("Encryption keys unlocked");
       success("Your keys are now available for this session");
-      if (options.remember) {
+      if (remember) {
         info("Keys are stored in system keychain for future sessions");
+      } else {
+        info("Keys are not stored (use --no-remember to skip storing in keychain)");
       }
       info("Keys will auto-lock after 30 minutes of inactivity");
       info("Run `syncenv user-keys lock` to lock immediately");
     } catch (err) {
+      if (isDebug) {
+        console.log(chalk9.dim(`
+[DEBUG] Unlock error: ${err.message}`));
+        console.log(chalk9.dim(`[DEBUG] Error stack: ${err.stack}`));
+      }
       console.error(`Faild to unlock encryption keys: ${err}`);
       spinner.fail("Failed to unlock encryption keys");
-      error("Incorrect password. Please try again.");
+      error("Incorrect login password. Please try again.");
       process.exit(1);
     }
   } catch (err) {
+    if (isDebug) {
+      console.log(chalk9.dim(`
+[DEBUG] Outer error: ${err.message}`));
+      console.log(chalk9.dim(`[DEBUG] Error stack: ${err.stack}`));
+    }
     error("Unlock failed:", err.message);
     process.exit(1);
   }
 });
-userKeysCommands.command("lock").description("Lock (clear) your encryption keys from memory").option("--forget", "Also remove from system keychain").action(async (options) => {
+userKeysCommands.command("lock").description("Lock (clear) your encryption keys from memory").option("--forget", "Also remove from system keychain").option("--debug", "enable debug mode with verbose logging").action(async (options) => {
+  const isDebug = options.debug || process.env.SYNCENV_DEBUG === "true";
   try {
+    if (isDebug) {
+      console.log(chalk9.dim("\n[DEBUG] Lock Command"));
+      console.log(chalk9.dim(`[DEBUG] Forget option: ${options.forget}
+`));
+    }
     await lockKEK(options.forget);
     success("Encryption keys locked");
     if (options.forget) {
@@ -1928,70 +2899,116 @@ userKeysCommands.command("lock").description("Lock (clear) your encryption keys
     }
     info("Run `syncenv user-keys unlock` to unlock again");
   } catch (err) {
+    if (isDebug) {
+      console.log(chalk9.dim(`
+[DEBUG] Lock error: ${err.message}`));
+      console.log(chalk9.dim(`[DEBUG] Error stack: ${err.stack}`));
+    }
     error("Lock failed:", err.message);
     process.exit(1);
   }
 });
-userKeysCommands.command("status").description("Check your encryption key status").action(async () => {
+userKeysCommands.command("status").description("Check your encryption key status").option("--debug", "enable debug mode with verbose logging").action(async (options) => {
+  const isDebug = options.debug || process.env.SYNCENV_DEBUG === "true";
   try {
+    if (isDebug) {
+      console.log(chalk9.dim("\n[DEBUG] Status Command"));
+      console.log(chalk9.dim(`[DEBUG] Authenticated: ${isAuthenticated()}
+`));
+    }
     if (!isAuthenticated()) {
       error("Not authenticated. Run `syncenv auth login` first.");
       process.exit(1);
     }
-    console.log(chalk7.bold("\nEncryption Key Status"));
-    console.log(chalk7.dim("\u2500".repeat(40)));
-    const hasKeys = await hasUserKeys();
+    console.log(chalk9.bold("\nEncryption Key Status"));
+    console.log(chalk9.dim("\u2500".repeat(40)));
+    if (isDebug) {
+      console.log(chalk9.dim("[DEBUG] Checking user keys on server..."));
+    }
+    const hasKeys = await hasUserKeys(isDebug);
     if (!hasKeys) {
-      console.log(`Setup: ${chalk7.yellow("Not set up")}`);
+      console.log(`Setup: ${chalk9.yellow("Not set up")}`);
       info("\nRun `syncenv user-keys setup` to create your encryption keys");
       return;
     }
-    console.log(`Setup: ${chalk7.green("\u2713 Complete")}`);
+    console.log(`Setup: ${chalk9.green("\u2713 Complete")}`);
+    if (isDebug) {
+      console.log(chalk9.dim("[DEBUG] Checking local KEK cache..."));
+    }
     const cached = isKEKCached();
     if (cached) {
       const remaining = Math.round(getKEKTimeRemaining() / 6e4);
-      console.log(`Session: ${chalk7.green("\u2713 Unlocked")} (${remaining} min remaining)`);
+      console.log(`Session: ${chalk9.green("\u2713 Unlocked")} (${remaining} min remaining)`);
       info("\nYour encryption keys are active for this session");
     } else {
-      console.log(`Session: ${chalk7.yellow("\u25CB Locked")}`);
+      console.log(`Session: ${chalk9.yellow("\u25CB Locked")}`);
       info("\nRun `syncenv user-keys unlock` to unlock your keys");
     }
+    if (isDebug) {
+      console.log(chalk9.dim("[DEBUG] Fetching user keys from server..."));
+    }
     const userKeys = await withAuthGuard(() => client.userKeys.get());
     console.log(`
 Key Version: ${userKeys.version || 1}`);
     console.log(`Algorithm: AES-256-GCM with PBKDF2`);
+    if (isDebug) {
+      console.log(chalk9.dim("\n[DEBUG] Key details:"));
+      console.log(chalk9.dim(`[DEBUG] Has encryptedUserKek: ${!!userKeys.encryptedUserKek}`));
+      console.log(chalk9.dim(`[DEBUG] Has kekIv: ${!!userKeys.kekIv}`));
+      console.log(chalk9.dim(`[DEBUG] Has kekSalt: ${!!userKeys.kekSalt}`));
+    }
     console.log("");
   } catch (err) {
+    if (isDebug) {
+      console.log(chalk9.dim(`
+[DEBUG] Status error: ${err.message}`));
+      console.log(chalk9.dim(`[DEBUG] Error stack: ${err.stack}`));
+    }
     error("Status check failed:", err.message);
     process.exit(1);
   }
 });
-userKeysCommands.command("rotate").description("Re-encrypt your keys with a new password").action(async () => {
+userKeysCommands.command("rotate").description("Re-encrypt your keys with a new password").option("--debug", "enable debug mode with verbose logging").action(async (options) => {
+  const isDebug = options.debug || process.env.SYNCENV_DEBUG === "true";
   try {
+    if (isDebug) {
+      console.log(chalk9.dim("\n[DEBUG] Rotate Command"));
+      console.log(chalk9.dim(`[DEBUG] Authenticated: ${isAuthenticated()}
+`));
+    }
     if (!isAuthenticated()) {
       error("Not authenticated. Run `syncenv auth login` first.");
       process.exit(1);
     }
-    const hasKeys = await hasUserKeys();
+    if (isDebug) {
+      console.log(chalk9.dim("[DEBUG] Checking user keys..."));
+    }
+    const hasKeys = await hasUserKeys(isDebug);
     if (!hasKeys) {
       error("You do not have encryption keys set up yet.");
       info("Run `syncenv user-keys setup` to create your keys.");
       process.exit(1);
     }
+    if (isDebug) {
+      console.log(chalk9.dim("[DEBUG] Fetching user keys from server..."));
+    }
     const userKeys = await withAuthGuard(() => client.userKeys.get());
-    const { oldPassword } = await inquirer5.prompt([
+    if (isDebug) {
+      console.log(chalk9.dim("[DEBUG] User keys retrieved successfully"));
+    }
+    const { oldPassword } = await inquirer7.prompt([
       {
         type: "password",
         name: "oldPassword",
-        message: "Enter your current encryption password:",
+        message: "Enter your current login password:",
         mask: "*"
       }
     ]);
-    const { newPassword } = await inquirer5.prompt([
+    const { newPassword } = await inquirer7.prompt([
       {
         type: "password",
         name: "newPassword",
-        message: "Enter your new encryption password:",
+        message: "Enter your new login password:",
         mask: "*",
         validate: (input) => {
           if (input.length < 8) return "Password must be at least 8 characters";
@@ -1999,7 +3016,7 @@ userKeysCommands.command("rotate").description("Re-encrypt your keys with a new
         }
       }
     ]);
-    await inquirer5.prompt([
+    await inquirer7.prompt([
       {
         type: "password",
         name: "confirmPassword",
@@ -2033,20 +3050,30 @@ userKeysCommands.command("rotate").description("Re-encrypt your keys with a new
           kekSalt
         })
       );
-      const { saveEncryptedKEK, saveKEKPassword, getKEKPassword } = await import("./secure-storage-UEK3LD5L.js");
+      const { saveEncryptedKEK, saveKEKPassword, getKEKPassword } = await import("./secure-storage-AR7HZFTA.js");
       saveEncryptedKEK({ encryptedUserKek, kekIv, kekSalt });
       const existingPassword = await getKEKPassword();
       if (existingPassword) {
         await saveKEKPassword(newPassword);
       }
       spinner.succeed("Keys re-encrypted successfully");
-      success("Your encryption password has been changed");
-      warning("Remember your new password! It cannot be recovered.");
+      success("Your encryption keys have been updated for your new login password");
+      info("Use your new login password to unlock keys in the future");
     } catch (err) {
+      if (isDebug) {
+        console.log(chalk9.dim(`
+[DEBUG] Rotation error: ${err.message}`));
+        console.log(chalk9.dim(`[DEBUG] Error stack: ${err.stack}`));
+      }
       spinner.fail("Failed to re-encrypt keys");
       throw err;
     }
   } catch (err) {
+    if (isDebug) {
+      console.log(chalk9.dim(`
+[DEBUG] Outer rotation error: ${err.message}`));
+      console.log(chalk9.dim(`[DEBUG] Error stack: ${err.stack}`));
+    }
     error("Rotation failed:", err.message);
     process.exit(1);
   }
@@ -2062,9 +3089,13 @@ try {
   version = process.env.SYNCENV_VERSION || "0.0.0";
 }
 async function main() {
-  const program = new Command7();
+  const program = new Command9();
   await loadConfig();
-  program.name("syncenv").description("CLI for SyncEnv - Secure environment variable synchronization").version(version).option("-v, --verbose", "enable verbose logging").option("--api-url <url>", "API base URL", process.env.SYNCENV_API_URL || "http://localhost:8787").hook("preAction", (thisCommand) => {
+  program.name("syncenv").description("CLI for SyncEnv - Secure environment variable synchronization").version(version).option("-v, --verbose", "enable verbose logging").option(
+    "--api-url <url>",
+    "API base URL",
+    process.env.SYNCENV_API_URL || "https://syncenv-api.uagents.app"
+  ).hook("preAction", (thisCommand) => {
     const opts = thisCommand.opts();
     if (opts.verbose) {
       process.env.SYNCENV_VERBOSE = "true";
@@ -2073,11 +3104,13 @@ async function main() {
       process.env.SYNCENV_API_URL = opts.apiUrl;
     }
   });
+  program.addCommand(setupCommand);
   program.addCommand(authCommands);
   program.addCommand(projectCommands);
   program.addCommand(envCommands);
   program.addCommand(userKeysCommands);
   program.addCommand(initCommand);
+  program.addCommand(configCommands);
   program.addCommand(doctorCommand);
   program.exitOverride();
   try {
@@ -2092,7 +3125,7 @@ async function main() {
     if (error2.code === "commander.helpDisplayed") {
       process.exit(0);
     }
-    console.error(chalk8.red("\nError:"), error2.message || error2);
+    console.error(chalk10.red("\nError:"), error2.message || error2);
     if (process.env.SYNCENV_VERBOSE) {
       console.error(error2.stack);
     }