@bragduck/cli 2.18.1 → 2.22.0

package/dist/bin/bragduck.js

@@ -4485,6 +4485,22 @@ import boxen4 from "boxen";
 init_esm_shims();
 import Table from "cli-table3";
 import terminalLink from "terminal-link";
+
+// src/utils/date-formatter.ts
+init_esm_shims();
+var MONTHS = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+function formatDate(dateString) {
+  const date = typeof dateString === "string" ? new Date(dateString) : dateString;
+  if (isNaN(date.getTime())) {
+    return "Invalid date";
+  }
+  const day = date.getDate().toString().padStart(2, "0");
+  const month = MONTHS[date.getMonth()];
+  const year = date.getFullYear();
+  return `${day} ${month} ${year}`;
+}
+
+// src/ui/formatters.ts
 function formatCommitChoice(commit) {
   let displaySha;
   if (commit.sha.startsWith("pr-")) {
@@ -4505,7 +4521,7 @@ function formatCommitChoice(commit) {
     }
   }
   const author = colors.info(`by ${commit.author}`);
-  const date = colors.info(new Date(commit.date).toLocaleDateString());
+  const date = colors.info(formatDate(commit.date));
   let stats = "";
   let sizeIndicator = "";
   if (commit.diffStats) {
@@ -4579,19 +4595,29 @@ function formatSelectionSummary(count, commits) {
   return `
 ${selectedText}: ${stats}`;
 }
-function formatSuccessMessage(count) {
+function formatSuccessMessage(count, brags) {
   const emoji = "\u{1F389}";
   const title = colors.successBold(
     `${emoji} Successfully created ${count} brag${count > 1 ? "s" : ""}!`
   );
   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");
+  let bragsList = "";
+  if (brags && brags.length > 0) {
+    bragsList = "\n\n" + theme.secondary("Created brags:");
+    for (const brag of brags) {
+      const sourceLabel = brag.source.charAt(0).toUpperCase() + brag.source.slice(1).toLowerCase();
+      const dateFormatted = formatDate(brag.date);
+      bragsList += `
+  ${colors.dim("\u2022")} ${colors.white(brag.title)} ${theme.secondary(`(${dateFormatted} \xB7 ${sourceLabel})`)}`;
+    }
+  }
+  const hint = theme.secondary("\n\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: () => colors.primary(url)
   });
   const webUrl = theme.secondary("\n\nOr, check ") + clickableUrl + theme.secondary(" to see all your brags");
-  return `${title}${message}${hint}${webUrl}`;
+  return `${title}${message}${bragsList}${hint}${webUrl}`;
 }
 function formatErrorMessage(message, hint) {
   const title = colors.errorBold("\u2717 Error");
@@ -4688,6 +4714,21 @@ async function promptSelectOrganisation(organisations) {
   });
   return selected === "none" ? null : selected;
 }
+async function promptSelectOrganisationWithDefault(organisations, defaultOrgId) {
+  if (defaultOrgId) {
+    const defaultOrg = organisations.find((org) => org.id === defaultOrgId);
+    if (defaultOrg) {
+      const useDefault = await confirm({
+        message: `Use your default company "${defaultOrg.name}"?`,
+        default: true
+      });
+      if (useDefault) {
+        return defaultOrgId;
+      }
+    }
+  }
+  return await promptSelectOrganisation(organisations);
+}
 async function promptReviewBrags(refinedBrags, selectedCommits) {
   const acceptedBrags = [];
   console.log("\n" + theme.info("Review each brag before creation:") + "\n");
@@ -4913,7 +4954,7 @@ async function promptSelectService() {
   });
   return selected;
 }
