@bragduck/cli 2.0.2 → 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"
       },
-      VERSION: "/v1/cli/version"
+      SUBSCRIPTION: {
+        STATUS: "/v1/subscriptions/status"
+      },
+      VERSION: "/v1/cli/version",
+      /**
+       * @deprecated Use BRAGS.REFINE instead
+       */
+      COMMITS: {
+        REFINE: "/v1/commits/refine"
+      }
     };
     ENCRYPTION_CONFIG = {
       ALGORITHM: "aes-256-gcm",
@@ -312,11 +319,13 @@ var init_errors = __esm({
     "use strict";
     init_esm_shims();
     BragduckError = class extends Error {
+      code;
+      details;
       constructor(message, code, details) {
         super(message);
+        this.name = "BragduckError";
         this.code = code;
         this.details = details;
-        this.name = "BragduckError";
         Error.captureStackTrace(this, this.constructor);
       }
     };
@@ -333,10 +342,11 @@ var init_errors = __esm({
       }
     };
     ApiError = class extends BragduckError {
+      statusCode;
       constructor(message, statusCode, details) {
         super(message, "API_ERROR", details);
-        this.statusCode = statusCode;
         this.name = "ApiError";
+        this.statusCode = statusCode;
       }
     };
     NetworkError = class extends BragduckError {
@@ -439,7 +449,7 @@ async function findAvailablePort() {
         testServer.listen(port, "127.0.0.1");
       });
       return port;
-    } catch (error) {
+    } catch {
       continue;
     }
   }
@@ -450,10 +460,10 @@ async function startOAuthCallbackServer(expectedState) {
   const timeout = OAUTH_CONFIG.TIMEOUT_MS;
   return new Promise((resolve, reject) => {
     let server = null;
-    let timeoutId;
+    let timeoutId = null;
     const cleanup = () => {
       if (timeoutId) {
-        clearTimeout(timeoutId);
+        globalThis.clearTimeout(timeoutId);
       }
       if (server) {
         if (typeof server.closeAllConnections === "function") {
@@ -499,7 +509,7 @@ async function startOAuthCallbackServer(expectedState) {
         }
         res.writeHead(200, { "Content-Type": "text/html" });
         res.end(SUCCESS_HTML);
-        setTimeout(() => {
+        globalThis.setTimeout(() => {
           cleanup();
           resolve({
             code: String(code),
@@ -519,9 +529,11 @@ 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 = setTimeout(() => {
+    timeoutId = globalThis.setTimeout(() => {
       logger.debug("OAuth callback timeout");
       cleanup();
       reject(new OAuthError("Authentication timeout - no callback received within 2 minutes"));
@@ -680,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;
@@ -699,7 +709,7 @@ var init_browser = __esm({
 // src/services/auth.service.ts
 import { randomBytes as randomBytes2 } from "crypto";
 import { readFileSync as readFileSync2 } from "fs";
-import { fileURLToPath as fileURLToPath3 } from "url";
+import { fileURLToPath as fileURLToPath3, URLSearchParams } from "url";
 import { dirname as dirname2, join as join3 } from "path";
 import { ofetch } from "ofetch";
 function getUserAgent() {
@@ -710,7 +720,7 @@ function getUserAgent() {
     const platform = process.platform;
     const arch = process.arch;
     return `BragDuck-CLI/${version2} (${platform}-${arch})`;
-  } catch (error) {
+  } catch {
     logger.debug("Failed to read package.json version");
     return "BragDuck-CLI/2.0.0";
   }
@@ -808,7 +818,7 @@ var init_auth_service = __esm({
         const serverPromise = startOAuthCallbackServer(state);
         try {
           await openBrowser(authUrl);
-        } catch (error) {
+        } catch {
           logger.warning("Could not open browser automatically");
           logger.info(`Please open this URL in your browser:`);
           logger.log(authUrl);
@@ -927,7 +937,7 @@ function getCurrentVersion() {
     const packageJsonPath2 = join5(__dirname4, "../../package.json");
     const packageJson2 = JSON.parse(readFileSync3(packageJsonPath2, "utf-8"));
     return packageJson2.version;
-  } catch (error) {
+  } catch {
     logger.debug("Failed to read package.json version");
     return "1.0.0";
   }
@@ -1025,13 +1035,14 @@ var init_version = __esm({
 import { ofetch as ofetch2 } from "ofetch";
 import { readFileSync as readFileSync4 } from "fs";
 import { fileURLToPath as fileURLToPath5 } from "url";
+import { URLSearchParams as URLSearchParams2 } from "url";
 import { dirname as dirname4, join as join6 } from "path";
 function getCliVersion() {
   try {
     const packageJsonPath2 = join6(__dirname5, "../../package.json");
     const packageJson2 = JSON.parse(readFileSync4(packageJsonPath2, "utf-8"));
     return packageJson2.version;
-  } catch (error) {
+  } catch {
     logger.debug("Failed to read package.json version");
     return "2.0.0";
   }
@@ -1061,29 +1072,30 @@ var init_api_service = __esm({
           baseURL: this.baseURL,
           // Request interceptor
           onRequest: async ({ options }) => {
-            logger.debug(`API Request: ${options.method} ${options.baseURL}${options.url}`);
+            const extendedOptions = options;
+            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 newHeaders = {
+              "User-Agent": userAgent
+            };
+            if (options.headers) {
+              const existingHeaders = new Headers(options.headers);
+              existingHeaders.forEach((value, key) => {
+                newHeaders[key] = value;
+              });
+            }
             if (token) {
-              options.headers = {
-                ...options.headers,
-                "User-Agent": userAgent,
-                Authorization: `Bearer ${token}`
-              };
-            } else {
-              options.headers = {
-                ...options.headers,
-                "User-Agent": userAgent
-              };
+              newHeaders.Authorization = `Bearer ${token}`;
             }
             if (options.method && ["POST", "PUT", "PATCH"].includes(options.method)) {
-              options.headers = {
-                ...options.headers,
-                "Content-Type": "application/json"
-              };
+              newHeaders["Content-Type"] = "application/json";
             }
+            options.headers = newHeaders;
           },
           // Response interceptor for success
           onResponse: ({ response }) => {
@@ -1092,7 +1104,8 @@ var init_api_service = __esm({
           // Response interceptor for errors
           onResponseError: async ({ response, options }) => {
             const status = response.status;
-            const url = `${options.baseURL}${options.url}`;
+            const extendedOptions = options;
+            const url = `${extendedOptions.baseURL}${extendedOptions.url}`;
             logger.debug(`API Error: ${status} ${response.statusText} - ${url}`);
             if (status === HTTP_STATUS.UNAUTHORIZED) {
               logger.debug("Token expired, attempting refresh");
@@ -1104,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";
@@ -1150,23 +1165,39 @@ 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) {
+        } catch (_error) {
           logger.debug("Failed to refine commits");
-          throw error;
+          throw _error;
         }
       }
       /**
@@ -1175,18 +1206,15 @@ 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) {
+        } catch (_error) {
           logger.debug("Failed to create brags");
-          throw error;
+          throw _error;
         }
       }
       /**
@@ -1196,7 +1224,7 @@ var init_api_service = __esm({
         const { limit = 50, offset = 0, tags, search } = params;
         logger.debug(`Listing brags: limit=${limit}, offset=${offset}`);
         try {
-          const queryParams = new URLSearchParams({
+          const queryParams = new URLSearchParams2({
             limit: limit.toString(),
             offset: offset.toString()
           });
@@ -1210,10 +1238,33 @@ 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) {
+        } 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;
         }
       }
@@ -1223,15 +1274,12 @@ var init_api_service = __esm({
       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 (error) {
+        } catch {
           logger.debug("Failed to check version");
           const { version: version2 } = await Promise.resolve().then(() => (init_version(), version_exports));
           return {
@@ -1247,7 +1295,7 @@ var init_api_service = __esm({
         try {
           await this.checkVersion();
           return true;
-        } catch (error) {
+        } catch {
           return false;
         }
       }
@@ -1310,7 +1358,7 @@ ${chalk2.dim("Run")} ${chalk2.cyan("bragduck logout")} ${chalk2.dim("to sign out
         )
       );
       logger.log("");
-      setTimeout(() => {
+      globalThis.setTimeout(() => {
         process.exit(0);
       }, 100);
       return;
@@ -1339,7 +1387,7 @@ ${chalk2.dim("You can now use")} ${chalk2.cyan("bragduck scan")} ${chalk2.dim("t
       )
     );
     logger.log("");
-    setTimeout(() => {
+    globalThis.setTimeout(() => {
       process.exit(0);
     }, 100);
     return;
@@ -1396,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;
   }
@@ -1438,7 +1489,7 @@ ${chalk3.dim("Run")} ${chalk3.cyan("bragduck init")} ${chalk3.dim("to login agai
         }
       )
     );
-  } catch (error) {
+  } catch {
     spinner.fail("Logout failed");
     logger.error("Failed to logout. Please try again.");
     process.exit(1);
@@ -1447,8 +1498,14 @@ ${chalk3.dim("Run")} ${chalk3.cyan("bragduck init")} ${chalk3.dim("to login agai
 
 // src/commands/scan.ts
 init_esm_shims();
-import boxen4 from "boxen";
-import chalk7 from "chalk";
+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();
@@ -1587,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")) {
@@ -1627,7 +1686,7 @@ var GitService = class {
             ...commit,
             diffStats: stats
           };
-        } catch (error) {
+        } catch {
           logger.debug(`Failed to get stats for commit ${commit.sha}, continuing without stats`);
           return commit;
         }
@@ -1642,7 +1701,7 @@ var GitService = class {
     try {
       const email = await this.git.raw(["config", "user.email"]);
       return email.trim() || null;
-    } catch (error) {
+    } catch {
       logger.debug("Failed to get git user email");
       return null;
     }
@@ -1654,7 +1713,7 @@ var GitService = class {
     try {
       const name = await this.git.raw(["config", "user.name"]);
       return name.trim() || null;
-    } catch (error) {
+    } catch {
       logger.debug("Failed to get git user name");
       return null;
     }
@@ -1689,7 +1748,7 @@ var GitHubService = class {
     try {
       await execAsync2("command gh --version");
       return true;
-    } catch (_error) {
+    } catch {
       return false;
     }
   }
@@ -1711,7 +1770,7 @@ var GitHubService = class {
     try {
       await execAsync2("command gh auth status");
       return true;
-    } catch (_error) {
+    } catch {
       return false;
     }
   }
@@ -1793,7 +1852,7 @@ var GitHubService = class {
     try {
       const { stdout } = await execAsync2("command gh api user --jq .login");
       return stdout.trim() || null;
-    } catch (_error) {
+    } catch {
       logger.debug("Failed to get GitHub user");
       return null;
     }
@@ -1876,68 +1935,260 @@ var githubService = new GitHubService();
 
 // src/commands/scan.ts
 init_api_service();
-init_auth_service();
 init_storage_service();
 init_logger();
+init_browser();
+
+// src/utils/auth-helper.ts
+init_esm_shims();
+init_auth_service();
+import boxen5 from "boxen";
+init_logger();
 
 // src/ui/prompts.ts
 init_esm_shims();
-import { checkbox, confirm as confirm2, input, select } from "@inquirer/prompts";
+import { checkbox, confirm as confirm2, input, select, editor } from "@inquirer/prompts";
+import boxen4 from "boxen";
 
 // src/ui/formatters.ts
 init_esm_shims();
-import chalk5 from "chalk";
 import Table from "cli-table3";
 import terminalLink from "terminal-link";
+
+// src/ui/theme.ts
+init_esm_shims();
+import chalk5 from "chalk";
+var colors = {
+  // Primary colors for main actions and interactive elements
+  primary: chalk5.cyan,
+  // Success states
+  success: chalk5.green,
+  successBold: chalk5.green.bold,
+  // Warning states
+  warning: chalk5.yellow,
+  warningBold: chalk5.yellow.bold,
+  // Error states
+  error: chalk5.red,
+  errorBold: chalk5.red.bold,
+  // Info and metadata
+  info: chalk5.gray,
+  infoDim: chalk5.dim,
+  // Highlighted/important data
+  highlight: chalk5.yellow.bold,
+  highlightCyan: chalk5.cyan.bold,
+  // Text emphasis
+  bold: chalk5.bold,
+  dim: chalk5.dim,
+  // Special purpose
+  white: chalk5.white,
+  gray: chalk5.gray
+};
+var theme = {
+  /**
+   * Format command names and CLI actions
+   */
+  command: (text) => colors.primary(text),
+  /**
+   * Format success messages
+   */
+  success: (text) => colors.success(`\u2713 ${text}`),
+  successBold: (text) => colors.successBold(`\u2713 ${text}`),
+  /**
+   * Format error messages
+   */
+  error: (text) => colors.error(`\u2717 ${text}`),
+  errorBold: (text) => colors.errorBold(`\u2717 ${text}`),
+  /**
+   * Format warning messages
+   */
+  warning: (text) => colors.warning(`\u26A0 ${text}`),
+  /**
+   * Format info messages
+   */
+  info: (text) => colors.info(text),
+  /**
+   * Format labels (e.g., "User:", "Email:")
+   */
+  label: (text) => colors.gray(`${text}:`),
+  /**
+   * Format values
+   */
+  value: (text) => colors.highlight(text),
+  /**
+   * Format counts and numbers
+   */
+  count: (num) => colors.highlightCyan(num.toString()),
+  /**
+   * Format file paths
+   */
+  path: (text) => colors.info(text),
+  /**
+   * Format step indicators (e.g., "Step 1/5:")
+   */
+  step: (current, total) => colors.primary(`[${current}/${total}]`),
+  /**
+   * Format progress text
+   */
+  progress: (text) => colors.infoDim(text),
+  /**
+   * Format emphasized text
+   */
+  emphasis: (text) => colors.bold(text),
+  /**
+   * Format de-emphasized/secondary text
+   */
+  secondary: (text) => colors.dim(text),
+  /**
+   * Format interactive elements (prompts, selections)
+   */
+  interactive: (text) => colors.primary(text),
+  /**
+   * Format keys in key-value pairs
+   */
+  key: (text) => colors.white(text)
+};
+var boxStyles = {
+  success: {
+    borderColor: "green",
+    borderStyle: "round",
+    padding: 1,
+    margin: 1
+  },
+  error: {
+    borderColor: "red",
+    borderStyle: "round",
+    padding: 1,
+    margin: 1
+  },
+  warning: {
+    borderColor: "yellow",
+    borderStyle: "round",
+    padding: 1,
+    margin: 1
+  },
+  info: {
+    borderColor: "cyan",
+    borderStyle: "round",
+    padding: 1,
+    margin: 1
+  },
+  plain: {
+    borderColor: "gray",
+    borderStyle: "round",
+    padding: 1,
+    margin: 1
+  }
+};
+var tableStyles = {
+  default: {
+    style: {
+      head: [],
+      border: ["gray"]
+    }
+  },
+  compact: {
+    style: {
+      head: [],
+      border: ["dim"],
+      compact: true
+    }
+  }
+};
+var sizeIndicators = {
+  small: colors.success("\u25CF"),
+  medium: colors.warning("\u25CF"),
+  large: colors.error("\u25CF")
+};
+function getSizeIndicator(insertions, deletions) {
+  const total = insertions + deletions;
+  if (total < 50) {
+    return `${sizeIndicators.small} Small`;
+  } else if (total < 200) {
+    return `${sizeIndicators.medium} Medium`;
+  } else {
+    return `${sizeIndicators.large} Large`;
+  }
+}
+function formatDiffStats(insertions, deletions) {
+  return `${colors.success(`+${insertions}`)} ${colors.error(`-${deletions}`)}`;
+}
+
+// src/ui/formatters.ts
 function formatCommitChoice(commit) {
   let displaySha;
   if (commit.sha.startsWith("pr-")) {
     const prNumber = commit.sha.replace("pr-", "#");
-    displaySha = chalk5.yellow(prNumber);
+    displaySha = colors.highlight(prNumber);
   } else {
-    displaySha = chalk5.yellow(commit.sha.substring(0, 7));
+    displaySha = colors.highlight(commit.sha.substring(0, 7));
+  }
+  const lines = commit.message.split("\n");
+  const title = lines[0];
+  let bodyPreview = "";
+  if (lines.length > 1) {
+    const body = lines.slice(1).join(" ").trim();
+    if (body.length > 0) {
+      const preview = body.length > 80 ? body.substring(0, 80) + "..." : body;
+      bodyPreview = `
+    ${colors.infoDim(preview)}`;
+    }
   }
-  const message = commit.message.split("\n")[0];
-  const author = chalk5.gray(`by ${commit.author}`);
-  const date = chalk5.gray(new Date(commit.date).toLocaleDateString());
+  const author = colors.info(`by ${commit.author}`);
+  const date = colors.info(new Date(commit.date).toLocaleDateString());
   let stats = "";
+  let sizeIndicator = "";
   if (commit.diffStats) {
     const { filesChanged, insertions, deletions } = commit.diffStats;
-    stats = chalk5.gray(
-      ` [${filesChanged} files, ${chalk5.green(`+${insertions}`)} ${chalk5.red(`-${deletions}`)}]`
-    );
+    sizeIndicator = ` ${getSizeIndicator(insertions, deletions)}`;
+    stats = colors.info(` [${filesChanged} files, ${formatDiffStats(insertions, deletions)}]`);
   }
-  return `${displaySha} ${message}${stats}
-    ${author} \u2022 ${date}`;
+  return `${displaySha} ${title}${sizeIndicator}${stats}
+    ${author} \u2022 ${date}${bodyPreview}`;
 }
-function formatRefinedCommitsTable(commits) {
+function formatRefinedCommitsTable(brags, selectedCommits) {
   const table = new Table({
     head: [
-      chalk5.cyan("SHA"),
-      chalk5.cyan("Original"),
-      chalk5.cyan("Refined Title"),
-      chalk5.cyan("Description"),
-      chalk5.cyan("Tags")
+      colors.primary("SHA"),
+      colors.primary("Original"),
+      colors.primary("Refined Title"),
+      colors.primary("Description"),
+      colors.primary("Tags")
     ],
-    colWidths: [10, 30, 30, 40, 20],
+    colWidths: [12, 28, 30, 40, 20],
     wordWrap: true,
-    style: {
-      head: [],
-      border: ["gray"]
-    }
+    style: tableStyles.default.style
   });
-  commits.forEach((commit) => {
-    const sha = commit.sha.substring(0, 7);
-    const original = commit.original_message.split("\n")[0] || "";
-    const title = commit.refined_title;
-    const description = commit.refined_description.substring(0, 100) + "...";
-    const tags = (commit.suggested_tags || []).join(", ") || "none";
+  brags.forEach((brag, index) => {
+    const isNewBragType = !("sha" in brag);
+    let displaySha;
+    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 = `#${index + 1}`;
+    }
+    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([
-      chalk5.yellow(sha),
-      chalk5.gray(original),
-      chalk5.white(title),
-      chalk5.dim(description),
-      chalk5.blue(tags)
+      `${rowNum} ${colors.highlight(displaySha)}`,
+      colors.info(original),
+      colors.white(title),
+      colors.dim(description),
+      colors.primary(tags)
     ]);
   });
   return table.toString();
@@ -1946,26 +2197,35 @@ function formatCommitStats(commits) {
   const totalFiles = commits.reduce((sum, c) => sum + (c.diffStats?.filesChanged || 0), 0);
   const totalInsertions = commits.reduce((sum, c) => sum + (c.diffStats?.insertions || 0), 0);
   const totalDeletions = commits.reduce((sum, c) => sum + (c.diffStats?.deletions || 0), 0);
-  return chalk5.gray("Total changes: ") + chalk5.white(`${totalFiles} files`) + chalk5.gray(", ") + chalk5.green(`+${totalInsertions}`) + chalk5.gray(" ") + chalk5.red(`-${totalDeletions}`);
+  return colors.info("Total changes: ") + colors.white(`${totalFiles} files`) + colors.info(", ") + formatDiffStats(totalInsertions, totalDeletions);
+}
+function formatSelectionSummary(count, commits) {
+  const totalFiles = commits.reduce((sum, c) => sum + (c.diffStats?.filesChanged || 0), 0);
+  const totalInsertions = commits.reduce((sum, c) => sum + (c.diffStats?.insertions || 0), 0);
+  const totalDeletions = commits.reduce((sum, c) => sum + (c.diffStats?.deletions || 0), 0);
+  const selectedText = theme.success(`Selected ${theme.count(count)} PR${count > 1 ? "s" : ""}`);
+  const stats = `${theme.count(totalFiles)} files changed, ${formatDiffStats(totalInsertions, totalDeletions)}`;
+  return `
+${selectedText}: ${stats}`;
 }
 function formatSuccessMessage(count) {
   const emoji = "\u{1F389}";
-  const title = chalk5.green.bold(
+  const title = colors.successBold(
     `${emoji} Successfully created ${count} brag${count > 1 ? "s" : ""}!`
   );
-  const message = chalk5.white("\nYour achievements are now saved and ready to showcase.");
-  const hint = chalk5.dim("\nRun ") + chalk5.cyan("bragduck list") + chalk5.dim(" to see all your brags");
+  const message = colors.white("\nYour achievements are now saved and ready to showcase.");
+  const hint = theme.secondary("\nRun ") + theme.command("bragduck list") + theme.secondary(" to see all your brags");
   const url = "https://bragduck.com/app/brags";
   const clickableUrl = terminalLink(url, url, {
-    fallback: () => chalk5.blue.underline(url)
+    fallback: () => colors.primary(url)
   });
-  const webUrl = chalk5.dim("\n\nOr, check ") + clickableUrl + chalk5.dim(" to see all your brags");
+  const webUrl = theme.secondary("\n\nOr, check ") + clickableUrl + theme.secondary(" to see all your brags");
   return `${title}${message}${hint}${webUrl}`;
 }
 function formatErrorMessage(message, hint) {
-  const title = chalk5.red.bold("\u2717 Error");
-  const error = chalk5.white(message);
-  const hintText = hint ? chalk5.dim("\n\nHint: ") + chalk5.cyan(hint) : "";
+  const title = colors.errorBold("\u2717 Error");
+  const error = colors.white(message);
+  const hintText = hint ? theme.secondary("\n\nHint: ") + theme.command(hint) : "";
   return `${title}
 
 ${error}${hintText}`;
@@ -2024,11 +2284,128 @@ async function promptDaysToScan(defaultDays = 30) {
   }
   return parseInt(selected, 10);
 }
+async function promptSortOption() {
+  const choices = [
+    {
+      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" }
+  ];
+  return await select({
+    message: "How would you like to sort the PRs?",
+    choices,
+    default: "date"
+  });
+}
+async function promptReviewBrags(refinedCommits) {
+  const acceptedBrags = [];
+  console.log("\n" + theme.info("Review each brag before creation:") + "\n");
+  for (let i = 0; i < refinedCommits.length; i++) {
+    const commit = refinedCommits[i];
+    const current = i + 1;
+    const total = refinedCommits.length;
+    const displaySha = commit.sha.startsWith("pr-") ? commit.sha.replace("pr-", "#") : commit.sha.substring(0, 7);
+    const bragDetails = `${theme.step(current, total)} ${colors.highlight(displaySha)}
+
+${theme.label("Title")} ${colors.white(commit.refined_title)}
+
+${theme.label("Description")}
+${colors.white(commit.refined_description)}
+
+${theme.label("Tags")} ${colors.primary((commit.suggested_tags || []).join(", ") || "none")}
+
+${theme.label("Impact Score")} ${colors.highlight(commit.impact_score?.toString() || "N/A")}`;
+    console.log(boxen4(bragDetails, boxStyles.info));
+    console.log("");
+    const action = await select({
+      message: `What would you like to do with this brag?`,
+      choices: [
+        { name: "\u2713 Accept", value: "accept", description: "Add this brag as-is" },
+        { name: "\u270E Edit title", value: "edit-title", description: "Modify the title" },
+        { 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"
+          }
+        ] : [],
+        { name: "\u2717 Cancel", value: "cancel", description: "Cancel and discard all brags" }
+      ]
+    });
+    if (action === "cancel") {
+      return [];
+    }
+    if (action === "accept-all") {
+      acceptedBrags.push(commit);
+      for (let j = i + 1; j < refinedCommits.length; j++) {
+        acceptedBrags.push(refinedCommits[j]);
+      }
+      break;
+    }
+    if (action === "skip") {
+      continue;
+    }
+    let editedCommit = { ...commit };
+    if (action === "edit-title" || action === "edit-both") {
+      const newTitle = await input({
+        message: "Enter new title:",
+        default: commit.refined_title
+      });
+      editedCommit.refined_title = newTitle;
+    }
+    if (action === "edit-desc" || action === "edit-both") {
+      const newDesc = await editor({
+        message: "Edit description (will open your default editor):",
+        default: commit.refined_description
+      });
+      editedCommit.refined_description = newDesc;
+    }
+    acceptedBrags.push(editedCommit);
+  }
+  return acceptedBrags;
+}
+
+// src/utils/auth-helper.ts
+async function ensureAuthenticated() {
+  const isAuthenticated = await authService.isAuthenticated();
+  if (isAuthenticated) {
+    return true;
+  }
+  logger.log("");
+  logger.log(
+    boxen5(
+      theme.warning("Not authenticated") + "\n\nYou need to be logged in to use this command.\n\nWould you like to authenticate now?",
+      boxStyles.warning
+    )
+  );
+  logger.log("");
+  const shouldAuth = await promptConfirm("Authenticate now?", true);
+  if (!shouldAuth) {
+    logger.log("");
+    logger.info(
+      theme.secondary("Authentication skipped. Run ") + theme.command("bragduck init") + theme.secondary(" when you're ready to authenticate.")
+    );
+    logger.log("");
+    return false;
+  }
+  try {
+    await initCommand();
+    return true;
+  } catch {
+    return false;
+  }
+}
 
 // src/ui/spinners.ts
 init_esm_shims();
 import ora3 from "ora";
-import chalk6 from "chalk";
 function createSpinner(text) {
   return ora3({
     text,
@@ -2036,57 +2413,99 @@ function createSpinner(text) {
     spinner: "dots"
   });
 }
-function fetchingPRsSpinner(days) {
-  return createSpinner(`Fetching merged PRs from the last ${days} days...`);
-}
-function refiningCommitsSpinner(count) {
-  return createSpinner(`Refining ${count} commit${count > 1 ? "s" : ""} with AI...`);
-}
-function creatingBragsSpinner(count) {
-  return createSpinner(`Creating ${count} brag${count > 1 ? "s" : ""}...`);
+function createStepSpinner(currentStep, totalSteps, text) {
+  const stepIndicator = theme.step(currentStep, totalSteps);
+  return ora3({
+    text: `${stepIndicator} ${text}`,
+    color: "cyan",
+    spinner: "dots"
+  });
 }
 function fetchingBragsSpinner() {
   return createSpinner("Fetching your brags...");
 }
 function succeedSpinner(spinner, text) {
   if (text) {
-    spinner.succeed(chalk6.green(text));
+    spinner.succeed(colors.success(text));
   } else {
     spinner.succeed();
   }
 }
 function failSpinner(spinner, text) {
   if (text) {
-    spinner.fail(chalk6.red(text));
+    spinner.fail(colors.error(text));
   } else {
     spinner.fail();
   }
 }
+function succeedStepSpinner(spinner, currentStep, totalSteps, text) {
+  const stepIndicator = theme.step(currentStep, totalSteps);
+  spinner.succeed(`${stepIndicator} ${colors.success(text)}`);
+}
+function failStepSpinner(spinner, currentStep, totalSteps, text) {
+  const stepIndicator = theme.step(currentStep, totalSteps);
+  spinner.fail(`${stepIndicator} ${colors.error(text)}`);
+}
 
 // src/commands/scan.ts
 async function scanCommand(options = {}) {
   logger.log("");
+  const TOTAL_STEPS = 5;
   try {
-    const isAuthenticated = await authService.isAuthenticated();
+    const isAuthenticated = await ensureAuthenticated();
     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(
-        boxen4(
-          `${chalk7.yellow.bold("\u26A0 Not authenticated")}
-
-Please run ${chalk7.cyan("bragduck init")} to login first.`,
+        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,
-            borderStyle: "round",
-            borderColor: "yellow"
+            margin: 1
           }
         )
       );
-      process.exit(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();
     const repoInfo = await githubService.getRepositoryInfo();
-    logger.info(`Repository: ${chalk7.cyan(repoInfo.fullName)} on GitHub`);
+    succeedStepSpinner(
+      repoSpinner,
+      1,
+      TOTAL_STEPS,
+      `Repository: ${theme.value(repoInfo.fullName)}`
+    );
     logger.log("");
     let days = options.days;
     if (!days) {
@@ -2094,8 +2513,12 @@ Please run ${chalk7.cyan("bragduck init")} to login first.`,
       days = await promptDaysToScan(defaultDays);
       logger.log("");
     }
-    const spinner = fetchingPRsSpinner(days);
-    spinner.start();
+    const prSpinner = createStepSpinner(
+      2,
+      TOTAL_STEPS,
+      `Fetching merged PRs from the last ${days} days`
+    );
+    prSpinner.start();
     let prs;
     if (options.all) {
       prs = await githubService.getMergedPRs({ days });
@@ -2104,93 +2527,119 @@ Please run ${chalk7.cyan("bragduck init")} to login first.`,
     }
     const commits = prs.map((pr) => githubService.transformPRToCommit(pr));
     if (commits.length === 0) {
-      failSpinner(spinner, `No merged PRs found in the last ${days} days`);
+      failStepSpinner(prSpinner, 2, TOTAL_STEPS, `No merged PRs found in the last ${days} days`);
       logger.log("");
       logger.info("Try increasing the number of days or check your GitHub activity");
       return;
     }
-    succeedSpinner(spinner, `Found ${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("");
-    const selectedShas = await promptSelectCommits(commits);
+    const sortOption = await promptSortOption();
+    logger.log("");
+    let sortedCommits = [...commits];
+    if (sortOption === "date") {
+      sortedCommits.sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime());
+    } else if (sortOption === "size") {
+      sortedCommits.sort((a, b) => {
+        const sizeA = (a.diffStats?.insertions || 0) + (a.diffStats?.deletions || 0);
+        const sizeB = (b.diffStats?.insertions || 0) + (b.diffStats?.deletions || 0);
+        return sizeB - sizeA;
+      });
+    } else if (sortOption === "files") {
+      sortedCommits.sort((a, b) => {
+        const filesA = a.diffStats?.filesChanged || 0;
+        const filesB = b.diffStats?.filesChanged || 0;
+        return filesB - filesA;
+      });
+    }
+    const selectedShas = await promptSelectCommits(sortedCommits);
     if (selectedShas.length === 0) {
-      logger.warning("No commits selected");
+      logger.log("");
+      logger.info(theme.secondary("No PRs selected. Scan cancelled."));
+      logger.log("");
       return;
     }
-    const selectedCommits = commits.filter((c) => selectedShas.includes(c.sha));
-    logger.log("");
-    logger.success(`Selected ${selectedCommits.length} PR${selectedCommits.length > 1 ? "s" : ""}`);
+    const selectedCommits = sortedCommits.filter((c) => selectedShas.includes(c.sha));
+    logger.log(formatSelectionSummary(selectedCommits.length, selectedCommits));
     logger.log("");
-    const refineSpinner = refiningCommitsSpinner(selectedCommits.length);
+    const refineSpinner = createStepSpinner(
+      3,
+      TOTAL_STEPS,
+      `Refining ${theme.count(selectedCommits.length)} PR${selectedCommits.length > 1 ? "s" : ""} with AI`
+    );
     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);
-    const refinedCommits = refineResponse.refined_commits;
-    succeedSpinner(refineSpinner, "PRs refined successfully");
+    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 shouldCreate = await promptConfirm("Create these brags?", true);
-    if (!shouldCreate) {
-      logger.warning("Cancelled");
+    const acceptedBrags = await promptReviewBrags(refinedBrags, selectedCommits);
+    if (acceptedBrags.length === 0) {
+      logger.log("");
+      logger.info(theme.secondary("No brags selected for creation. Scan cancelled."));
+      logger.log("");
       return;
     }
     logger.log("");
-    const createSpinner2 = creatingBragsSpinner(refinedCommits.length);
+    const createSpinner2 = createStepSpinner(
+      4,
+      TOTAL_STEPS,
+      `Creating ${theme.count(acceptedBrags.length)} brag${acceptedBrags.length > 1 ? "s" : ""}`
+    );
     createSpinner2.start();
     const createRequest = {
-      brags: refinedCommits.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);
-    succeedSpinner(createSpinner2, `Created ${createResponse.created} brags`);
-    logger.log("");
-    logger.log(
-      boxen4(formatSuccessMessage(createResponse.created), {
-        padding: 1,
-        margin: 1,
-        borderStyle: "round",
-        borderColor: "green"
-      })
+    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(
-      boxen4(formatErrorMessage(err.message, getErrorHint2(err)), {
-        padding: 1,
-        margin: 1,
-        borderStyle: "round",
-        borderColor: "red"
-      })
-    );
+    logger.log(boxen6(formatErrorMessage(err.message, getErrorHint2(err)), boxStyles.error));
     process.exit(1);
   }
 }
@@ -2216,29 +2665,14 @@ function getErrorHint2(error) {
 // src/commands/list.ts
 init_esm_shims();
 init_api_service();
-init_auth_service();
-init_logger();
-import boxen5 from "boxen";
-import chalk8 from "chalk";
+import boxen7 from "boxen";
 import Table2 from "cli-table3";
+init_logger();
 async function listCommand(options = {}) {
   logger.log("");
   try {
-    const isAuthenticated = await authService.isAuthenticated();
+    const isAuthenticated = await ensureAuthenticated();
     if (!isAuthenticated) {
-      logger.log(
-        boxen5(
-          `${chalk8.yellow.bold("\u26A0 Not authenticated")}
-
-Please run ${chalk8.cyan("bragduck init")} to login first.`,
-          {
-            padding: 1,
-            margin: 1,
-            borderStyle: "round",
-            borderColor: "yellow"
-          }
-        )
-      );
       process.exit(1);
     }
     const limit = options.limit || 50;
@@ -2259,7 +2693,9 @@ Please run ${chalk8.cyan("bragduck init")} to login first.`,
       if (search || tags) {
         logger.info("Try adjusting your filters or run without filters to see all brags");
       } else {
-        logger.info(`Run ${chalk8.cyan("bragduck scan")} to create your first brag!`);
+        logger.info(
+          theme.secondary("Run ") + theme.command("bragduck scan") + theme.secondary(" to create your first brag!")
+        );
       }
       return;
     }
@@ -2273,7 +2709,7 @@ Please run ${chalk8.cyan("bragduck init")} to login first.`,
         `Showing ${offset + 1}-${offset + response.brags.length} of ${response.total} total brags`
       );
       logger.info(
-        chalk8.dim(`Run `) + chalk8.cyan(`bragduck list --offset ${nextOffset}`) + chalk8.dim(` to see more`)
+        theme.secondary("Run ") + theme.command(`bragduck list --offset ${nextOffset}`) + theme.secondary(" to see more")
       );
       logger.log("");
     } else if (offset > 0) {
@@ -2286,51 +2722,41 @@ Please run ${chalk8.cyan("bragduck init")} to login first.`,
       const filterInfo = [];
       if (search) filterInfo.push(`search: "${search}"`);
       if (tags) filterInfo.push(`tags: ${tags.join(", ")}`);
-      logger.info(chalk8.dim(`Filters applied: ${filterInfo.join(", ")}`));
+      logger.info(theme.info(`Filters applied: ${filterInfo.join(", ")}`));
       logger.log("");
     }
   } catch (error) {
     const err = error;
     logger.log("");
-    logger.log(
-      boxen5(formatErrorMessage(err.message, getErrorHint3(err)), {
-        padding: 1,
-        margin: 1,
-        borderStyle: "round",
-        borderColor: "red"
-      })
-    );
+    logger.log(boxen7(formatErrorMessage(err.message, getErrorHint3(err)), boxStyles.error));
     process.exit(1);
   }
 }
 function formatBragsTable(brags) {
   const table = new Table2({
     head: [
-      chalk8.cyan("Date"),
-      chalk8.cyan("Title"),
-      chalk8.cyan("Description"),
-      chalk8.cyan("Tags"),
-      chalk8.cyan("Repository")
+      colors.primary("Date"),
+      colors.primary("Title"),
+      colors.primary("Description"),
+      colors.primary("Tags"),
+      colors.primary("Repository")
     ],
     colWidths: [12, 30, 40, 20, 30],
     wordWrap: true,
-    style: {
-      head: [],
-      border: ["gray"]
-    }
+    style: tableStyles.default.style
   });
   brags.forEach((brag) => {
     const date = new Date(brag.date).toLocaleDateString();
     const title = brag.title;
     const description = truncateText(brag.description, 100);
-    const tags = brag.tags.length > 0 ? brag.tags.join(", ") : chalk8.dim("none");
-    const repository = brag.repository ? truncateText(extractRepoName(brag.repository), 25) : chalk8.dim("none");
+    const tags = brag.tags.length > 0 ? brag.tags.join(", ") : colors.dim("none");
+    const repository = brag.repository ? truncateText(extractRepoName(brag.repository), 25) : colors.dim("none");
     table.push([
-      chalk8.yellow(date),
-      chalk8.white(title),
-      chalk8.dim(description),
-      chalk8.blue(tags),
-      chalk8.gray(repository)
+      colors.highlight(date),
+      colors.white(title),
+      colors.dim(description),
+      colors.primary(tags),
+      colors.info(repository)
     ]);
   });
   return table.toString();
@@ -2367,8 +2793,8 @@ init_esm_shims();
 init_storage_service();
 init_logger();
 init_constants();
-import boxen6 from "boxen";
-import chalk9 from "chalk";
+import boxen8 from "boxen";
+import chalk6 from "chalk";
 import Table3 from "cli-table3";
 init_errors();
 var VALID_CONFIG_KEYS = Object.values(CONFIG_KEYS);
@@ -2400,9 +2826,10 @@ async function configCommand(subcommand, key, value) {
         );
     }
   } catch (error) {
+    const err = error;
     logger.log("");
     logger.log(
-      boxen6(formatErrorMessage(error.message, getConfigHint(error)), {
+      boxen8(formatErrorMessage(err.message, getConfigHint(err)), {
         padding: 1,
         margin: 1,
         borderStyle: "round",
@@ -2418,7 +2845,7 @@ async function handleListConfig() {
     autoVersionCheck: storageService.getConfig("autoVersionCheck")
   };
   const table = new Table3({
-    head: [chalk9.cyan("Key"), chalk9.cyan("Value"), chalk9.cyan("Default")],
+    head: [chalk6.cyan("Key"), chalk6.cyan("Value"), chalk6.cyan("Default")],
     colWidths: [25, 40, 40],
     wordWrap: true,
     style: {
@@ -2427,36 +2854,36 @@ async function handleListConfig() {
     }
   });
   table.push([
-    chalk9.white("defaultCommitDays"),
-    chalk9.yellow(String(config2.defaultCommitDays)),
-    chalk9.dim(String(DEFAULT_CONFIG.defaultCommitDays))
+    chalk6.white("defaultCommitDays"),
+    chalk6.yellow(String(config2.defaultCommitDays)),
+    chalk6.dim(String(DEFAULT_CONFIG.defaultCommitDays))
   ]);
   table.push([
-    chalk9.white("autoVersionCheck"),
-    chalk9.yellow(String(config2.autoVersionCheck)),
-    chalk9.dim(String(DEFAULT_CONFIG.autoVersionCheck))
+    chalk6.white("autoVersionCheck"),
+    chalk6.yellow(String(config2.autoVersionCheck)),
+    chalk6.dim(String(DEFAULT_CONFIG.autoVersionCheck))
   ]);
   logger.info("Current configuration:");
   logger.log("");
   logger.log(table.toString());
   logger.log("");
-  logger.info(chalk9.dim("To change a value: ") + chalk9.cyan("bragduck config set <key> <value>"));
+  logger.info(chalk6.dim("To change a value: ") + chalk6.cyan("bragduck config set <key> <value>"));
   logger.log("");
 }
 async function handleGetConfig(key) {
   validateConfigKey(key);
   const value = storageService.getConfig(key);
   const defaultValue = DEFAULT_CONFIG[key];
-  logger.info(`Configuration for ${chalk9.cyan(key)}:`);
+  logger.info(`Configuration for ${chalk6.cyan(key)}:`);
   logger.log("");
-  logger.log(`  ${chalk9.white("Current:")} ${chalk9.yellow(String(value))}`);
-  logger.log(`  ${chalk9.white("Default:")} ${chalk9.dim(String(defaultValue))}`);
+  logger.log(`  ${chalk6.white("Current:")} ${chalk6.yellow(String(value))}`);
+  logger.log(`  ${chalk6.white("Default:")} ${chalk6.dim(String(defaultValue))}`);
   logger.log("");
   if (value === defaultValue) {
-    logger.info(chalk9.dim("Using default value"));
+    logger.info(chalk6.dim("Using default value"));
   } else {
     logger.info(
-      chalk9.dim("Custom value set. Reset with: ") + chalk9.cyan(`bragduck config set ${key} ${defaultValue}`)
+      chalk6.dim("Custom value set. Reset with: ") + chalk6.cyan(`bragduck config set ${key} ${defaultValue}`)
     );
   }
   logger.log("");
@@ -2466,10 +2893,10 @@ async function handleSetConfig(key, value) {
   const typedValue = validateAndConvertValue(key, value);
   storageService.setConfig(key, typedValue);
   logger.log(
-    boxen6(
-      `${chalk9.green.bold("\u2713 Configuration updated")}
+    boxen8(
+      `${chalk6.green.bold("\u2713 Configuration updated")}
 
-${chalk9.white(key)}: ${chalk9.yellow(String(typedValue))}`,
+${chalk6.white(key)}: ${chalk6.yellow(String(typedValue))}`,
       {
         padding: 1,
         margin: 1,
@@ -2491,7 +2918,7 @@ ${VALID_CONFIG_KEYS.map((k) => `  - ${k}`).join("\n")}`
 }
 function validateAndConvertValue(key, value) {
   switch (key) {
-    case CONFIG_KEYS.DEFAULT_COMMIT_DAYS:
+    case CONFIG_KEYS.DEFAULT_COMMIT_DAYS: {
       const days = parseInt(value, 10);
       if (isNaN(days) || days < 1 || days > 365) {
         throw new ValidationError(
@@ -2501,7 +2928,8 @@ Must be a number between 1 and 365`
         );
       }
       return days;
-    case CONFIG_KEYS.AUTO_VERSION_CHECK:
+    }
+    case CONFIG_KEYS.AUTO_VERSION_CHECK: {
       const lowerValue = value.toLowerCase();
       if (lowerValue === "true" || lowerValue === "1" || lowerValue === "yes") {
         return true;
@@ -2513,6 +2941,7 @@ Must be a number between 1 and 365`
 
 Must be one of: true, false, yes, no, 1, 0`
       );
+    }
     default:
       throw new ValidationError(`Unknown config key: "${key}"`);
   }
@@ -2573,7 +3002,7 @@ program.command("config [subcommand] [key] [value]").description("Manage CLI con
     process.exit(1);
   }
 });
-program.hook("preAction", async (_thisCommand) => {
+program.hook("preAction", async () => {
   const options = program.opts();
   if (options.debug) {
     process.env.DEBUG = "true";
@@ -2583,7 +3012,7 @@ program.hook("preAction", async (_thisCommand) => {
   if (!options.skipVersionCheck && !isVersionOrHelp) {
     try {
       await checkForUpdates({ silent: false });
-    } catch (error) {
+    } catch {
       logger.debug("Version check failed, continuing...");
     }
   }