@bragduck/cli 2.37.1 → 2.38.2

package/dist/bin/bragduck.js

@@ -63,7 +63,7 @@ var init_constants = __esm({
       CLIENT_ID: "kJlsd66DLTnENE8p7Ru2JwqZg1Sie4yZ",
       AUTH_URL: "https://auth.atlassian.com/authorize",
       AUDIENCE: "api.atlassian.com",
-      SCOPES: "read:jira-work read:jira-user read:page:confluence read:confluence-user offline_access read:me",
+      SCOPES: "read:jira-work read:jira-user read:confluence-content.all read:confluence-user offline_access",
       ACCESSIBLE_RESOURCES_URL: "https://api.atlassian.com/oauth/token/accessible-resources",
       API_GATEWAY_URL: "https://api.atlassian.com"
     };
@@ -1891,6 +1891,19 @@ var AtlassianAuthService = class {
       callbackResult = await resultPromise;
     } catch (error) {
       storageService.deleteOAuthState();
+      const rawMessage = error?.message ?? String(error);
+      if (/invalid_scope/i.test(rawMessage)) {
+        throw new AtlassianError(
+          "Atlassian rejected the requested scopes. The app must list all of these classic scopes: read:jira-work, read:jira-user, read:confluence-content.all, read:confluence-user, offline_access.",
+          { originalError: rawMessage }
+        );
+      }
+      if (/redirect_uri|invalid_request/i.test(rawMessage)) {
+        throw new AtlassianError(
+          "Atlassian rejected the redirect URI. All of http://127.0.0.1:8000/callback through http://127.0.0.1:8004/callback must be registered in the Atlassian app callback URL list.",
+          { originalError: rawMessage }
+        );
+      }
       throw error;
     }
     storageService.deleteOAuthState();
@@ -4275,6 +4288,13 @@ init_errors();
 init_logger();
 init_storage_service();
 init_constants();
+function adfToText(node) {
+  if (!node) return "";
+  if (typeof node === "string") return node;
+  if (node.text) return node.text;
+  if (node.content) return node.content.map(adfToText).join("");
+  return "";
+}
 var JiraService = class {
   MAX_DESCRIPTION_LENGTH = 5e3;
   /**
@@ -4469,9 +4489,10 @@ var JiraService = class {
    * Determine the type of contribution the current user made to an issue
    * Returns: 'created' | 'reported' | 'assigned-resolved' | 'edited'
    */
-  async determineJiraContributionType(issue, userEmail) {
-    const isCreator = issue.fields.creator.emailAddress === userEmail;
-    const isReporter = issue.fields.reporter?.emailAddress === userEmail;
+  async determineJiraContributionType(issue, userIdentifier) {
+    const matchesUser = (person) => !!person && (person.accountId === userIdentifier || person.emailAddress === userIdentifier);
+    const isCreator = matchesUser(issue.fields.creator);
+    const isReporter = matchesUser(issue.fields.reporter);
     if (isCreator) {
       return {
         type: "created",
@@ -4484,9 +4505,9 @@ var JiraService = class {
         details: `Reported ${issue.fields.issuetype.name}: ${issue.fields.status.name}`
       };
     }
-    const isAssigned = issue.fields.assignee?.emailAddress === userEmail;
+    const isAssigned = matchesUser(issue.fields.assignee);
     const isResolved = issue.fields.resolutiondate !== null && issue.fields.resolutiondate !== void 0;
-    const userEdits = issue.changelog?.histories?.filter((history) => history.author.emailAddress === userEmail) || [];
+    const userEdits = issue.changelog?.histories?.filter((history) => matchesUser(history.author)) || [];
     const hasEdits = userEdits.length > 0;
     if (isAssigned && isResolved) {
       return {
@@ -4558,7 +4579,7 @@ var JiraService = class {
         );
         break;
       }
-      const endpoint = `/rest/api/3/search/jql?jql=${encodeURIComponent(jql)}&startAt=${startAt}&maxResults=${maxResults}&fields=${fields.join(",")}`;
+      const endpoint = `/rest/api/3/search?jql=${encodeURIComponent(jql)}&startAt=${startAt}&maxResults=${maxResults}&fields=${fields.join(",")}`;
       try {
         const response = await this.request(endpoint);
         if (response.issues.length === 0) {
@@ -4663,7 +4684,8 @@ var JiraService = class {
 
 ${contribution.details}`;
       if (contribution.type === "created" && issue.fields.description) {
-        const truncatedDesc = issue.fields.description.substring(0, this.MAX_DESCRIPTION_LENGTH);
+        const plainDesc = adfToText(issue.fields.description);
+        const truncatedDesc = plainDesc.substring(0, this.MAX_DESCRIPTION_LENGTH);
         message = `${contributionPrefix}${issue.fields.summary}
 
 ${truncatedDesc}
@@ -4673,7 +4695,8 @@ ${contribution.details}`;
     } else {
       message = issue.fields.summary;
       if (issue.fields.description) {
-        const truncatedDesc = issue.fields.description.substring(0, this.MAX_DESCRIPTION_LENGTH);
+        const plainDesc = adfToText(issue.fields.description);
+        const truncatedDesc = plainDesc.substring(0, this.MAX_DESCRIPTION_LENGTH);
         message = `${issue.fields.summary}
 
 ${truncatedDesc}`;
@@ -4921,16 +4944,13 @@ var ConfluenceService = class {
   }
   /**
    * Build CQL query from options
-   * Returns empty string if no filters need CQL (will use simple endpoint instead)
+   * Always returns a CQL string with at least a user filter so we never return all pages.
    */
   buildCQL(options) {
-    if (!options.days && !options.author && !options.cql) {
-      return "";
-    }
     const queries = [];
     queries.push("type = page");
     if (options.days) {
-      queries.push(`lastModified > startOfDay("-${options.days}d")`);
+      queries.push(`lastmodified > startOfDay("-${options.days}d")`);
     }
     if (options.author) {
       const escapedAuthor = options.author.replace(/"/g, '\\"');
@@ -4954,17 +4974,16 @@ var ConfluenceService = class {
    * Determine the type of contribution the current user made to a page
    * Returns: 'created' | 'edited' | 'commented'
    */
-  async determineContributionType(page, userEmail) {
-    if (page.history?.createdBy?.email === userEmail) {
+  async determineContributionType(page, userIdentifier) {
+    const matchesUser = (by) => !!by && (by.accountId === userIdentifier || by.email === userIdentifier);
+    if (matchesUser(page.history?.createdBy)) {
       return {
         type: "created",
         details: `Created page with ${page.version?.number || 1} version${(page.version?.number || 1) > 1 ? "s" : ""}`
       };
     }
-    const hasEdits = page.version?.by?.email === userEmail && (page.version?.number || 0) > 1;
-    const userComments = page.children?.comment?.results?.filter(
-      (comment) => comment.version?.by?.email === userEmail
-    ) || [];
+    const hasEdits = matchesUser(page.version?.by) && (page.version?.number || 0) > 1;
+    const userComments = page.children?.comment?.results?.filter((comment) => matchesUser(comment.version?.by)) || [];
     const hasComments = userComments.length > 0;
     if (hasEdits && hasComments) {
       return {
@@ -5008,9 +5027,7 @@ var ConfluenceService = class {
    */
   async getPages(options = {}) {
     const cql = this.buildCQL(options);
-    if (cql) {
-      logger.debug(`Using CQL query: ${cql}`);
-    }
+    logger.debug(`Using CQL query: ${cql}`);
     const allPages = [];
     const seenPageIds = /* @__PURE__ */ new Set();
     let start = 0;
@@ -5025,29 +5042,14 @@ var ConfluenceService = class {
         );
         break;
       }
-      let endpoint;
-      let params;
-      if (cql) {
-        params = {
-          cql,
-          start: start.toString(),
-          limit: limit.toString(),
-          expand: "version,history,children.comment,body.storage"
-        };
-        const queryString = Object.entries(params).map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`).join("&");
-        endpoint = `/wiki/rest/api/content/search?${queryString}`;
-      } else {
-        logger.debug("Using simple content list (no CQL filters)");
-        params = {
-          type: "page",
-          status: "current",
-          start: start.toString(),
-          limit: limit.toString(),
-          expand: "version,history,children.comment,body.storage"
-        };
-        const queryString = Object.entries(params).map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`).join("&");
-        endpoint = `/wiki/rest/api/content?${queryString}`;
-      }
+      const params = {
+        cql,
+        start: start.toString(),
+        limit: limit.toString(),
+        expand: "version,history,children.comment,body.storage"
+      };
+      const queryString = Object.entries(params).map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`).join("&");
+      const endpoint = `/wiki/rest/api/content/search?${queryString}`;
       try {
         const response = await this.request(endpoint);
         if (response.results.length === 0) {
@@ -6981,7 +6983,7 @@ async function syncSingleService(sourceType, options, TOTAL_STEPS, sharedDays, s
         typeKey: refined.suggested_type_key,
         impactDescription: refined.impact_description,
         impact_description: refined.impact_description,
-        attachments: originalCommit?.url ? [originalCommit.url] : [],
+        attachments: [],
         orgId: selectedOrgId || void 0,
         // External fields for non-git sources (Jira, Confluence, etc.)
         externalId: originalCommit?.externalId,