@bragduck/cli 2.18.0 → 2.20.0

package/dist/bin/bragduck.js

@@ -4688,6 +4688,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 +4928,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 +4958,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)");
@@ -5077,17 +5092,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(
@@ -5161,16 +5178,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 +5217,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,7 +5261,13 @@ async function syncAllAuthenticatedServices(options) {
     );
     logger.log("");
     try {
-      const result = await syncSingleService(service, options, TOTAL_STEPS);
+      const result = await syncSingleService(
+        service,
+        options,
+        TOTAL_STEPS,
+        sharedDays,
+        sharedOrgId
+      );
       results.push({ service, created: result.created, skipped: result.skipped });
       logger.log("");
     } catch (error) {
@@ -5347,12 +5412,13 @@ async function syncCommand(options = {}) {
         logger.log("");
       }
     }
+    process.exit(0);
   } catch (error) {
     if (error instanceof CancelPromptError) {
       logger.log("");
       logger.info(theme.secondary("Sync cancelled."));
       logger.log("");
-      return;
+      process.exit(0);
     }
     const err = error;
     logger.log("");