@bragduck/cli 2.9.5 → 2.10.1

package/dist/bin/bragduck.js

@@ -3379,12 +3379,19 @@ var JiraService = class {
    */
   buildJQL(options) {
     const queries = [];
-    queries.push("status IN (Done, Resolved, Closed)");
     if (options.days) {
-      queries.push(`updated >= -${options.days}d`);
+      queries.push(
+        `(created >= -${options.days}d OR resolved >= -${options.days}d OR updated >= -${options.days}d)`
+      );
     }
     if (options.author) {
-      queries.push(`creator = "${options.author}"`);
+      if (options.author.includes("@")) {
+        queries.push("(creator = currentUser() OR assignee = currentUser())");
+      } else {
+        queries.push(`(creator = "${options.author}" OR assignee = "${options.author}")`);
+      }
+    } else {
+      queries.push("(creator = currentUser() OR assignee = currentUser())");
     }
     if (options.jql) {
       queries.push(`(${options.jql})`);
@@ -3409,6 +3416,7 @@ var JiraService = class {
    */
   async getIssues(options = {}) {
     const jql = this.buildJQL(options);
+    logger.debug(`Using JQL query: ${jql}`);
     const fields = [
       "summary",
       "description",
@@ -3420,16 +3428,41 @@ var JiraService = class {
       "issuetype"
     ];
     const allIssues = [];
+    const seenIssueKeys = /* @__PURE__ */ new Set();
     let startAt = 0;
     const maxResults = 100;
+    const maxIterations = 1e3;
+    let iterations = 0;
     while (true) {
+      iterations++;
+      if (iterations > maxIterations) {
+        logger.warning(
+          `Reached maximum iteration limit (${maxIterations}). Stopping pagination to prevent infinite loop.`
+        );
+        break;
+      }
       const endpoint = `/rest/api/2/search?jql=${encodeURIComponent(jql)}&startAt=${startAt}&maxResults=${maxResults}&fields=${fields.join(",")}`;
       try {
         const response = await this.request(endpoint);
-        allIssues.push(...response.issues);
+        if (response.issues.length === 0) {
+          logger.debug("No more results returned, stopping pagination");
+          break;
+        }
+        let newIssuesCount = 0;
+        for (const issue of response.issues) {
+          if (!seenIssueKeys.has(issue.key)) {
+            seenIssueKeys.add(issue.key);
+            allIssues.push(issue);
+            newIssuesCount++;
+          }
+        }
         logger.debug(
-          `Fetched ${response.issues.length} issues (total: ${allIssues.length} of ${response.total})${startAt + maxResults < response.total ? ", fetching next page..." : ""}`
+          `Fetched ${newIssuesCount} new issues (total: ${allIssues.length} of ${response.total})${startAt + maxResults < response.total ? ", fetching next page..." : ""}`
         );
+        if (newIssuesCount === 0) {
+          logger.debug("All results are duplicates, stopping pagination");
+          break;
+        }
         if (startAt + maxResults >= response.total) {
           break;
         }
@@ -3447,7 +3480,10 @@ var JiraService = class {
             break;
           }
           if (startAt === 0) {
-            throw error;
+            logger.warning(
+              "No accessible issues found. Some resources may be deleted, archived, or you may not have permission to view them."
+            );
+            return [];
           }
           startAt += maxResults;
           continue;
@@ -3668,10 +3704,15 @@ var ConfluenceService = class {
   }
   /**
    * Build CQL query from options
+   * Returns empty string if no filters need CQL (will use simple endpoint instead)
    */
   buildCQL(options) {
+    if (!options.days && !options.author && !options.cql) {
+      return "";
+    }
     const queries = [];
     queries.push("type=page");
+    queries.push("status=current");
     if (options.days) {
       queries.push(`lastModified >= now("-${options.days}d")`);
     }
@@ -3696,27 +3737,64 @@ var ConfluenceService = class {
   async getPages(options = {}) {
     const cql = this.buildCQL(options);
     const allPages = [];
+    const seenPageIds = /* @__PURE__ */ new Set();
     let start = 0;
     const limit = 100;
+    const maxIterations = 1e3;
+    let iterations = 0;
     while (true) {
-      const params = {
-        type: "page",
-        status: "current",
-        start: start.toString(),
-        limit: limit.toString(),
-        expand: "version,body.storage"
-      };
+      iterations++;
+      if (iterations > maxIterations) {
+        logger.warning(
+          `Reached maximum iteration limit (${maxIterations}). Stopping pagination to prevent infinite loop.`
+        );
+        break;
+      }
+      let endpoint;
+      let params;
       if (cql) {
-        params.cql = cql;
+        logger.debug(`Using CQL search: ${cql}`);
+        params = {
+          cql,
+          start: start.toString(),
+          limit: limit.toString(),
+          expand: "version,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,body.storage"
+        };
+        const queryString = Object.entries(params).map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`).join("&");
+        endpoint = `/wiki/rest/api/content?${queryString}`;
       }
-      const queryString = Object.entries(params).map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`).join("&");
-      const endpoint = `/wiki/rest/api/content?${queryString}`;
       try {
         const response = await this.request(endpoint);
-        allPages.push(...response.results);
+        if (response.results.length === 0) {
+          logger.debug("No more results returned, stopping pagination");
+          break;
+        }
+        let newPagesCount = 0;
+        for (const page of response.results) {
+          if (!seenPageIds.has(page.id)) {
+            seenPageIds.add(page.id);
+            allPages.push(page);
+            newPagesCount++;
+          }
+        }
         logger.debug(
-          `Fetched ${response.size} pages (total: ${allPages.length})${response.size === limit ? ", fetching next page..." : ""}`
+          `Fetched ${newPagesCount} new pages (total: ${allPages.length}, duplicates: ${response.results.length - newPagesCount})${response.size === limit ? ", fetching next page..." : ""}`
         );
+        if (newPagesCount === 0) {
+          logger.debug("All results are duplicates, stopping pagination");
+          break;
+        }
         if (response.size === 0 || response.size < limit) {
           break;
         }
@@ -3734,7 +3812,10 @@ var ConfluenceService = class {
             break;
           }
           if (start === 0) {
-            throw error;
+            logger.warning(
+              "No accessible pages found. Some resources may be deleted, archived, or you may not have permission to view them."
+            );
+            return [];
           }
           start += limit;
           continue;
@@ -4644,6 +4725,7 @@ async function syncAllAuthenticatedServices(options) {
   const results = [];
   for (let i = 0; i < servicesToSync.length; i++) {
     const service = servicesToSync[i];
+    if (!service) continue;
     const serviceLabel = service.charAt(0).toUpperCase() + service.slice(1);
     logger.log(
       colors.highlight(`\u2501\u2501\u2501 Syncing ${i + 1}/${servicesToSync.length}: ${serviceLabel} \u2501\u2501\u2501`)