devwing 0.1.5 → 0.1.7

package/dist/index.js

@@ -10,7 +10,7 @@ import ora from 'ora';
 import boxen from 'boxen';
 import gradient from 'gradient-string';
 import terminalLink from 'terminal-link';
-import { promises, readFileSync } from 'fs';
+import { readFileSync, promises } from 'fs';
 import path, { dirname, join } from 'path';
 import os from 'os';
 import { exec, execSync } from 'child_process';
@@ -72,16 +72,21 @@ var ConfigManager = class {
     }
   }
   /**
-   * Get API URL
+   * Get API URL — ensures /api/v1 suffix is always present
    */
   getApiUrl() {
-    return this.conf.get("apiUrl");
+    let url = this.conf.get("apiUrl");
+    if (url && !url.endsWith("/api/v1") && url.includes("devwing.ai")) {
+      url = url.replace(/\/+$/, "") + "/api/v1";
+      this.conf.set("apiUrl", url);
+    }
+    return url;
   }
   /**
    * Set API URL (for development/testing)
    */
   setApiUrl(url) {
-    this.conf.set("apiUrl", url);
+    this.conf.set("apiUrl", url.replace(/\/+$/, ""));
   }
   /**
    * Get current workspace ID
@@ -157,6 +162,11 @@ var ConfigManager = class {
   }
 };
 var configManager = new ConfigManager();
+function extractErrorMessage(data) {
+  if (!data) return "Unknown error";
+  if (typeof data === "string") return data;
+  return data.detail || data.message || data.error || JSON.stringify(data);
+}
 var APIClient = class {
   client;
   jwtToken = null;
@@ -180,9 +190,18 @@ var APIClient = class {
       (response) => response,
       (error) => {
         if (error.response?.data) {
-          throw new Error(error.response.data.message || error.response.data.error);
+          const message = extractErrorMessage(error.response.data);
+          const err = new Error(message);
+          err.statusCode = error.response.status;
+          throw err;
+        }
+        if (error.code === "ECONNREFUSED") {
+          throw new Error("Cannot connect to DevWing API. Is the server running?");
+        }
+        if (error.code === "ENOTFOUND") {
+          throw new Error("Cannot resolve DevWing API hostname. Check your internet connection.");
         }
-        throw error;
+        throw new Error(error.message || "Network error");
       }
     );
   }
@@ -194,11 +213,22 @@ var APIClient = class {
   }
   /**
    * Login with email and password
+   * Returns full login response including 2FA handling
    */
   async login(email, password) {
     const response = await this.client.post("/auth/login", { email, password });
     return response.data;
   }
+  /**
+   * Complete 2FA login
+   */
+  async complete2FA(tempToken, totpCode) {
+    const response = await this.client.post("/auth/2fa/complete", {
+      temp_token: tempToken,
+      totp_code: totpCode
+    });
+    return response.data;
+  }
   /**
    * Get current user profile
    */
@@ -249,8 +279,13 @@ var APIClient = class {
       body: JSON.stringify(request)
     });
     if (!response.ok) {
-      const error = await response.json();
-      throw new Error(error.message || "Failed to get completion");
+      let errorMsg = `API error (${response.status})`;
+      try {
+        const error = await response.json();
+        errorMsg = extractErrorMessage(error);
+      } catch {
+      }
+      throw new Error(errorMsg);
     }
     if (!response.body) {
       throw new Error("No response body");
@@ -261,8 +296,7 @@ var APIClient = class {
         try {
           const message = JSON.parse(event.data);
           yield message;
-        } catch (error) {
-          console.error("Failed to parse SSE message:", error);
+        } catch {
         }
       }
     }
