@bragduck/cli 2.10.3 → 2.13.0

package/dist/bin/bragduck.js

@@ -3381,17 +3381,23 @@ var JiraService = class {
     const queries = [];
     if (options.days) {
       queries.push(
-        `(created >= -${options.days}d OR resolved >= -${options.days}d OR updated >= -${options.days}d)`
+        `(created >= -${options.days}d OR resolutiondate >= -${options.days}d OR updated >= -${options.days}d)`
       );
     }
     if (options.author) {
       if (options.author.includes("@")) {
-        queries.push("(creator = currentUser() OR assignee = currentUser())");
+        queries.push(
+          "(creator = currentUser() OR reporter = currentUser() OR assignee = currentUser())"
+        );
       } else {
-        queries.push(`(creator = "${options.author}" OR assignee = "${options.author}")`);
+        queries.push(
+          `(creator = "${options.author}" OR reporter = "${options.author}" OR assignee = "${options.author}")`
+        );
       }
     } else {
-      queries.push("(creator = currentUser() OR assignee = currentUser())");
+      queries.push(
+        "(creator = currentUser() OR reporter = currentUser() OR assignee = currentUser())"
+      );
     }
     if (options.jql) {
       queries.push(`(${options.jql})`);
@@ -3411,6 +3417,62 @@ var JiraService = class {
     };
     return typeScores[issue.fields.issuetype.name] || 100;
   }
+  /**
+   * 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;
+    if (isCreator) {
+      return {
+        type: "created",
+        details: `Created ${issue.fields.issuetype.name}: ${issue.fields.status.name}`
+      };
+    }
+    if (isReporter && !isCreator) {
+      return {
+        type: "reported",
+        details: `Reported ${issue.fields.issuetype.name}: ${issue.fields.status.name}`
+      };
+    }
+    const isAssigned = issue.fields.assignee?.emailAddress === userEmail;
+    const isResolved = issue.fields.resolutiondate !== null && issue.fields.resolutiondate !== void 0;
+    const userEdits = issue.changelog?.histories?.filter((history) => history.author.emailAddress === userEmail) || [];
+    const hasEdits = userEdits.length > 0;
+    if (isAssigned && isResolved) {
+      return {
+        type: "assigned-resolved",
+        details: `Assigned and resolved ${issue.fields.issuetype.name}${hasEdits ? ` with ${userEdits.length} update${userEdits.length > 1 ? "s" : ""}` : ""}`
+      };
+    }
+    if (hasEdits) {
+      return {
+        type: "edited",
+        details: `Updated ${issue.fields.issuetype.name} (${userEdits.length} change${userEdits.length > 1 ? "s" : ""})`
+      };
+    }
+    return {
+      type: "edited",
+      details: `Contributed to ${issue.fields.issuetype.name}`
+    };
+  }
+  /**
+   * Calculate impact score based on contribution type
+   */
+  calculateJiraContributionImpact(contributionType, baseComplexity) {
+    const multipliers = {
+      created: 1,
+      // 100% - highest impact (created the issue)
+      reported: 0.9,
+      // 90% - very high impact (reported/initiated the issue)
+      "assigned-resolved": 0.8,
+      // 80% - high impact (owned and resolved)
+      edited: 0.4
+      // 40% - medium impact (contributed updates)
+    };
+    return Math.ceil(baseComplexity * multipliers[contributionType]);
+  }
   /**
    * Fetch issues with optional filtering
    */
@@ -3424,6 +3486,8 @@ var JiraService = class {
       "updated",
       "resolutiondate",
       "creator",
+      "reporter",
+      "assignee",
       "status",
       "issuetype"
     ];
@@ -3441,7 +3505,7 @@ var JiraService = class {
         );
         break;
       }
-      const endpoint = `/rest/api/2/search?jql=${encodeURIComponent(jql)}&startAt=${startAt}&maxResults=${maxResults}&fields=${fields.join(",")}`;
+      const endpoint = `/rest/api/2/search?jql=${encodeURIComponent(jql)}&startAt=${startAt}&maxResults=${maxResults}&fields=${fields.join(",")}&expand=changelog`;
       try {
         const response = await this.request(endpoint);
         if (response.issues.length === 0) {
@@ -3467,7 +3531,14 @@ var JiraService = class {
           break;
         }
         if (options.limit && allIssues.length >= options.limit) {
-          return allIssues.slice(0, options.limit).map((issue) => this.transformIssueToCommit(issue));
+          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);
+            commits2.push(commit);
+          }
+          return commits2;
         }
         startAt += maxResults;
       } catch (error) {
@@ -3491,7 +3562,13 @@ var JiraService = class {
         throw error;
       }
     }
