@bragduck/cli 2.27.0 → 2.27.2

package/dist/bin/bragduck.js

@@ -3653,6 +3653,32 @@ var JiraService = class {
       return null;
     }
   }
+  /**
+   * Check if a user object matches the given identifier (accountId, email, or username)
+   */
+  isMatchingUser(candidate, userIdentifier) {
+    return candidate.email === userIdentifier || candidate.emailAddress === userIdentifier || candidate.accountId === userIdentifier || candidate.username === userIdentifier || candidate.name === userIdentifier;
+  }
+  /**
+   * Filter issues to only those where the user made contributions within the date range.
+   * Excludes issues where the user's only involvement is a static role (creator/assignee)
+   * with a date outside the scan period.
+   */
+  filterIssuesByUserContribution(issues, userIdentifier, sinceDate) {
+    const results = [];
+    for (const issue of issues) {
+      const userChanges = (issue.changelog?.histories || []).filter(
+        (h) => this.isMatchingUser(h.author, userIdentifier) && new Date(h.created) >= sinceDate
+      );
+      const isCreatorInRange = this.isMatchingUser(issue.fields.creator, userIdentifier) && new Date(issue.fields.created) >= sinceDate;
+      if (userChanges.length > 0 || isCreatorInRange) {
+        results.push({ issue, userChanges });
+      } else {
+        logger.debug(`Excluding issue ${issue.key} - no user contributions in date range`);
+      }
+    }
+    return results;
+  }
   /**
    * Build JQL query from options
    */
@@ -3782,7 +3808,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?jql=${encodeURIComponent(jql)}&startAt=${startAt}&maxResults=${maxResults}&fields=${fields.join(",")}&expand=changelog`;
       try {
         const response = await this.request(endpoint);
         if (response.issues.length === 0) {
@@ -3808,14 +3834,7 @@ var JiraService = class {
           break;
         }
         if (options.limit && allIssues.length >= options.limit) {
-          const email2 = await this.getCurrentUser();
-          const limitedIssues = allIssues.slice(0, options.limit);
-          const commits2 = [];
-          for (const issue of limitedIssues) {
-            const commit = await this.transformIssueToCommit(issue, void 0, email2 || void 0);
-            commits2.push(commit);
-          }
-          return commits2;
+          break;
         }
         startAt += maxResults;
       } catch (error) {
@@ -3839,9 +3858,23 @@ var JiraService = class {
         throw error;
       }
     }
+    const issuesToProcess = options.limit ? allIssues.slice(0, options.limit) : allIssues;
     const email = await this.getCurrentUser();
+    const sinceDate = options.days ? new Date(Date.now() - options.days * 24 * 60 * 60 * 1e3) : void 0;
+    if (sinceDate && email) {
+      const filtered = this.filterIssuesByUserContribution(issuesToProcess, email, sinceDate);
+      logger.debug(
+        `Date-scoped filtering: ${issuesToProcess.length} issues -> ${filtered.length} with user contributions in range`
+      );
+      const commits2 = [];
+      for (const { issue, userChanges } of filtered) {
+        const commit = await this.transformIssueToCommit(issue, void 0, email, userChanges);
+        commits2.push(commit);
+      }
+      return commits2;
+    }
     const commits = [];
-    for (const issue of allIssues) {
+    for (const issue of issuesToProcess) {
       const commit = await this.transformIssueToCommit(issue, void 0, email || void 0);
       commits.push(commit);
     }
@@ -3863,7 +3896,7 @@ var JiraService = class {
   /**
    * Transform Jira issue to GitCommit format with contribution-specific data
    */
-  async transformIssueToCommit(issue, instanceUrl, userEmail) {
+  async transformIssueToCommit(issue, instanceUrl, userEmail, userChanges) {
     let contribution = null;
     if (userEmail) {
       contribution = await this.determineJiraContributionType(issue, userEmail);
@@ -3905,6 +3938,8 @@ ${truncatedDesc}`;
       date = issue.fields.created;
     } else if (contribution?.type === "assigned-resolved" && issue.fields.resolutiondate) {
       date = issue.fields.resolutiondate;
+    } else if (userChanges && userChanges.length > 0) {
+      date = userChanges[userChanges.length - 1].created;
     } else {
       date = issue.fields.updated;
     }
