swiftpatch-cli 1.1.1 → 1.1.2

package/dist/index.js

@@ -110,11 +110,29 @@ var init_api = __esm({
         });
         this.client.interceptors.response.use(
           (response) => response,
-          (error) => {
+          async (error) => {
             if (error.response) {
               const data = error.response.data;
               const message = data?.error?.message || error.message;
-              if (error.response.status === 401) {
+              if (error.response.status === 401 && error.config && !error.config._isRetry) {
+                const refreshToken = auth.getRefreshToken();
+                if (refreshToken) {
+                  try {
+                    error.config._isRetry = true;
+                    const { data: refreshData } = await axios.post(
+                      `${baseURL}/auth/refresh`,
+                      { refreshToken }
+                    );
+                    const newAccessToken = refreshData.data?.accessToken;
+                    const newRefreshToken = refreshData.data?.refreshToken;
+                    if (newAccessToken) {
+                      auth.saveToken(newAccessToken, newRefreshToken);
+                      error.config.headers["Authorization"] = `Bearer ${newAccessToken}`;
+                      return this.client.request(error.config);
+                    }
+                  } catch {
+                  }
+                }
                 throw new Error("Authentication failed. Please run: swiftpatch login");
               }
               throw new Error(message);
@@ -124,6 +142,22 @@ var init_api = __esm({
         );
       }
       // AUTH
+      async loginWithCredentials(email, password) {
+        const response = await this.client.post("/auth/login", { email, password });
+        const result = normalizeIds(response.data.data);
+        let refreshToken;
+        const cookies = response.headers["set-cookie"];
+        if (cookies) {
+          for (const cookie of cookies) {
+            const match = cookie.match(/refreshToken=([^;]+)/);
+            if (match) {
+              refreshToken = match[1];
+              break;
+            }
+          }
+        }
+        return { accessToken: result.accessToken, refreshToken, user: result.user };
+      }
       async createLoginSession() {
         const { data } = await this.client.post("/auth/cli/session");
         return normalizeIds(data.data);
@@ -379,10 +413,16 @@ var init_auth = __esm({
         if (!token) return {};
         return { Authorization: `Bearer ${token}` };
       },
-      saveToken(token) {
+      saveToken(token, refreshToken) {
         store2.set("token", token);
+        if (refreshToken) {
+          store2.set("refreshToken", refreshToken);
+        }
         store2.delete("apiKey");
       },
+      getRefreshToken() {
+        return store2.get("refreshToken");
+      },
       async loginWithApiKey(apiKey) {
         const originalToken = store2.get("token");
         const originalApiKey = store2.get("apiKey");
@@ -408,6 +448,7 @@ var init_auth = __esm({
       },
       logout() {
         store2.delete("token");
+        store2.delete("refreshToken");
         store2.delete("apiKey");
         store2.delete("user");
       },
@@ -479,9 +520,9 @@ var logger = {
 };
 
 // src/commands/login.ts
-var loginCommand = new Command("login").description("Authenticate with SwiftPatch").option("-k, --api-key <key>", "Login with API key (for CI/CD)").option("-i, --interactive", "Force interactive login").action(async (options) => {
+var loginCommand = new Command("login").description("Authenticate with SwiftPatch").option("-k, --api-key <key>", "Login with API key (for CI/CD)").option("-e, --email <email>", "Login with email and password").option("-p, --password <password>", "Password (used with --email)").option("-i, --interactive", "Force interactive login").action(async (options) => {
   const existingToken = auth.getToken();
-  if (existingToken && !options.interactive && !options.apiKey) {
+  if (existingToken && !options.interactive && !options.apiKey && !options.email) {
     const user = await api.getCurrentUser().catch(() => null);
     if (user) {
       logger.info(`Already logged in as ${chalk2.cyan(user.email)}`);
@@ -514,23 +555,87 @@ var loginCommand = new Command("login").description("Authenticate with SwiftPatc
     }
     return;
   }
+  if (options.email) {
+    await emailLogin(options.email, options.password);
+    return;
+  }
   const { method } = await inquirer.prompt([
     {
       type: "list",
       name: "method",
       message: "How would you like to authenticate?",
       choices: [
-        { name: "Login with browser (recommended)", value: "browser" },
-        { name: "Enter API key", value: "apikey" }
+        { name: "Login with email & password", value: "email" },
+        { name: "Login with browser", value: "browser" },
+        { name: "Enter API key (for CI/CD)", value: "apikey" }
       ]
     }
   ]);
   if (method === "browser") {
     await browserLogin();
+  } else if (method === "email") {
+    await emailLoginInteractive();
   } else {
     await apiKeyLogin();
   }
 });
+async function emailLogin(email, password) {
+  if (!password) {
+    const answers = await inquirer.prompt([
+      {
+        type: "password",
+        name: "password",
+        message: "Password:",
+        mask: "*",
+        validate: (input) => input ? true : "Password is required"
+      }
+    ]);
+    password = answers.password;
+  }
+  const spinner = ora("Logging in...").start();
+  try {
+    const result = await api.loginWithCredentials(email, password);
+    auth.saveToken(result.accessToken, result.refreshToken);
+    auth.saveUser({
+      id: result.user.id || result.user._id,
+      email: result.user.email,
+      name: result.user.name
+    });
+    spinner.succeed("Login successful!");
+    console.log("");
+    logger.success(`Welcome, ${chalk2.bold(result.user.name)}!`);
+    logger.info(`Email: ${chalk2.cyan(result.user.email)}`);
+    const orgs = await api.getOrganizations();
+    if (orgs.length > 0) {
+      logger.info(`Organizations: ${orgs.map((o) => chalk2.cyan(o.name)).join(", ")}`);
+    }
+  } catch (error) {
+    spinner.fail(`Login failed: ${error.message}`);
+    process.exit(1);
+  }
+}
+async function emailLoginInteractive() {
+  const { email, password } = await inquirer.prompt([
+    {
+      type: "input",
+      name: "email",
+      message: "Email:",
+      validate: (input) => {
+        if (!input) return "Email is required";
+        if (!input.includes("@")) return "Invalid email format";
+        return true;
+      }
+    },
+    {
+      type: "password",
+      name: "password",
+      message: "Password:",
+      mask: "*",
+      validate: (input) => input ? true : "Password is required"
+    }
+  ]);
+  await emailLogin(email, password);
+}
 async function browserLogin() {
   const spinner = ora("Opening browser...").start();
   try {
@@ -3080,8 +3185,16 @@ var aiExplainCommand = new Command35("explain").description("Generate a changelo
   if (!fromRef) {
     fromRef = await getLastReleaseTag(cwd);
     if (!fromRef) {
-      fromRef = `HEAD~${Math.min(parseInt(options.maxCommits, 10), 50)}`;
-      spinner.text = `No release tags found. Using last ${options.maxCommits} commits...`;
+      const countOutput = await gitCommand(["rev-list", "--count", "HEAD"], cwd);
+      const totalCommits = countOutput ? parseInt(countOutput, 10) : 1;
+      const maxFallback = Math.min(parseInt(options.maxCommits, 10), 50, totalCommits - 1);
+      if (maxFallback <= 0) {
+        const root = await gitCommand(["rev-list", "--max-parents=0", "HEAD"], cwd);
+        fromRef = root || "HEAD";
+      } else {
+        fromRef = `HEAD~${maxFallback}`;
+      }
+      spinner.text = `No release tags found. Using last ${maxFallback > 0 ? maxFallback : "all"} commits...`;
     }
   }
   const toRef = options.to;
@@ -3282,8 +3395,16 @@ var aiReviewCommand = new Command36("review").description("AI-powered safety rev
   if (!fromRef) {
     fromRef = await gitCommand2(["describe", "--tags", "--abbrev=0", "HEAD~1"], cwd);
     if (!fromRef) {
-      fromRef = "HEAD~10";
-      spinner.text = "No tags found. Comparing against last 10 commits...";
+      const countOutput = await gitCommand2(["rev-list", "--count", "HEAD"], cwd);
+      const totalCommits = countOutput ? parseInt(countOutput, 10) : 1;
+      const maxFallback = Math.min(10, totalCommits - 1);
+      if (maxFallback <= 0) {
+        const root = await gitCommand2(["rev-list", "--max-parents=0", "HEAD"], cwd);
+        fromRef = root || "HEAD";
+      } else {
+        fromRef = `HEAD~${maxFallback}`;
+      }
+      spinner.text = `No tags found. Comparing against last ${maxFallback > 0 ? maxFallback : "all"} commits...`;
     }
   }
   const toRef = options.to;
@@ -3422,9 +3543,15 @@ aiCommand.command("ask").description("Ask AI about your releases, crashes, or de
       buffer = lines.pop() || "";
       for (const line of lines) {
         if (line.startsWith("data: ")) {
-          const data = line.slice(6);
+          const data = line.slice(6).trim();
           if (data === "[DONE]") break;
-          process.stdout.write(data);
+          try {
+            const parsed = JSON.parse(data);
+            const text = parsed.content || parsed.text || parsed.delta?.content || "";
+            if (text) process.stdout.write(text);
+          } catch {
+            process.stdout.write(data);
+          }
         }
       }
     }
@@ -3442,9 +3569,9 @@ aiCommand.command("ask").description("Ask AI about your releases, crashes, or de
     clearTimeout(timeout);
   }
 });
-aiCommand.command("risk-score").description("Get AI risk assessment for a release").requiredOption("-o, --org <org-id>", "Organization ID").requiredOption("-a, --app <app-id>", "App ID").requiredOption("-r, --release <release-id>", "Release ID").option("--json", "Output as JSON").action(async (options) => {
+aiCommand.command("risk-score").description("Get AI risk assessment for a release").option("-o, --org <org-id>", "Organization ID").requiredOption("-a, --app <app-id>", "App ID").requiredOption("-r, --release <release-id>", "Release ID").option("--json", "Output as JSON").action(async (options) => {
   await requireAuth();
-  const orgId = options.org;
+  const orgId = await resolveOrgId(options.org);
   const spinner = ora30("Assessing release risk...").start();
   try {
     const assessment = await api.aiRiskAssessment(orgId, options.app, options.release);
@@ -3481,11 +3608,12 @@ aiCommand.command("risk-score").description("Get AI risk assessment for a releas
     process.exit(1);
   }
 });
-aiCommand.command("crashes").description("List AI-grouped crash reports for an app").requiredOption("-o, --org <org-id>", "Organization ID").requiredOption("-a, --app <app-id>", "App ID").option("-s, --status <status>", "Filter by status (OPEN, RESOLVED, IGNORED)", "OPEN").option("-l, --limit <limit>", "Maximum number of results", "10").option("--json", "Output as JSON").action(async (options) => {
+aiCommand.command("crashes").description("List AI-grouped crash reports for an app").option("-o, --org <org-id>", "Organization ID").requiredOption("-a, --app <app-id>", "App ID").option("-s, --status <status>", "Filter by status (OPEN, RESOLVED, IGNORED)", "OPEN").option("-l, --limit <limit>", "Maximum number of results", "10").option("--json", "Output as JSON").action(async (options) => {
   await requireAuth();
+  const orgId = await resolveOrgId(options.org);
   const spinner = ora30("Fetching crash groups...").start();
   try {
-    const groups = await api.aiCrashGroups(options.org, options.app, {
+    const groups = await api.aiCrashGroups(orgId, options.app, {
       status: options.status,
       limit: parseInt(options.limit, 10)
     });
@@ -3521,11 +3649,12 @@ aiCommand.command("crashes").description("List AI-grouped crash reports for an a
     process.exit(1);
   }
 });
-aiCommand.command("insights").description("View AI-generated insights for an app").requiredOption("-o, --org <org-id>", "Organization ID").requiredOption("-a, --app <app-id>", "App ID").option("-s, --status <status>", "Filter by status (ACTIVE, ACKNOWLEDGED, DISMISSED)", "ACTIVE").option("--json", "Output as JSON").action(async (options) => {
+aiCommand.command("insights").description("View AI-generated insights for an app").option("-o, --org <org-id>", "Organization ID").requiredOption("-a, --app <app-id>", "App ID").option("-s, --status <status>", "Filter by status (ACTIVE, ACKNOWLEDGED, DISMISSED)", "ACTIVE").option("--json", "Output as JSON").action(async (options) => {
   await requireAuth();
+  const orgId = await resolveOrgId(options.org);
   const spinner = ora30("Fetching AI insights...").start();
   try {
-    const insights = await api.aiInsights(options.org, options.app, {
+    const insights = await api.aiInsights(orgId, options.app, {
       status: options.status
     });
     spinner.stop();