-    return allIssues.map((issue) => this.transformIssueToCommit(issue));
+    const email = await this.getCurrentUser();
+    const commits = [];
+    for (const issue of allIssues) {
+      const commit = await this.transformIssueToCommit(issue, void 0, email);
+      commits.push(commit);
+    }
+    return commits;
   }
   /**
    * Fetch issues for the current authenticated user
@@ -3507,17 +3584,53 @@ var JiraService = class {
     });
   }
   /**
-   * Transform Jira issue to GitCommit format with external fields
+   * Transform Jira issue to GitCommit format with contribution-specific data
    */
-  transformIssueToCommit(issue, instanceUrl) {
-    let message = issue.fields.summary;
-    if (issue.fields.description) {
-      const truncatedDesc = issue.fields.description.substring(0, this.MAX_DESCRIPTION_LENGTH);
-      message = `${issue.fields.summary}
+  async transformIssueToCommit(issue, instanceUrl, userEmail) {
+    let contribution = null;
+    if (userEmail) {
+      contribution = await this.determineJiraContributionType(issue, userEmail);
+    }
+    let message;
+    let contributionPrefix = "";
+    if (contribution) {
+      if (contribution.type === "created") {
+        contributionPrefix = "\u{1F3AB} Created: ";
+      } else if (contribution.type === "reported") {
+        contributionPrefix = "\u{1F4CB} Reported: ";
+      } else if (contribution.type === "assigned-resolved") {
+        contributionPrefix = "\u2705 Resolved: ";
+      } else {
+        contributionPrefix = "\u270F\uFE0F Updated: ";
+      }
+      message = `${contributionPrefix}${issue.fields.summary}
+
+${contribution.details}`;
+      if (contribution.type === "created" && issue.fields.description) {
+        const truncatedDesc = issue.fields.description.substring(0, this.MAX_DESCRIPTION_LENGTH);
+        message = `${contributionPrefix}${issue.fields.summary}
+
+${truncatedDesc}
+
+${contribution.details}`;
+      }
+    } else {
+      message = issue.fields.summary;
+      if (issue.fields.description) {
+        const truncatedDesc = issue.fields.description.substring(0, this.MAX_DESCRIPTION_LENGTH);
+        message = `${issue.fields.summary}
 
 ${truncatedDesc}`;
+      }
+    }
+    let date;
+    if (contribution?.type === "created" || contribution?.type === "reported") {
+      date = issue.fields.created;
+    } else if (contribution?.type === "assigned-resolved" && issue.fields.resolutiondate) {
+      date = issue.fields.resolutiondate;
+    } else {
+      date = issue.fields.updated;
     }
-    const date = issue.fields.resolutiondate || issue.fields.updated;
     let baseUrl = "https://jira.atlassian.net";
     if (instanceUrl) {
       baseUrl = instanceUrl.startsWith("http") ? instanceUrl : `https://${instanceUrl}`;
@@ -3531,6 +3644,8 @@ ${truncatedDesc}`;
       }
     }
     const url = `${baseUrl}/browse/${issue.key}`;
+    const baseComplexity = this.estimateComplexity(issue);
+    const impactScore = contribution ? this.calculateJiraContributionImpact(contribution.type, baseComplexity) : baseComplexity;
     return {
       sha: issue.key,
       message,
@@ -3540,11 +3655,11 @@ ${truncatedDesc}`;
       url,
       diffStats: {
         filesChanged: 0,
-        insertions: this.estimateComplexity(issue),
+        insertions: impactScore,
         deletions: 0
       },
       externalId: issue.key,
-      externalType: "issue",
+      externalType: contribution?.type || "issue",
       externalSource: "jira",
       externalUrl: url
     };
@@ -3736,6 +3851,59 @@ var ConfluenceService = class {
     const content = page.body?.storage?.value || "";
     return Math.ceil(content.length / 80);
   }
+  /**
+   * 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) {
+      return {
+        type: "created",
+        details: `Created page with ${page.version.number} version${page.version.number > 1 ? "s" : ""}`
+      };
+    }
+    const hasEdits = page.version.by.email === userEmail && page.version.number > 1;
+    const userComments = page.children?.comment?.results?.filter(
+      (comment) => comment.version.by.email === userEmail
+    ) || [];
+    const hasComments = userComments.length > 0;
+    if (hasEdits && hasComments) {
+      return {
+        type: "edited",
+        details: `Edited page (v${page.version.number}) and added ${userComments.length} comment${userComments.length > 1 ? "s" : ""}`
+      };
+    }
+    if (hasEdits) {
+      return {
+        type: "edited",
+        details: `Edited page to version ${page.version.number}`
+      };
+    }
+    if (hasComments) {
+      return {
+        type: "commented",
+        details: `Added ${userComments.length} comment${userComments.length > 1 ? "s" : ""}`
+      };
+    }
+    return {
+      type: "edited",
+      details: "Contributed to page"
+    };
+  }
+  /**
+   * Calculate impact score based on contribution type
+   */
+  calculateContributionImpact(contributionType, baseSize) {
+    const multipliers = {
+      created: 1,
+      // 100% - highest impact
+      edited: 0.6,
+      // 60% - medium impact
+      commented: 0.3
+      // 30% - lowest impact
+    };
+    return Math.ceil(baseSize * multipliers[contributionType]);
+  }
   /**
    * Fetch pages with optional filtering
    */
@@ -3765,7 +3933,7 @@ var ConfluenceService = class {
           cql,
           start: start.toString(),
           limit: limit.toString(),
-          expand: "version,body.storage"
+          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}`;
@@ -3776,7 +3944,7 @@ var ConfluenceService = class {
           status: "current",
           start: start.toString(),
           limit: limit.toString(),
-          expand: "version,body.storage"
+          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}`;
@@ -3830,7 +3998,13 @@ var ConfluenceService = class {
         throw error;
       }
     }