@@ -4094,6 +4129,59 @@ var ConfluenceService = class {
       return null;
     }
   }
+  /**
+   * Check if a user object matches the given identifier (accountId, email, or username)
+   */
+  isMatchingUser(candidate, userIdentifier) {
+    return candidate.email === userIdentifier || candidate.emailAddress === userIdentifier || candidate.accountId === userIdentifier || candidate.username === userIdentifier || candidate.name === userIdentifier;
+  }
+  /**
+   * Fetch full version history for a page
+   */
+  async getPageVersionHistory(pageId) {
+    const allVersions = [];
+    let start = 0;
+    const limit = 50;
+    while (true) {
+      const response = await this.request(
+        `/wiki/rest/api/content/${pageId}/version?start=${start}&limit=${limit}`
+      );
+      allVersions.push(...response.results);
+      if (response.size < limit) break;
+      start += limit;
+    }
+    return allVersions;
+  }
+  /**
+   * Filter pages to only those where the user made contributions within the date range.
+   * Fetches version history per page and checks if the user has versions in range.
+   */
+  async filterPagesByUserContribution(pages, userIdentifier, sinceDate) {
+    const results = [];
+    for (let i = 0; i < pages.length; i++) {
+      const page = pages[i];
+      if (i > 0) {
+        await new Promise((resolve) => globalThis.setTimeout(resolve, 100));
+      }
+      try {
+        const versions = await this.getPageVersionHistory(page.id);
+        const userVersions = versions.filter(
+          (v) => this.isMatchingUser(v.by, userIdentifier) && new Date(v.when) >= sinceDate
+        );
+        const userCommentsInRange = page.children?.comment?.results?.filter(
+          (comment) => this.isMatchingUser(comment.version?.by || {}, userIdentifier) && new Date(comment.version?.when || 0) >= sinceDate
+        ) || [];
+        if (userVersions.length > 0 || userCommentsInRange.length > 0) {
+          results.push({ page, userVersions });
+        } else {
+          logger.debug(`Excluding page "${page.title}" - no user contributions in date range`);
+        }
+      } catch (error) {
+        logger.debug(`Skipping version history for page ${page.id}: ${error}`);
+      }
+    }
+    return results;
+  }
   /**
    * Build CQL query from options
    * Returns empty string if no filters need CQL (will use simple endpoint instead)
@@ -4129,28 +4217,31 @@ 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, userEmail, userVersions) {
+    const createdByUser = page.history?.createdBy ? this.isMatchingUser(page.history.createdBy, userEmail) : false;
+    if (createdByUser) {
       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 hasEdits = userVersions ? userVersions.some((v) => !v.minorEdit || v.number > 1) : page.version?.by ? this.isMatchingUser(page.version.by, userEmail) && (page.version?.number || 0) > 1 : false;
     const userComments = page.children?.comment?.results?.filter(
-      (comment) => comment.version?.by?.email === userEmail
+      (comment) => comment.version?.by ? this.isMatchingUser(comment.version.by, userEmail) : false
     ) || [];
     const hasComments = userComments.length > 0;
     if (hasEdits && hasComments) {
+      const editCount = userVersions?.length || 1;
       return {
         type: "edited",
-        details: `Edited page (v${page.version?.number || 1}) and added ${userComments.length} comment${userComments.length > 1 ? "s" : ""}`
+        details: `Edited page (${editCount} edit${editCount > 1 ? "s" : ""}) and added ${userComments.length} comment${userComments.length > 1 ? "s" : ""}`
       };
     }
     if (hasEdits) {
+      const editCount = userVersions?.length || 1;
       return {
         type: "edited",
-        details: `Edited page to version ${page.version?.number || 1}`
+        details: `Edited page (${editCount} edit${editCount > 1 ? "s" : ""})`
       };
     }
     if (hasComments) {
@@ -4248,14 +4339,7 @@ var ConfluenceService = class {
           break;
         }
         if (options.limit && allPages.length >= options.limit) {
-          const email2 = await this.getCurrentUser();
-          const limitedPages = allPages.slice(0, options.limit);
-          const commits2 = [];
-          for (const page of limitedPages) {
-            const commit = await this.transformPageToCommit(page, void 0, email2 || void 0);
-            commits2.push(commit);
-          }
-          return commits2;
+          break;
         }
         start += limit;
       } catch (error) {
@@ -4279,9 +4363,23 @@ var ConfluenceService = class {
         throw error;
       }
     }
+    const pagesToProcess = options.limit ? allPages.slice(0, options.limit) : allPages;
     const email = await this.getCurrentUser();
+    const sinceDate = options.days ? new Date(Date.now() - options.days * 24 * 60 * 60 * 1e3) : void 0;
+    if (sinceDate && email) {
+      const filtered = await this.filterPagesByUserContribution(pagesToProcess, email, sinceDate);
+      logger.debug(
+        `Date-scoped filtering: ${pagesToProcess.length} pages -> ${filtered.length} with user contributions in range`
+      );
+      const commits2 = [];
+      for (const { page, userVersions } of filtered) {
+        const commit = await this.transformPageToCommit(page, void 0, email, userVersions);
+        commits2.push(commit);
+      }
+      return commits2;
+    }
     const commits = [];
-    for (const page of allPages) {
+    for (const page of pagesToProcess) {
       const commit = await this.transformPageToCommit(page, void 0, email || void 0);
       commits.push(commit);
     }
@@ -4303,10 +4401,10 @@ var ConfluenceService = class {
   /**
    * Transform Confluence page to GitCommit format with contribution-specific data
    */
