@bragduck/cli 2.39.1 → 2.40.0

package/dist/bin/bragduck.js

@@ -6375,9 +6375,9 @@ async function promptSortOption() {
     default: "date"
   });
 }
-async function promptSelectOrganisation(organisations) {
+async function promptSelectOrganisation(organisations, allowNone = true) {
   const choices = [
-    { name: "No company", value: "none" },
+    ...allowNone ? [{ name: "No company", value: "none" }] : [],
     ...organisations.map((org) => ({
       name: org.name,
       value: org.id
@@ -6386,11 +6386,11 @@ async function promptSelectOrganisation(organisations) {
   const selected = await select3({
     message: "Attach brags to which company?",
     choices,
-    default: "none"
+    default: allowNone ? "none" : void 0
   });
   return selected === "none" ? null : selected;
 }
-async function promptSelectOrganisationWithDefault(organisations, defaultOrgId) {
+async function promptSelectOrganisationWithDefault(organisations, defaultOrgId, allowNone = true) {
   if (defaultOrgId) {
     const defaultOrg = organisations.find((org) => org.id === defaultOrgId);
     if (defaultOrg) {
@@ -6403,7 +6403,7 @@ async function promptSelectOrganisationWithDefault(organisations, defaultOrgId)
       }
     }
   }
-  return await promptSelectOrganisation(organisations);
+  return await promptSelectOrganisation(organisations, allowNone);
 }
 async function promptReviewBrags(refinedBrags, selectedCommits) {
   const acceptedBrags = [];
@@ -6733,9 +6733,56 @@ async function discoverRepositories() {
 // src/sync/multi-repo-sync.ts
 init_esm_shims();
 init_api_service();
+init_storage_service();
+
+// src/sync/organisation.ts
+init_esm_shims();
+init_api_service();
 init_auth_service();
 init_storage_service();
 init_logger();
+init_errors();
+var CREATE_COMPANY_URL = "https://bragduck.com/app";
+async function loadSyncOrganisations() {
+  const userInfo = authService.getUserInfo();
+  if (!userInfo?.id) {
+    throw new AuthenticationError("Could not read your account to load your companies");
+  }
+  const orgsResponse = await apiService.listUserOrganisations(userInfo.id);
+  const companies = orgsResponse.items.filter((org) => org.role !== "__virtual__");
+  if (companies.length === 0) {
+    throw new ValidationError(
+      `Synced brags belong to a company, and you don't have one yet. Create a company at ${CREATE_COMPANY_URL}, then run sync again.`,
+      { hint: `Create a company at ${CREATE_COMPANY_URL}` }
+    );
+  }
+  return companies;
+}
+async function selectSyncOrganisation(organisations, turbo) {
+  if (organisations.length === 1) {
+    return organisations[0].id;
+  }
+  const defaultOrgId = storageService.getConfig("defaultCompany");
+  if (turbo) {
+    if (defaultOrgId && organisations.some((org) => org.id === defaultOrgId)) {
+      logger.debug(`Turbo mode: using default company ${defaultOrgId}`);
+      return defaultOrgId;
+    }
+    const companies = organisations.map((org) => `${org.name} (${org.id})`).join(", ");
+    throw new ValidationError(
+      `Turbo mode needs a default company when you belong to more than one: ${companies}`,
+      {
+        hint: 'Run "bragduck config set defaultCompany <company-id>", or sync without --turbo to pick one'
+      }
+    );
+  }
+  const orgId = await promptSelectOrganisationWithDefault(organisations, defaultOrgId, false);
+  logger.log("");
+  return orgId;
+}
+
+// src/sync/multi-repo-sync.ts
+init_logger();
 
 // src/utils/source-tag.ts
 init_esm_shims();
@@ -6865,6 +6912,7 @@ async function syncSingleRepository(repo, days, sortOption, scanMode, orgId, opt
   );
   refineSpinner.start();
   const refineRequest = {
+    orgId,
     brags: selectedCommits.map((c) => ({
       text: c.message,
       date: c.date,
@@ -6919,7 +6967,7 @@ async function syncSingleRepository(repo, days, sortOption, scanMode, orgId, opt
         impactDescription: refined.impact_description,
         impact_description: refined.impact_description,
         attachments: originalCommit?.url ? [originalCommit.url] : [],
-        orgId: orgId || void 0,
+        orgId,
         // External fields for non-git sources
         externalId: originalCommit?.externalId,
         externalType: originalCommit?.externalType,
@@ -6969,6 +7017,8 @@ async function syncSingleRepository(repo, days, sortOption, scanMode, orgId, opt
 }
 async function syncMultipleRepositories(repos, options) {
   logger.debug(`Starting multi-repo sync for ${repos.length} repositories`);
+  const organisations = await loadSyncOrganisations();
+  const turboOrgId = options.turbo ? await selectSyncOrganisation(organisations, true) : void 0;
   let days = options.days;
   if (!days && options.today) {
     days = 1;
@@ -7010,25 +7060,7 @@ async function syncMultipleRepositories(repos, options) {
     logger.log(colors.highlight(`\u2501\u2501\u2501 Syncing ${current}/${total}: ${repo.name} \u2501\u2501\u2501`));
     logger.log("");
     try {
-      let selectedOrgId = 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");
-              selectedOrgId = await promptSelectOrganisationWithDefault(
-                orgsResponse.items,
-                defaultOrgId
-              );
-              logger.log("");
-            }
-          } catch {
-            logger.debug("Failed to fetch organisations, skipping org selection");
-          }
-        }
-      }
+      const selectedOrgId = turboOrgId ?? await selectSyncOrganisation(organisations);
       const result = await syncSingleRepository(
         repo,
         days,
@@ -7129,6 +7161,7 @@ async function promptSelectService() {
   return selected;
 }
 async function syncSingleService(sourceType, options, TOTAL_STEPS, sharedDays, sharedOrgId) {
+  const selectedOrgId = sharedOrgId ?? await pickSyncOrganisation(options);
   const adapter = AdapterFactory.getAdapter(sourceType);
   const validationText = sourceType === "jira" || sourceType === "confluence" ? "Connecting to Atlassian instance" : sourceType === "google-docs" ? "Connecting to Google Drive" : "Validating repository";
   const repoSpinner = createStepSpinner(2, TOTAL_STEPS, validationText);
@@ -7274,6 +7307,7 @@ async function syncSingleService(sourceType, options, TOTAL_STEPS, sharedDays, s
   );
   refineSpinner.start();
   const refineRequest = {
+    orgId: selectedOrgId,
     brags: selectedCommits.map((c) => ({
       text: c.message,
       date: c.date,
@@ -7303,25 +7337,6 @@ async function syncSingleService(sourceType, options, TOTAL_STEPS, sharedDays, s
     return { created: 0, skipped: duplicates.length };
   }
   logger.log("");
-  let selectedOrgId = sharedOrgId !== void 0 ? sharedOrgId : null;
-  if (sharedOrgId === void 0) {
-    const userInfo = authService.getUserInfo();
-    if (userInfo?.id) {
-      const orgSpinner = createFetchSpinner("Loading organizations...");
-      orgSpinner.start();
-      try {
-        const orgsResponse = await apiService.listUserOrganisations(userInfo.id);
-        orgSpinner.stop();
-        if (orgsResponse.items.length > 0) {
-          selectedOrgId = await promptSelectOrganisation(orgsResponse.items);
-          logger.log("");
-        }
-      } catch {
-        orgSpinner.stop();
-        logger.debug("Failed to fetch organisations, skipping org selection");
-      }
-    }
-  }
   const createSpinner = createStepSpinner(
     5,
     TOTAL_STEPS,
@@ -7350,7 +7365,7 @@ async function syncSingleService(sourceType, options, TOTAL_STEPS, sharedDays, s
         impactDescription: refined.impact_description,
         impact_description: refined.impact_description,
         attachments: [],
-        orgId: selectedOrgId || void 0,
+        orgId: selectedOrgId,
         // External fields for non-git sources (Jira, Confluence, etc.)
         externalId: originalCommit?.externalId,
         externalType: originalCommit?.externalType,
@@ -7466,26 +7481,7 @@ async function syncAllAuthenticatedServices(options) {
     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) {
-      const orgSpinner = createFetchSpinner("Loading organizations...");
-      orgSpinner.start();
-      try {
-        const orgsResponse = await apiService.listUserOrganisations(userInfo.id);
-        orgSpinner.stop();
-        if (orgsResponse.items.length > 0) {
-          const defaultOrgId = storageService.getConfig("defaultCompany");
-          sharedOrgId = await promptSelectOrganisationWithDefault(orgsResponse.items, defaultOrgId);
-          logger.log("");
-        }
-      } catch {
-        orgSpinner.stop();
-        logger.debug("Failed to fetch organisations, skipping org selection");
-      }
-    }
-  }
+  const sharedOrgId = await pickSyncOrganisation(options);
   const results = [];
   for (let i = 0; i < servicesToSync.length; i++) {
     const service = servicesToSync[i];
@@ -7808,6 +7804,17 @@ To authenticate:
     process.exit(1);
   }
 }
+async function pickSyncOrganisation(options) {
+  const orgSpinner = createFetchSpinner("Loading organizations...");
+  orgSpinner.start();
+  let organisations;
+  try {
+    organisations = await loadSyncOrganisations();
+  } finally {
+    orgSpinner.stop();
+  }
+  return await selectSyncOrganisation(organisations, options.turbo);
+}
 function getServiceLabel(service) {
   if (service === "google-docs") return "Google Docs";
   if (service === "slack") return "Slack";
@@ -7838,7 +7845,7 @@ function getErrorHint(error, sourceType) {
     }
     return 'Run "bragduck auth login" to login again';
   }
-  if (error.name === "IntegrationError" && error.details?.hint) {
+  if ((error.name === "IntegrationError" || error.name === "ValidationError") && error.details?.hint) {
     return error.details.hint;
   }
   if (error.name === "GoogleDocsError") {