-    return allPages.map((page) => this.transformPageToCommit(page));
+    const email = await this.getCurrentUser();
+    const commits = [];
+    for (const page of allPages) {
+      const commit = await this.transformPageToCommit(page, void 0, email);
+      commits.push(commit);
+    }
+    return commits;
   }
   /**
    * Fetch pages for the current authenticated user (created or contributed to)
@@ -3846,12 +4020,32 @@ var ConfluenceService = class {
     });
   }
   /**
-   * Transform Confluence page to GitCommit format with external fields
+   * Transform Confluence page to GitCommit format with contribution-specific data
    */
-  transformPageToCommit(page, instanceUrl) {
-    const message = `${page.title}
+  async transformPageToCommit(page, instanceUrl, userEmail) {
+    let contribution = null;
+    if (userEmail) {
+      contribution = await this.determineContributionType(page, userEmail);
+    }
+    let message;
+    let contributionPrefix = "";
+    if (contribution) {
+      if (contribution.type === "created") {
+        contributionPrefix = "\u{1F4DD} Created: ";
+      } else if (contribution.type === "edited") {
+        contributionPrefix = "\u270F\uFE0F Edited: ";
+      } else {
+        contributionPrefix = "\u{1F4AC} Commented on: ";
+      }
+      message = `${contributionPrefix}${page.title}
+
+${contribution.details}
+[Confluence Page v${page.version.number}]`;
+    } else {
+      message = `${page.title}
 
 [Confluence Page v${page.version.number}]`;
+    }
     let baseUrl = "https://confluence.atlassian.net";
     if (instanceUrl) {
       baseUrl = instanceUrl.startsWith("http") ? instanceUrl : `https://${instanceUrl}`;
@@ -3865,20 +4059,25 @@ var ConfluenceService = class {
       }
     }
     const url = `${baseUrl}/wiki${page._links.webui}`;
+    const baseSize = this.estimatePageSize(page);
+    const impactScore = contribution ? this.calculateContributionImpact(contribution.type, baseSize) : baseSize;
+    const author = page.history?.createdBy?.displayName || page.version.by.displayName;
+    const authorEmail = page.history?.createdBy?.email || page.version.by.email;
+    const date = contribution?.type === "created" ? page.history?.createdDate || page.version.when : page.version.when;
     return {
       sha: page.id,
       message,
-      author: page.version.by.displayName,
-      authorEmail: page.version.by.email,
-      date: page.version.when,
+      author,
+      authorEmail,
+      date,
       url,
       diffStats: {
         filesChanged: 1,
-        insertions: this.estimatePageSize(page),
+        insertions: impactScore,
         deletions: 0
       },
       externalId: page.id,
-      externalType: "page",
+      externalType: contribution?.type || "page",
       externalSource: "confluence",
       externalUrl: url
     };