@bragduck/cli 2.0.3 → 2.0.23

package/dist/bin/bragduck.js

@@ -29,7 +29,7 @@ var init_constants = __esm({
     init_esm_shims();
     __filename = fileURLToPath2(import.meta.url);
     __dirname = dirname(__filename);
-    config({ path: join(__dirname, "..", "..", ".env") });
+    config({ path: join(__dirname, "..", "..", ".env"), debug: false, quiet: true });
     APP_NAME = "bragduck";
     CONFIG_KEYS = {
       DEFAULT_COMMIT_DAYS: "defaultCommitDays",
@@ -52,14 +52,21 @@ var init_constants = __esm({
         INITIATE: "/v1/auth/cli/initiate",
         TOKEN: "/v1/auth/cli/token"
       },
-      COMMITS: {
-        REFINE: "/v1/commits/refine"
-      },
       BRAGS: {
         CREATE: "/v1/brags",
-        LIST: "/v1/brags"
+        LIST: "/v1/brags",
+        REFINE: "/v1/brags/refine"
+      },
+      SUBSCRIPTION: {
+        STATUS: "/v1/subscriptions/status"
       },
-      VERSION: "/v1/cli/version"
+      VERSION: "/v1/cli/version",
+      /**
+       * @deprecated Use BRAGS.REFINE instead
+       */
+      COMMITS: {
+        REFINE: "/v1/commits/refine"
+      }
     };
     ENCRYPTION_CONFIG = {
       ALGORITHM: "aes-256-gcm",
@@ -522,7 +529,9 @@ async function startOAuthCallbackServer(expectedState) {
       reject(new OAuthError(`OAuth server error: ${error.message}`));
     });
     server.listen(port, "127.0.0.1", () => {
-      logger.debug(`OAuth callback server listening on http://127.0.0.1:${port}${OAUTH_CONFIG.CALLBACK_PATH}`);
+      logger.debug(
+        `OAuth callback server listening on http://127.0.0.1:${port}${OAUTH_CONFIG.CALLBACK_PATH}`
+      );
     });
     timeoutId = globalThis.setTimeout(() => {
       logger.debug("OAuth callback timeout");
@@ -683,10 +692,8 @@ async function openBrowser(url) {
     logger.debug("Browser opened successfully");
   } catch (error) {
     logger.debug(`Failed to open browser: ${error}`);
-    throw new Error(
-      `Failed to open browser automatically. Please open this URL manually:
-${url}`
-    );
+    throw new Error(`Failed to open browser automatically. Please open this URL manually:
+${url}`);
   }
 }
 var execAsync;
@@ -1066,22 +1073,29 @@ var init_api_service = __esm({
           // Request interceptor
           onRequest: async ({ options }) => {
             const extendedOptions = options;
-            logger.debug(`API Request: ${options.method} ${extendedOptions.baseURL}${extendedOptions.url}`);
+            logger.debug(
+              `API Request: ${options.method} ${extendedOptions.baseURL}${extendedOptions.url}`
+            );
             const cliVersion = getCliVersion();
             const platform = getPlatformInfo();
             const userAgent = `BragDuck-CLI/${cliVersion} (${platform})`;
             const token = await authService.getAccessToken();
-            const headers = {
-              ...options.headers,
+            const newHeaders = {
               "User-Agent": userAgent
             };
+            if (options.headers) {
+              const existingHeaders = new Headers(options.headers);
+              existingHeaders.forEach((value, key) => {
+                newHeaders[key] = value;
+              });
+            }
             if (token) {
-              headers.Authorization = `Bearer ${token}`;
+              newHeaders.Authorization = `Bearer ${token}`;
             }
             if (options.method && ["POST", "PUT", "PATCH"].includes(options.method)) {
-              headers["Content-Type"] = "application/json";
+              newHeaders["Content-Type"] = "application/json";
             }
-            options.headers = headers;
+            options.headers = newHeaders;
           },
           // Response interceptor for success
           onResponse: ({ response }) => {
@@ -1103,7 +1117,9 @@ var init_api_service = __esm({
                 if (error.message === "RETRY_WITH_NEW_TOKEN") {
                   throw error;
                 }
-                throw new TokenExpiredError('Your session has expired. Please run "bragduck init" to login again.');
+                throw new TokenExpiredError(
+                  'Your session has expired. Please run "bragduck init" to login again.'
+                );
               }
             }
             let errorMessage = "An unexpected error occurred";
@@ -1149,18 +1165,34 @@ var init_api_service = __esm({
         }
       }
       /**
-       * Refine commits using AI
+       * Refine brags using AI
+       */
+      async refineBrags(request) {
+        logger.debug(`Refining ${request.brags.length} brags`);
+        try {
+          const response = await this.makeRequest(API_ENDPOINTS.BRAGS.REFINE, {
+            method: "POST",
+            body: request
+          });
+          logger.debug(`Successfully refined ${response.refined_brags.length} brags`);
+          return response;
+        } catch (_error) {
+          logger.debug("Failed to refine brags");
+          throw _error;
+        }
+      }
+      /**
+       * @deprecated Use refineBrags() instead. Will be removed in v3.0.0
+       * Refine commits using AI (legacy endpoint)
        */
       async refineCommits(request) {
+        logger.debug(`[DEPRECATED] Using legacy refineCommits - migrate to refineBrags`);
         logger.debug(`Refining ${request.commits.length} commits`);
         try {
-          const response = await this.makeRequest(
-            API_ENDPOINTS.COMMITS.REFINE,
-            {
-              method: "POST",
-              body: request
-            }
-          );
+          const response = await this.makeRequest(API_ENDPOINTS.COMMITS.REFINE, {
+            method: "POST",
+            body: request
+          });
           logger.debug(`Successfully refined ${response.refined_commits.length} commits`);
           return response;
         } catch (_error) {
@@ -1174,13 +1206,10 @@ var init_api_service = __esm({
       async createBrags(request) {
         logger.debug(`Creating ${request.brags.length} brags`);
         try {
-          const response = await this.makeRequest(
-            API_ENDPOINTS.BRAGS.CREATE,
-            {
-              method: "POST",
-              body: request
-            }
-          );
+          const response = await this.makeRequest(API_ENDPOINTS.BRAGS.CREATE, {
+            method: "POST",
+            body: request
+          });
           logger.debug(`Successfully created ${response.created} brags`);
           return response;
         } catch (_error) {
@@ -1209,25 +1238,45 @@ var init_api_service = __esm({
           const response = await this.makeRequest(url, {
             method: "GET"
           });
-          logger.debug(`Successfully fetched ${response.brags.length} brags (total: ${response.total})`);
+          logger.debug(
+            `Successfully fetched ${response.brags.length} brags (total: ${response.total})`
+          );
           return response;
         } catch (_error) {
           logger.debug("Failed to list brags");
           throw _error;
         }
       }
+      /**
+       * Get user's subscription status
+       */
+      async getSubscriptionStatus() {
+        logger.debug(`Fetching subscription status from ${API_ENDPOINTS.SUBSCRIPTION.STATUS}`);
+        try {
+          const response = await this.makeRequest(API_ENDPOINTS.SUBSCRIPTION.STATUS, {
+            method: "GET"
+          });
+          logger.debug(`Subscription API response: ${JSON.stringify(response)}`);
+          const subscriptionData = response.data;
+          logger.debug(
+            `Subscription tier: ${subscriptionData.tier}, status: ${subscriptionData.status}`
+          );
+          return subscriptionData;
+        } catch (error) {
+          logger.debug(`Failed to fetch subscription status: ${error}`);
+          logger.debug(`Error details: ${JSON.stringify(error, null, 2)}`);
+          throw error;
+        }
+      }
       /**
        * Check for CLI updates
        */
       async checkVersion() {
         logger.debug("Checking for CLI updates");
         try {
-          const response = await this.makeRequest(
-            API_ENDPOINTS.VERSION,
-            {
-              method: "GET"
-            }
-          );
+          const response = await this.makeRequest(API_ENDPOINTS.VERSION, {
+            method: "GET"
+          });
           logger.debug(`Latest version: ${response.latest_version}`);
           return response;
         } catch {
@@ -1395,14 +1444,17 @@ async function logoutCommand() {
   const isAuthenticated = await authService.isAuthenticated();
   if (!isAuthenticated) {
     logger.log(
-      boxen2(`${chalk3.yellow("Not currently authenticated")}
+      boxen2(
+        `${chalk3.yellow("Not currently authenticated")}
 
-${chalk3.dim("Nothing to logout from")}`, {
-        padding: 1,
-        margin: 1,
-        borderStyle: "round",
-        borderColor: "yellow"
-      })
+${chalk3.dim("Nothing to logout from")}`,
+        {
+          padding: 1,
+          margin: 1,
+          borderStyle: "round",
+          borderColor: "yellow"
+        }
+      )
     );
     return;
   }
@@ -1448,6 +1500,13 @@ ${chalk3.dim("Run")} ${chalk3.cyan("bragduck init")} ${chalk3.dim("to login agai
 init_esm_shims();
 import boxen6 from "boxen";
 
+// node_modules/@inquirer/core/dist/esm/lib/errors.mjs
+init_esm_shims();
+var CancelPromptError = class extends Error {
+  name = "CancelPromptError";
+  message = "Prompt was canceled";
+};
+
 // src/services/github.service.ts
 init_esm_shims();
 init_errors();
@@ -1585,7 +1644,9 @@ var GitService = class {
         insertions: diffSummary.insertions,
         deletions: diffSummary.deletions
       };
-      logger.debug(`Commit ${sha}: ${stats.filesChanged} files, +${stats.insertions} -${stats.deletions}`);
+      logger.debug(
+        `Commit ${sha}: ${stats.filesChanged} files, +${stats.insertions} -${stats.deletions}`
+      );
       return stats;
     } catch (error) {
       if (error.message && error.message.includes("unknown revision")) {
@@ -1876,6 +1937,7 @@ var githubService = new GitHubService();
 init_api_service();
 init_storage_service();
 init_logger();
+init_browser();
 
 // src/utils/auth-helper.ts
 init_esm_shims();
@@ -2078,14 +2140,12 @@ function formatCommitChoice(commit) {
   if (commit.diffStats) {
     const { filesChanged, insertions, deletions } = commit.diffStats;
     sizeIndicator = ` ${getSizeIndicator(insertions, deletions)}`;
-    stats = colors.info(
-      ` [${filesChanged} files, ${formatDiffStats(insertions, deletions)}]`
-    );
+    stats = colors.info(` [${filesChanged} files, ${formatDiffStats(insertions, deletions)}]`);
   }
   return `${displaySha} ${title}${sizeIndicator}${stats}
     ${author} \u2022 ${date}${bodyPreview}`;
 }
-function formatRefinedCommitsTable(commits) {
+function formatRefinedCommitsTable(brags, selectedCommits) {
   const table = new Table({
     head: [
       colors.primary("SHA"),
@@ -2098,17 +2158,30 @@ function formatRefinedCommitsTable(commits) {
     wordWrap: true,
     style: tableStyles.default.style
   });
-  commits.forEach((commit, index) => {
+  brags.forEach((brag, index) => {
+    const isNewBragType = !("sha" in brag);
     let displaySha;
-    if (commit.sha.startsWith("pr-")) {
-      displaySha = commit.sha.replace("pr-", "#");
+    if (isNewBragType && selectedCommits) {
+      const commit = selectedCommits[index];
+      if (commit.sha.startsWith("pr-")) {
+        displaySha = commit.sha.replace("pr-", "#");
+      } else {
+        displaySha = commit.sha.substring(0, 7);
+      }
+    } else if (!isNewBragType) {
+      const commit = brag;
+      if (commit.sha.startsWith("pr-")) {
+        displaySha = commit.sha.replace("pr-", "#");
+      } else {
+        displaySha = commit.sha.substring(0, 7);
+      }
     } else {
-      displaySha = commit.sha.substring(0, 7);
+      displaySha = `#${index + 1}`;
     }
-    const original = commit.original_message.split("\n")[0] || "";
-    const title = commit.refined_title;
-    const description = commit.refined_description.length > 100 ? commit.refined_description.substring(0, 97) + "..." : commit.refined_description;
-    const tags = (commit.suggested_tags || []).join(", ") || "none";
+    const original = isNewBragType ? typeof brag.original_input === "string" ? brag.original_input.split("\n")[0] || "" : "Raw input" : brag.original_message.split("\n")[0] || "";
+    const title = brag.refined_title;
+    const description = brag.refined_description.length > 100 ? brag.refined_description.substring(0, 97) + "..." : brag.refined_description;
+    const tags = (brag.suggested_tags || []).join(", ") || "none";
     const rowNum = colors.infoDim(`${index + 1}.`);
     table.push([
       `${rowNum} ${colors.highlight(displaySha)}`,
@@ -2213,7 +2286,11 @@ async function promptDaysToScan(defaultDays = 30) {
 }
 async function promptSortOption() {
   const choices = [
-    { name: "By date (newest first)", value: "date", description: "Most recent PRs first" },
+    {
+      name: "By date (newest first)",
+      value: "date",
+      description: "Most recent PRs first"
+    },
     { name: "By size (largest first)", value: "size", description: "Most lines changed" },
     { name: "By files (most files)", value: "files", description: "Most files changed" },
     { name: "No sorting", value: "none", description: "Keep original order" }
@@ -2252,7 +2329,13 @@ ${theme.label("Impact Score")} ${colors.highlight(commit.impact_score?.toString(
         { name: "\u270E Edit description", value: "edit-desc", description: "Modify the description" },
         { name: "\u270E Edit both", value: "edit-both", description: "Modify title and description" },
         { name: "\u2717 Skip", value: "skip", description: "Skip this brag" },
-        ...current < total ? [{ name: "\u2713 Accept all remaining", value: "accept-all", description: "Accept this and all remaining brags" }] : [],
+        ...current < total ? [
+          {
+            name: "\u2713 Accept all remaining",
+            value: "accept-all",
+            description: "Accept this and all remaining brags"
+          }
+        ] : [],
         { name: "\u2717 Cancel", value: "cancel", description: "Cancel and discard all brags" }
       ]
     });
@@ -2373,6 +2456,46 @@ async function scanCommand(options = {}) {
     if (!isAuthenticated) {
       process.exit(1);
     }
+    logger.debug("Fetching subscription status...");
+    const subscriptionStatus = await apiService.getSubscriptionStatus();
+    logger.debug("Subscription status response:", JSON.stringify(subscriptionStatus, null, 2));
+    logger.debug(
+      `Checking tier: "${subscriptionStatus.tier}" (type: ${typeof subscriptionStatus.tier})`
+    );
+    logger.debug(`Tier === 'FREE': ${subscriptionStatus.tier === "FREE"}`);
+    if (subscriptionStatus.tier === "FREE") {
+      logger.debug("FREE tier detected - blocking scan command");
+      logger.log("");
+      logger.log(
+        boxen6(
+          theme.warning("CLI Access Requires Subscription") + "\n\nThe Bragduck CLI is available for Plus and Pro subscribers.\nUpgrade now to unlock:\n\n  \u2022 Automatic PR scanning\n  \u2022 AI-powered brag generation\n  \u2022 Unlimited brags\n\n" + colors.highlight("Start your free trial today!"),
+          {
+            ...boxStyles.warning,
+            padding: 1,
+            margin: 1
+          }
+        )
+      );
+      logger.log("");
+      const shouldOpenBrowser = await promptConfirm(
+        "Open subscription plans in your browser?",
+        true
+      );
+      if (shouldOpenBrowser) {
+        logger.log("");
+        const plansUrl = "https://bragduck.com/app/settings/plans";
+        try {
+          await openBrowser(plansUrl);
+          logger.info(theme.secondary("Opening browser..."));
+        } catch {
+          logger.warning("Could not open browser automatically");
+          logger.info(`Please visit: ${theme.value(plansUrl)}`);
+        }
+      }
+      logger.log("");
+      return;
+    }
+    logger.debug(`Subscription tier "${subscriptionStatus.tier}" - proceeding with scan`);
     const repoSpinner = createStepSpinner(1, TOTAL_STEPS, "Validating GitHub repository");
     repoSpinner.start();
     await githubService.validateGitHubRepository();
@@ -2390,7 +2513,11 @@ async function scanCommand(options = {}) {
       days = await promptDaysToScan(defaultDays);
       logger.log("");
     }
-    const prSpinner = createStepSpinner(2, TOTAL_STEPS, `Fetching merged PRs from the last ${days} days`);
+    const prSpinner = createStepSpinner(
+      2,
+      TOTAL_STEPS,
+      `Fetching merged PRs from the last ${days} days`
+    );
     prSpinner.start();
     let prs;
     if (options.all) {
@@ -2405,7 +2532,12 @@ async function scanCommand(options = {}) {
       logger.info("Try increasing the number of days or check your GitHub activity");
       return;
     }
-    succeedStepSpinner(prSpinner, 2, TOTAL_STEPS, `Found ${theme.count(commits.length)} PR${commits.length > 1 ? "s" : ""}`);
+    succeedStepSpinner(
+      prSpinner,
+      2,
+      TOTAL_STEPS,
+      `Found ${theme.count(commits.length)} PR${commits.length > 1 ? "s" : ""}`
+    );
     logger.log("");
     logger.log(formatCommitStats(commits));
     logger.log("");
@@ -2429,7 +2561,9 @@ async function scanCommand(options = {}) {
     }
     const selectedShas = await promptSelectCommits(sortedCommits);
     if (selectedShas.length === 0) {
-      logger.warning("No PRs selected");
+      logger.log("");
+      logger.info(theme.secondary("No PRs selected. Scan cancelled."));
+      logger.log("");
       return;
     }
     const selectedCommits = sortedCommits.filter((c) => selectedShas.includes(c.sha));
@@ -2442,29 +2576,26 @@ async function scanCommand(options = {}) {
     );
     refineSpinner.start();
     const refineRequest = {
-      commits: selectedCommits.map((c) => ({
-        sha: c.sha,
-        message: c.message,
-        author: c.author,
+      brags: selectedCommits.map((c) => ({
+        text: c.message,
         date: c.date,
-        diff_stats: c.diffStats ? {
-          files_changed: c.diffStats.filesChanged,
-          insertions: c.diffStats.insertions,
-          deletions: c.diffStats.deletions
-        } : void 0
+        title: c.message.split("\n")[0]
+        // First line as initial title
       }))
     };
-    const refineResponse = await apiService.refineCommits(refineRequest);
-    let refinedCommits = refineResponse.refined_commits;
+    const refineResponse = await apiService.refineBrags(refineRequest);
+    let refinedBrags = refineResponse.refined_brags;
     succeedStepSpinner(refineSpinner, 3, TOTAL_STEPS, "PRs refined successfully");
     logger.log("");
     logger.info("Preview of refined brags:");
     logger.log("");
-    logger.log(formatRefinedCommitsTable(refinedCommits));
+    logger.log(formatRefinedCommitsTable(refinedBrags, selectedCommits));
     logger.log("");
-    const acceptedBrags = await promptReviewBrags(refinedCommits);
+    const acceptedBrags = await promptReviewBrags(refinedBrags, selectedCommits);
     if (acceptedBrags.length === 0) {
-      logger.warning("No brags selected for creation");
+      logger.log("");
+      logger.info(theme.secondary("No brags selected for creation. Scan cancelled."));
+      logger.log("");
       return;
     }
     logger.log("");
@@ -2475,26 +2606,37 @@ async function scanCommand(options = {}) {
     );
     createSpinner2.start();
     const createRequest = {
-      brags: acceptedBrags.map((refined) => {
-        const originalCommit = selectedCommits.find((c) => c.sha === refined.sha);
+      brags: acceptedBrags.map((refined, index) => {
+        const originalCommit = selectedCommits[index];
         return {
-          commit_sha: refined.sha,
+          commit_sha: originalCommit?.sha || `brag-${index}`,
           title: refined.refined_title,
           description: refined.refined_description,
           tags: refined.suggested_tags,
           repository: repoInfo.url,
-          date: originalCommit?.date || (/* @__PURE__ */ new Date()).toISOString(),
-          commit_url: refined.commit_url,
-          impact_score: refined.impact_score,
+          date: refined.date,
+          commit_url: originalCommit?.url || "",
+          impact_score: refined.suggested_impactLevel,
           impact_description: refined.impact_description
         };
       })
     };
     const createResponse = await apiService.createBrags(createRequest);
-    succeedStepSpinner(createSpinner2, 4, TOTAL_STEPS, `Created ${theme.count(createResponse.created)} brag${createResponse.created > 1 ? "s" : ""}`);
+    succeedStepSpinner(
+      createSpinner2,
+      4,
+      TOTAL_STEPS,
+      `Created ${theme.count(createResponse.created)} brag${createResponse.created > 1 ? "s" : ""}`
+    );
     logger.log("");
     logger.log(boxen6(formatSuccessMessage(createResponse.created), boxStyles.success));
   } catch (error) {
+    if (error instanceof CancelPromptError) {
+      logger.log("");
+      logger.info(theme.secondary("Scan cancelled."));
+      logger.log("");
+      return;
+    }
     const err = error;
     logger.log("");
     logger.log(boxen6(formatErrorMessage(err.message, getErrorHint2(err)), boxStyles.error));
@@ -2551,7 +2693,9 @@ async function listCommand(options = {}) {
       if (search || tags) {
         logger.info("Try adjusting your filters or run without filters to see all brags");
       } else {
-        logger.info(theme.secondary("Run ") + theme.command("bragduck scan") + theme.secondary(" to create your first brag!"));
+        logger.info(
+          theme.secondary("Run ") + theme.command("bragduck scan") + theme.secondary(" to create your first brag!")
+        );
       }
       return;
     }