-async function syncSingleService(sourceType, options, TOTAL_STEPS) {
+async function syncSingleService(sourceType, options, TOTAL_STEPS, sharedDays, sharedOrgId) {
   const adapter = AdapterFactory.getAdapter(sourceType);
   const repoSpinner = createStepSpinner(2, TOTAL_STEPS, "Validating repository");
   repoSpinner.start();
@@ -4943,7 +4984,7 @@ async function syncSingleService(sourceType, options, TOTAL_STEPS) {
     failStepSpinner(repoSpinner, 2, TOTAL_STEPS, "Validation failed");
     throw error;
   }
-  let days = options.days;
+  let days = sharedDays || options.days;
   if (!days && options.today) {
     days = 1;
     logger.debug("Using --today flag: scanning last 24 hours (1 day)");
@@ -4978,8 +5019,30 @@ async function syncSingleService(sourceType, options, TOTAL_STEPS) {
   logger.log("");
   logger.log(formatCommitStats(workItems));
   logger.log("");
-  let sortedCommits = [...workItems];
-  if (workItems.length > 1 && !options.turbo) {
+  const existingBrags = await apiService.listBrags({ limit: 100 });
+  logger.debug(`Fetched ${existingBrags.brags.length} existing brags`);
+  const existingUrls = new Set(existingBrags.brags.flatMap((b) => b.attachments || []));
+  logger.debug(`Existing URLs in attachments: ${existingUrls.size}`);
+  const duplicates = workItems.filter((c) => c.url && existingUrls.has(c.url));
+  const newWorkItems = workItems.filter((c) => !c.url || !existingUrls.has(c.url));
+  logger.debug(`Found ${duplicates.length} duplicates, ${newWorkItems.length} new items`);
+  if (duplicates.length > 0) {
+    logger.log("");
+    logger.info(
+      colors.dim(
+        `\u2139 ${duplicates.length} work item${duplicates.length > 1 ? "s" : ""} already exist in Bragduck (will be skipped)`
+      )
+    );
+    logger.log("");
+  }
+  if (newWorkItems.length === 0) {
+    logger.log("");
+    logger.info(theme.secondary("All work items already exist in Bragduck. Nothing to sync."));
+    logger.log("");
+    return { created: 0, skipped: duplicates.length };
+  }
+  let sortedCommits = [...newWorkItems];
+  if (newWorkItems.length > 1 && !options.turbo) {
     const sortOption = await promptSortOption();
     logger.log("");
     if (sortOption === "date") {
@@ -4997,58 +5060,34 @@ async function syncSingleService(sourceType, options, TOTAL_STEPS) {
         return filesB - filesA;
       });
     }
-  } else if (workItems.length > 1 && options.turbo) {
+  } else if (newWorkItems.length > 1 && options.turbo) {
     sortedCommits.sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime());
     logger.debug("Turbo mode: sorted by date (most recent first)");
   }
   let selectedShas;
   if (options.turbo) {
     selectedShas = sortedCommits.map((c) => c.sha);
-    logger.debug(`Turbo mode: auto-selected all ${selectedShas.length} items`);
+    logger.debug(`Turbo mode: auto-selected all ${selectedShas.length} new items`);
   } else {
     selectedShas = await promptSelectCommits(sortedCommits);
     if (selectedShas.length === 0) {
       logger.log("");
       logger.info(theme.secondary("No work items selected. Sync cancelled."));
       logger.log("");
-      return { created: 0, skipped: 0 };
+      return { created: 0, skipped: duplicates.length };
     }
   }
   const selectedCommits = sortedCommits.filter((c) => selectedShas.includes(c.sha));
   logger.log(formatSelectionSummary(selectedCommits.length, selectedCommits));
   logger.log("");
-  const existingBrags = await apiService.listBrags({ limit: 100 });
-  logger.debug(`Fetched ${existingBrags.brags.length} existing brags`);
-  const existingUrls = new Set(existingBrags.brags.flatMap((b) => b.attachments || []));
-  logger.debug(`Existing URLs in attachments: ${existingUrls.size}`);
-  const duplicates = selectedCommits.filter((c) => c.url && existingUrls.has(c.url));
-  const newCommits = selectedCommits.filter((c) => !c.url || !existingUrls.has(c.url));
-  logger.debug(`Duplicates: ${duplicates.length}, New: ${newCommits.length}`);
-  if (duplicates.length > 0) {
-    logger.log("");
-    logger.info(
-      colors.warning(
-        `${duplicates.length} work item${duplicates.length > 1 ? "s" : ""} already added to Bragduck - skipping`
-      )
-    );
-    logger.log("");
-  }
-  if (newCommits.length === 0) {
-    logger.log("");
-    logger.info(
-      theme.secondary("All selected work items already exist in Bragduck. Nothing to refine.")
-    );
-    logger.log("");
-    return { created: 0, skipped: duplicates.length };
-  }
   const refineSpinner = createStepSpinner(
     4,
     TOTAL_STEPS,
-    `Refining ${theme.count(newCommits.length)} work item${newCommits.length > 1 ? "s" : ""} with AI`
+    `Refining ${theme.count(selectedCommits.length)} work item${selectedCommits.length > 1 ? "s" : ""} with AI`
   );
   refineSpinner.start();
   const refineRequest = {
-    brags: newCommits.map((c) => ({
+    brags: selectedCommits.map((c) => ({
       text: c.message,
       date: c.date,
       title: c.message.split("\n")[0]
@@ -5066,9 +5105,9 @@ async function syncSingleService(sourceType, options, TOTAL_STEPS) {
   } else {
     logger.info("Preview of refined brags:");
     logger.log("");
-    logger.log(formatRefinedCommitsTable(refinedBrags, newCommits));
+    logger.log(formatRefinedCommitsTable(refinedBrags, selectedCommits));
     logger.log("");
-    acceptedBrags = await promptReviewBrags(refinedBrags, newCommits);
+    acceptedBrags = await promptReviewBrags(refinedBrags, selectedCommits);
   }
   if (acceptedBrags.length === 0) {
     logger.log("");
@@ -5077,17 +5116,19 @@ async function syncSingleService(sourceType, options, TOTAL_STEPS) {
     return { created: 0, skipped: duplicates.length };
   }
   logger.log("");
-  let selectedOrgId = null;
-  const userInfo = authService.getUserInfo();
-  if (userInfo?.id) {
-    try {
-      const orgsResponse = await apiService.listUserOrganisations(userInfo.id);
-      if (orgsResponse.items.length > 0) {
-        selectedOrgId = await promptSelectOrganisation(orgsResponse.items);
-        logger.log("");
+  let selectedOrgId = sharedOrgId !== void 0 ? sharedOrgId : null;
+  if (sharedOrgId === void 0) {
+    const userInfo = authService.getUserInfo();
+    if (userInfo?.id) {
+      try {
+        const orgsResponse = await apiService.listUserOrganisations(userInfo.id);
+        if (orgsResponse.items.length > 0) {
+          selectedOrgId = await promptSelectOrganisation(orgsResponse.items);
+          logger.log("");
+        }
+      } catch {
+        logger.debug("Failed to fetch organisations, skipping org selection");
       }
-    } catch {
-      logger.debug("Failed to fetch organisations, skipping org selection");
     }
   }
   const createSpinner2 = createStepSpinner(
@@ -5098,7 +5139,7 @@ async function syncSingleService(sourceType, options, TOTAL_STEPS) {
   createSpinner2.start();
   const createRequest = {
     brags: acceptedBrags.map((refined, index) => {
-      const originalCommit = newCommits[index];
+      const originalCommit = selectedCommits[index];
       return {
         commit_sha: originalCommit?.sha || `brag-${index}`,
         title: refined.refined_title,
@@ -5145,7 +5186,12 @@ async function syncSingleService(sourceType, options, TOTAL_STEPS) {
     logger.log("");
     throw error;
   }
-  return { created: createResponse.created, skipped: duplicates.length };
+  const createdBrags = createResponse.brags.map((brag) => ({
+    title: brag.title,
+    date: brag.created_at,
+    source: sourceType
+  }));
+  return { created: createResponse.created, skipped: duplicates.length, createdBrags };
 }
 async function syncAllAuthenticatedServices(options) {
   const TOTAL_STEPS = 5;
@@ -5161,16 +5207,28 @@ async function syncAllAuthenticatedServices(options) {
   let servicesToSync = authenticatedServices.filter(
     (service) => service !== "bragduck" && allServices.includes(service)
   );
+  let detectedGitService = null;
   try {
     const { detected } = await sourceDetector.detectSources();
     logger.debug(`Detected ${detected.length} git source(s) from repository`);
-    for (const source of detected) {
-      if (["github", "gitlab", "bitbucket", "atlassian"].includes(source.type)) {
-        if (!servicesToSync.includes(source.type)) {
-          servicesToSync.push(source.type);
-          logger.debug(`Added local ${source.type} repo to sync list`);
-        }
-      }
+    const gitSource = detected.find(
+      (source) => ["github", "gitlab", "bitbucket", "atlassian"].includes(source.type)
+    );
+    if (gitSource) {
+      detectedGitService = gitSource.type;
+      logger.debug(`Current repository is ${detectedGitService}, will sync only this git service`);
+      if (!servicesToSync.includes(detectedGitService)) {
+        servicesToSync.push(detectedGitService);
+        logger.debug(`Added local ${detectedGitService} repo to sync list`);
+      }
+      const otherGitServices = ["github", "gitlab", "bitbucket", "atlassian"];
+      servicesToSync = servicesToSync.filter(
+        (service) => service === detectedGitService || !otherGitServices.includes(service)
+        // Keep non-git services like Jira/Confluence
+      );
+      logger.debug(
+        `Filtered out other git services, keeping only ${detectedGitService} for git sync`
+      );
     }
   } catch {
     logger.debug("No local git repository detected");
@@ -5188,10 +5246,40 @@ async function syncAllAuthenticatedServices(options) {
   }
   logger.info(
     theme.highlight(
-      `Syncing ${servicesToSync.length} authenticated service${servicesToSync.length > 1 ? "s" : ""}...`
+      `Syncing ${servicesToSync.length} service${servicesToSync.length > 1 ? "s" : ""}...`
     )
   );
   logger.log("");
+  let sharedDays = options.days;
+  if (!sharedDays && options.today) {
+    sharedDays = 1;
+    logger.debug("Using --today flag: scanning last 24 hours (1 day)");
+  }
+  if (!sharedDays && !options.turbo) {
+    const defaultDays = storageService.getConfig("defaultCommitDays");
+    sharedDays = await promptDaysToScan(defaultDays);
+    logger.log("");
+  }
+  if (!sharedDays && options.turbo) {
+    sharedDays = storageService.getConfig("defaultCommitDays") || 30;
+    logger.debug(`Turbo mode: using default ${sharedDays} days`);
+  }
+  let sharedOrgId = null;
+  if (!options.turbo) {
+    const userInfo = authService.getUserInfo();
+    if (userInfo?.id) {
+      try {
+        const orgsResponse = await apiService.listUserOrganisations(userInfo.id);
+        if (orgsResponse.items.length > 0) {
+          const defaultOrgId = storageService.getConfig("defaultCompany");
+          sharedOrgId = await promptSelectOrganisationWithDefault(orgsResponse.items, defaultOrgId);
+          logger.log("");
+        }
+      } catch {
+        logger.debug("Failed to fetch organisations, skipping org selection");
+      }
+    }
+  }
   const results = [];
   for (let i = 0; i < servicesToSync.length; i++) {
     const service = servicesToSync[i];
@@ -5202,8 +5290,19 @@ async function syncAllAuthenticatedServices(options) {
     );
     logger.log("");
     try {
-      const result = await syncSingleService(service, options, TOTAL_STEPS);
-      results.push({ service, created: result.created, skipped: result.skipped });
+      const result = await syncSingleService(
+        service,
+        options,
+        TOTAL_STEPS,
+        sharedDays,
+        sharedOrgId
+      );
+      results.push({
+        service,
+        created: result.created,
+        skipped: result.skipped,
+        createdBrags: result.createdBrags
+      });
       logger.log("");
     } catch (error) {
       const err = error;
@@ -5244,7 +5343,8 @@ async function syncAllAuthenticatedServices(options) {
     logger.log("");
   }
   if (totalCreated > 0) {
-    logger.log(boxen6(formatSuccessMessage(totalCreated), boxStyles.success));
+    const allCreatedBrags = results.filter((r) => r.createdBrags).flatMap((r) => r.createdBrags);
+    logger.log(boxen6(formatSuccessMessage(totalCreated, allCreatedBrags), boxStyles.success));
   } else if (successful.length > 0) {
     logger.log(
       boxen6(
@@ -5332,7 +5432,9 @@ async function syncCommand(options = {}) {
       logger.log("");
       const result = await syncSingleService(sourceType, options, TOTAL_STEPS);
       if (result.created > 0) {
-        logger.log(boxen6(formatSuccessMessage(result.created), boxStyles.success));
+        logger.log(
+          boxen6(formatSuccessMessage(result.created, result.createdBrags), boxStyles.success)
+        );
       } else if (result.skipped > 0) {
         logger.log("");
         logger.info(
@@ -5818,7 +5920,7 @@ function formatBragsTable(brags) {
     style: tableStyles.default.style
   });
   brags.forEach((brag) => {
-    const date = new Date(brag.date).toLocaleDateString();
+    const date = formatDate(brag.date);
     const title = brag.title;
     const description = truncateText(brag.description, 100);
     const tags = brag.tags.length > 0 ? brag.tags.join(", ") : colors.dim("none");
@@ -5835,7 +5937,7 @@ function formatBragsTable(brags) {
 }
 function formatBragsOneline(brags) {
   return brags.map((brag) => {
-    const date = new Date(brag.date).toLocaleDateString();
+    const date = formatDate(brag.date);
     return `${colors.highlight(date)}  ${colors.white(brag.title)}`;
   }).join("\n");
 }