-  async transformPageToCommit(page, instanceUrl, userEmail) {
+  async transformPageToCommit(page, instanceUrl, userEmail, userVersions) {
     let contribution = null;
     if (userEmail) {
-      contribution = await this.determineContributionType(page, userEmail);
+      contribution = await this.determineContributionType(page, userEmail, userVersions);
     }
     let message;
     let contributionPrefix = "";
@@ -4344,7 +4442,14 @@ ${contribution.details}
     const impactScore = contribution ? this.calculateContributionImpact(contribution.type, baseSize) : baseSize;
     const author = page.history?.createdBy?.displayName || page.version?.by?.displayName || "Unknown Author";
     const authorEmail = page.history?.createdBy?.email || page.version?.by?.email || "unknown@example.com";
-    const date = contribution?.type === "created" ? page.history?.createdDate || page.version?.when : page.version?.when || (/* @__PURE__ */ new Date()).toISOString();
+    let date;
+    if (contribution?.type === "created") {
+      date = page.history?.createdDate || page.version?.when;
+    } else if (userVersions && userVersions.length > 0) {
+      date = userVersions[userVersions.length - 1].when;
+    } else {
+      date = page.version?.when || (/* @__PURE__ */ new Date()).toISOString();
+    }
     return {
       sha: page.id,
       message,
@@ -5917,9 +6022,17 @@ async function syncAllAuthenticatedServices(options) {
     );
     for (const result of successful) {
       const serviceLabel = result.service.charAt(0).toUpperCase() + result.service.slice(1);
-      logger.info(
-        `  \u2022 ${serviceLabel}: ${result.created} brag${result.created !== 1 ? "s" : ""} created${result.skipped > 0 ? `, ${result.skipped} skipped` : ""}`
-      );
+      if (result.created === 0 && result.skipped > 0) {
+        logger.info(
+          `  \u2022 ${serviceLabel}: ${colors.dim(`All ${result.skipped} item${result.skipped !== 1 ? "s" : ""} already synced`)}`
+        );
+      } else if (result.created === 0 && result.skipped === 0) {
+        logger.info(`  \u2022 ${serviceLabel}: ${colors.dim("No items found")}`);
+      } else {
+        logger.info(
+          `  \u2022 ${serviceLabel}: ${result.created} brag${result.created !== 1 ? "s" : ""} created${result.skipped > 0 ? `, ${result.skipped} skipped` : ""}`
+        );
+      }
     }
     logger.log("");
   }