@@ -288,8 +322,13 @@ var APIClient = class {
       })
     });
     if (!response.ok) {
-      const error = await response.json();
-      throw new Error(error.message || "Failed to continue completion");
+      let errorMsg = `API error (${response.status})`;
+      try {
+        const error = await response.json();
+        errorMsg = extractErrorMessage(error);
+      } catch {
+      }
+      throw new Error(errorMsg);
     }
     if (!response.body) {
       throw new Error("No response body");
@@ -300,18 +339,25 @@ var APIClient = class {
         try {
           const message = JSON.parse(event.data);
           yield message;
-        } catch (error) {
-          console.error("Failed to parse SSE message:", error);
+        } catch {
         }
       }
     }
   }
   /**
    * Get project memory
+   * Backend returns { memories: [...], total: N }
    */
   async getProjectMemory(projectId) {
     const response = await this.client.get(`/memory/${projectId}`);
-    return response.data;
+    const data = response.data;
+    if (data.memories && Array.isArray(data.memories)) {
+      return data.memories;
+    }
+    if (Array.isArray(data)) {
+      return data;
+    }
+    return [];
   }
   /**
    * Add project memory
@@ -331,7 +377,14 @@ var APIClient = class {
    */
   async getModels() {
     const response = await this.client.get("/models");
-    return response.data;
+    const data = response.data;
+    if (data.models && Array.isArray(data.models)) {
+      return data.models;
+    }
+    if (Array.isArray(data)) {
+      return data;
+    }
+    return [];
   }
   /**
    * Get usage stats
@@ -467,6 +520,12 @@ var Logger = class {
   }
 };
 var logger = new Logger();
+function getUserPlan(user) {
+  return user.subscription_plan || user.plan || "free";
+}
+function getUserDisplayName(user) {
+  return user.full_name || user.username || user.email;
+}
 async function loginCommand() {
   try {
     const existingKey = await configManager.getApiKey();
@@ -492,8 +551,8 @@ async function loginCommand() {
         name: "method",
         message: "How would you like to authenticate?",
         choices: [
-          { name: "Email & Password", value: "email" },
           { name: "Via Browser (easiest)", value: "browser" },
+          { name: "Email & Password", value: "email" },
           { name: "API Key (from dashboard)", value: "apikey" }
         ]
       }
@@ -506,7 +565,10 @@ async function loginCommand() {
       await loginWithApiKey();
     }
   } catch (error) {
-    logger.error("Login failed", error);
+    logger.error("Login failed");
+    if (error.message) {
+      logger.error(error.message);
+    }
     process.exit(1);
   }
 }
@@ -517,7 +579,7 @@ async function loginWithEmail() {
       name: "email",
       message: "Email:",
       validate: (input) => {
-        if (!input.includes("@")) {
+        if (!input.includes("@") || !input.includes(".")) {
           return "Please enter a valid email address";
         }
         return true;
@@ -527,23 +589,56 @@ async function loginWithEmail() {
       type: "password",
       name: "password",
       message: "Password:",
-      mask: "*"
+      mask: "*",
+      validate: (input) => {
+        if (!input || input.length < 1) {
+          return "Password is required";
+        }
+        return true;
+      }
     }
   ]);
   logger.startSpinner("Authenticating...");
   try {
-    const { access_token, user } = await apiClient.login(email, password);
-    apiClient.setJwtToken(access_token);
+    let loginResult = await apiClient.login(email, password);
+    if (loginResult.requires_2fa) {
+      logger.succeedSpinner("Credentials verified");
+      logger.info("Two-factor authentication is enabled on your account");
+      const { totpCode } = await inquirer.prompt([
+        {
+          type: "input",
+          name: "totpCode",
+          message: "2FA Code (from authenticator app):",
+          validate: (input) => {
+            if (!/^\d{6}$/.test(input)) {
+              return "Please enter a 6-digit code";
+            }
+            return true;
+          }
+        }
+      ]);
+      logger.startSpinner("Verifying 2FA code...");
+      loginResult = await apiClient.complete2FA(loginResult.temp_token, totpCode);
+    }
+    if (!loginResult.access_token || !loginResult.user) {
+      logger.failSpinner("Login failed");
+      logger.error("Unexpected response from server");
+      return;
+    }
+    apiClient.setJwtToken(loginResult.access_token);
     logger.updateSpinner("Creating API key...");
-    const { key } = await apiClient.createApiKey("CLI - Auto-generated");
+    const apiKeyResult = await apiClient.createApiKey("CLI - Auto-generated");
     apiClient.setJwtToken(null);
-    await configManager.setApiKey(key);
-    logger.succeedSpinner(`Welcome back, ${user.full_name || user.email}!`);
-    logger.success(`Plan: ${user.plan.toUpperCase()}`);
+    await configManager.setApiKey(apiKeyResult.key);
+    const user = loginResult.user;
+    const plan = getUserPlan(user);
+    logger.succeedSpinner(`Welcome back, ${getUserDisplayName(user)}!`);
+    logger.success(`Plan: ${plan.toUpperCase()}`);
     logger.newline();
     showQuickStart();
   } catch (error) {
     logger.failSpinner("Authentication failed");
+    logger.error(error.message || "Unknown error occurred");
     throw error;
   }
 }
@@ -552,21 +647,23 @@ async function loginWithBrowser() {
   const open = await import('open');
   logger.startSpinner("Initiating browser authentication...");
   try {
-    const deviceInfo = `DevWing CLI on ${os2.platform()}`;
+    const deviceInfo = `DevWing CLI on ${os2.platform()} (${os2.hostname()})`;
     const initResponse = await apiClient.initiateCliAuth(deviceInfo);
-    logger.succeedSpinner("Opening browser...");
+    logger.succeedSpinner("Device code created");
     logger.newline();
+    const verifyUrl = initResponse.verification_url_complete;
     try {
-      await open.default(initResponse.verification_url_complete);
-      logger.success("Browser opened! Please log in to complete authentication.");
-    } catch (err) {
-      logger.warn("Could not open browser automatically");
-      logger.info(`Please visit: ${chalk3.cyan(initResponse.verification_url_complete)}`);
+      await open.default(verifyUrl);
+      logger.success("Browser opened! Please log in to authorize this device.");
+    } catch {
+      logger.warn("Could not open browser automatically.");
+      logger.info(`Please visit: ${chalk3.cyan(verifyUrl)}`);
     }
     logger.newline();
+    logger.info(chalk3.dim(`Device code: ${initResponse.user_code.substring(0, 8)}...`));
     logger.startSpinner("Waiting for authorization...");
-    const pollInterval = initResponse.interval * 1e3;
-    const maxAttempts = Math.floor(initResponse.expires_in / initResponse.interval);
+    const pollInterval = (initResponse.interval || 5) * 1e3;
+    const maxAttempts = Math.floor((initResponse.expires_in || 900) / (initResponse.interval || 5));
     let attempts = 0;
     const pollForAuth = async () => {
       return new Promise((resolve, reject) => {
@@ -574,13 +671,11 @@ async function loginWithBrowser() {
           attempts++;
           if (attempts >= maxAttempts) {
             clearInterval(interval);
-            reject(new Error("Authentication timed out. Please try again."));
+            reject(new Error('Authentication timed out. Please try again with "devwing login".'));
             return;
           }
           try {
-            const pollResponse = await apiClient.pollCliAuth(
-              initResponse.device_code
-            );
+            const pollResponse = await apiClient.pollCliAuth(initResponse.device_code);
             if (pollResponse.status === "authorized" && pollResponse.api_key) {
               clearInterval(interval);
               resolve(pollResponse.api_key);
@@ -589,11 +684,12 @@ async function loginWithBrowser() {
               reject(new Error("Authorization denied by user."));
             } else if (pollResponse.status === "expired") {
               clearInterval(interval);
-              reject(
-                new Error('Device code expired. Please run "devwing login" again.')
-              );
+              reject(new Error('Device code expired. Please run "devwing login" again.'));
             }
           } catch (error) {
+            if (error.statusCode === 429) {
+              return;
+            }
             clearInterval(interval);
             reject(error);
           }
@@ -604,12 +700,14 @@ async function loginWithBrowser() {
     await configManager.setApiKey(apiKey);
     logger.updateSpinner("Fetching profile...");
     const user = await apiClient.getProfile();
-    logger.succeedSpinner(`Welcome, ${user.full_name || user.email}!`);
-    logger.success(`Plan: ${user.plan.toUpperCase()}`);
+    const plan = getUserPlan(user);
+    logger.succeedSpinner(`Welcome, ${getUserDisplayName(user)}!`);
+    logger.success(`Plan: ${plan.toUpperCase()}`);
     logger.newline();
     showQuickStart();
   } catch (error) {
     logger.failSpinner("Browser authentication failed");
+    logger.error(error.message || "Unknown error");
     throw error;
   }
 }
@@ -642,13 +740,15 @@ async function loginWithApiKey() {
   try {
     await configManager.setApiKey(apiKey);
     const user = await apiClient.getProfile();
-    logger.succeedSpinner(`Successfully authenticated as ${user.full_name || user.email}!`);
-    logger.success(`Plan: ${user.plan.toUpperCase()}`);
+    const plan = getUserPlan(user);
+    logger.succeedSpinner(`Authenticated as ${getUserDisplayName(user)}!`);
+    logger.success(`Plan: ${plan.toUpperCase()}`);
     logger.newline();
     showQuickStart();
   } catch (error) {
     await configManager.deleteApiKey();
     logger.failSpinner("Invalid API key");
+    logger.error(error.message || "Could not verify API key");
     throw error;
   }
 }
@@ -677,7 +777,8 @@ async function logoutCommand() {
     configManager.setApiUrl(apiUrl);
     logger.success("Successfully logged out");
   } catch (error) {
-    logger.error("Logout failed", error);
+    logger.error("Logout failed");
+    logger.error(error.message || "Unknown error");
     process.exit(1);
   }
 }
@@ -692,15 +793,19 @@ async function statusCommand() {
     logger.startSpinner("Fetching profile...");
     try {
       const user = await apiClient.getProfile();
+      const plan = getUserPlan(user);
       logger.succeedSpinner("Authenticated");
       logger.newline();
       console.log(chalk3.bold("User Profile:"));
       console.log(`  Email: ${user.email}`);
-      console.log(`  Name: ${user.full_name || "Not set"}`);
-      console.log(`  Plan: ${user.plan.toUpperCase()}`);
-      console.log(
-        `  Tokens used today: ${user.tokens_used_today.toLocaleString()}`
-      );
+      console.log(`  Name: ${getUserDisplayName(user)}`);
+      console.log(`  Plan: ${plan.toUpperCase()}`);
+      if (user.is_verified !== void 0) {
+        console.log(`  Verified: ${user.is_verified ? chalk3.green("Yes") : chalk3.yellow("No")}`);
+      }
+      if (user.totp_enabled !== void 0) {
+        console.log(`  2FA: ${user.totp_enabled ? chalk3.green("Enabled") : chalk3.dim("Disabled")}`);
+      }
       const config = configManager.getAll();
       if (config.workspaceId) {
         console.log(`  Workspace: ${config.workspaceId}`);
@@ -711,11 +816,12 @@ async function statusCommand() {
       logger.newline();
     } catch (error) {
       logger.failSpinner("Failed to fetch profile");
-      logger.error("API key may be invalid or expired");
+      logger.error(error.message || "API key may be invalid or expired");
       logger.info('Run "devwing login" to re-authenticate');
     }
   } catch (error) {
-    logger.error("Failed to check status", error);
+    logger.error("Failed to check status");
+    logger.error(error.message || "Unknown error");
     process.exit(1);
   }
 }
@@ -725,6 +831,7 @@ function showQuickStart() {
       "Quick Start:",
       "",
       '  devwing "fix the auth bug"       Ask anything',
+      "  devwing chat                     Interactive chat mode",
       "  devwing scan                     Security scan",
       "  devwing review                   Code review",
       "  devwing explain file.js          Explain code",
@@ -2115,9 +2222,21 @@ var __filename2 = fileURLToPath(import.meta.url);
 var __dirname2 = dirname(__filename2);
 function getCurrentVersion() {
   try {
-    const packageJsonPath = join(__dirname2, "../../package.json");
-    const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
-    return packageJson.version;
+    const possiblePaths = [
+      join(__dirname2, "../package.json"),
+      // Production: dist/ -> package.json
+      join(__dirname2, "../../package.json")
+      // Development: src/commands/ -> package.json
+    ];
+    for (const packageJsonPath of possiblePaths) {
+      try {
+        const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+        return packageJson.version;
+      } catch {
+        continue;
+      }
+    }
+    throw new Error("package.json not found in any expected location");
   } catch (error) {
     logger.error("Failed to read package version", error);
     return "0.1.0";
@@ -2125,12 +2244,24 @@ function getCurrentVersion() {
 }
 function getPackageName() {
   try {
-    const packageJsonPath = join(__dirname2, "../../package.json");
-    const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
-    return packageJson.name;
+    const possiblePaths = [
+      join(__dirname2, "../package.json"),
+      // Production: dist/ -> package.json
+      join(__dirname2, "../../package.json")
+      // Development: src/commands/ -> package.json
+    ];
+    for (const packageJsonPath of possiblePaths) {
+      try {
+        const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+        return packageJson.name;
+      } catch {
+        continue;
+      }
+    }
+    throw new Error("package.json not found in any expected location");
   } catch (error) {
     logger.error("Failed to read package name", error);
-    return "@devwing/cli";
+    return "devwing";
   }
 }
 async function getLatestVersion(packageName) {
@@ -2254,10 +2385,24 @@ async function updateCommand(options) {
     process.exit(1);
   }
 }
-
-// src/index.ts
 var program = new Command();
-var VERSION = "0.1.4";
+var __cliFilename = fileURLToPath(import.meta.url);
+var __cliDirname = dirname(__cliFilename);
+function getVersion() {
+  const paths = [
+    join(__cliDirname, "../package.json"),
+    join(__cliDirname, "../../package.json")
+  ];
+  for (const p of paths) {
+    try {
+      return JSON.parse(readFileSync(p, "utf-8")).version;
+    } catch {
+      continue;
+    }
+  }
+  return "0.1.6";
+}
+var VERSION = getVersion();
 program.name("devwing").description("DevWing.ai - Your AI Wingman in the Terminal").version(VERSION, "-v, --version", "Display version number").helpOption("-h, --help", "Display help information");
 program.option("--mode <mode>", "AI mode: general|frontend|backend|security|devops").option("--model <model>", "Specific model to use").option("--project <id>", "Project ID").option("--workspace <id>", "Workspace ID").option("--verbose", "Verbose output for debugging").option("-y, --yes", "Auto-confirm destructive actions");
 program.command("login").description("Authenticate with DevWing").action(async () => {
@@ -2324,10 +2469,12 @@ program.exitOverride();
 try {
   await program.parseAsync(process.argv);
 } catch (error) {
-  if (error.code === "commander.help" || error.code === "commander.version") {
+  if (error.code === "commander.help" || error.code === "commander.helpDisplayed" || error.code === "commander.version") {
     process.exit(0);
   }
-  logger.error("An error occurred", error);
+  if (error.message && !error.message.includes("process.exit")) {
+    logger.error(error.message);
+  }
   if (process.env.DEBUG) {
     console.error(error);
   }