@bragduck/cli 2.22.0 → 2.24.2

package/dist/bin/bragduck.js

@@ -1907,12 +1907,23 @@ var execAsync2 = promisify2(exec2);
 var GitHubService = class {
   MAX_BODY_LENGTH = 5e3;
   PR_SEARCH_FIELDS = "number,title,body,author,mergedAt,additions,deletions,changedFiles,url,labels";
+  /**
+   * Execute a gh CLI command with clean environment
+   * Unsets GITHUB_TOKEN and GH_TOKEN to prevent .envrc tokens from interfering
+   * with gh CLI's own authentication
+   */
+  async execGhCommand(command) {
+    const env = { ...process.env };
+    delete env.GITHUB_TOKEN;
+    delete env.GH_TOKEN;
+    return execAsync2(command, { env });
+  }
   /**
    * Check if GitHub CLI is installed and available
    */
   async checkGitHubCLI() {
     try {
-      await execAsync2("command gh --version");
+      await this.execGhCommand("command gh --version");
       return true;
     } catch {
       return false;
@@ -1934,7 +1945,7 @@ var GitHubService = class {
    */
   async checkAuthentication() {
     try {
-      await execAsync2("command gh auth status");
+      await this.execGhCommand("command gh auth status");
       return true;
     } catch {
       return false;
@@ -1971,7 +1982,7 @@ var GitHubService = class {
       await this.ensureGitHubCLI();
       await this.ensureAuthentication();
       await gitService.validateRepository();
-      const { stdout } = await execAsync2("command gh repo view --json url");
+      const { stdout } = await this.execGhCommand("command gh repo view --json url");
       const data = JSON.parse(stdout);
       if (!data.url) {
         throw new GitHubError("This repository is not hosted on GitHub", {
@@ -2003,7 +2014,7 @@ var GitHubService = class {
   async getRepositoryInfo() {
     try {
       await this.ensureGitHubCLI();
-      const { stdout } = await execAsync2(
+      const { stdout } = await this.execGhCommand(
         "command gh repo view --json owner,name,url,nameWithOwner"
       );
       const data = JSON.parse(stdout);
@@ -2028,7 +2039,7 @@ var GitHubService = class {
    */
   async getCurrentGitHubUser() {
     try {
-      const { stdout } = await execAsync2("command gh api user --jq .login");
+      const { stdout } = await this.execGhCommand("command gh api user --jq .login");
       return stdout.trim() || null;
     } catch {
       logger.debug("Failed to get GitHub user");
@@ -2054,7 +2065,7 @@ var GitHubService = class {
       const limitArg = limit ? `--limit ${limit}` : "";
       const command = `command gh pr list --state merged --json ${this.PR_SEARCH_FIELDS} --search "${searchQuery}" ${limitArg}`;
       logger.debug(`Running: ${command}`);
-      const { stdout } = await execAsync2(command);
+      const { stdout } = await this.execGhCommand(command);
       const prs = JSON.parse(stdout);
       logger.debug(`Found ${prs.length} merged PRs`);
       return prs;
@@ -4490,6 +4501,9 @@ import terminalLink from "terminal-link";
 init_esm_shims();
 var MONTHS = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
 function formatDate(dateString) {
+  if (!dateString || typeof dateString === "string" && dateString.trim() === "") {
+    return "No date";
+  }
   const date = typeof dateString === "string" ? new Date(dateString) : dateString;
   if (isNaN(date.getTime())) {
     return "Invalid date";
@@ -4916,6 +4930,8 @@ function failStepSpinner(spinner, currentStep, totalSteps, text) {
 
 // src/commands/sync.ts
 async function promptSelectService() {
+  const nonGitServices = ["atlassian", "jira", "confluence"];
+  const authenticatedServices = await storageService.getAuthenticatedServices();
   const allServices = [
     "github",
     "gitlab",
@@ -4924,22 +4940,26 @@ async function promptSelectService() {
     "jira",
     "confluence"
   ];
-  const authenticatedServices = await storageService.getAuthenticatedServices();
   const authenticatedSyncServices = authenticatedServices.filter(
     (service) => service !== "bragduck" && allServices.includes(service)
   );
-  const serviceChoices = await Promise.all(
-    allServices.map(async (service) => {
-      const isAuth = await storageService.isServiceAuthenticated(service);
-      const indicator = isAuth ? "\u2713" : "\u2717";
-      const serviceLabel = service.charAt(0).toUpperCase() + service.slice(1);
-      return {
-        name: `${indicator} ${serviceLabel}`,
-        value: service,
-        description: isAuth ? "Authenticated" : "Not authenticated"
-      };
-    })
-  );
+  const serviceChoices = [
+    {
+      name: "Git Contributions (current dir)",
+      value: "git",
+      description: "Sync from your local repository (GitHub, GitLab, or Bitbucket)"
+    }
+  ];
+  for (const service of nonGitServices) {
+    const isAuth = await storageService.isServiceAuthenticated(service);
+    const indicator = isAuth ? "\u2713" : "\u2717";
+    const serviceLabel = service.charAt(0).toUpperCase() + service.slice(1);
+    serviceChoices.push({
+      name: `${indicator} ${serviceLabel}`,
+      value: service,
+      description: isAuth ? "Authenticated" : "Not authenticated"
+    });
+  }
   if (authenticatedSyncServices.length > 0) {
     const serviceNames = authenticatedSyncServices.map((s) => s.charAt(0).toUpperCase() + s.slice(1)).join(", ");
     serviceChoices.push({
@@ -5146,7 +5166,7 @@ async function syncSingleService(sourceType, options, TOTAL_STEPS, sharedDays, s
         description: refined.refined_description,
         tags: refined.suggested_tags,
         repository: repoInfo.url,
-        date: originalCommit?.date || "",
+        date: originalCommit?.date || (/* @__PURE__ */ new Date()).toISOString(),
         commit_url: originalCommit?.url || "",
         impact_score: refined.suggested_impactLevel,
         impact_description: refined.impact_description,
@@ -5188,7 +5208,7 @@ async function syncSingleService(sourceType, options, TOTAL_STEPS, sharedDays, s
   }
   const createdBrags = createResponse.brags.map((brag) => ({
     title: brag.title,
-    date: brag.created_at,
+    date: brag.date,
     source: sourceType
   }));
   return { created: createResponse.created, skipped: duplicates.length, createdBrags };
@@ -5408,7 +5428,33 @@ async function syncCommand(options = {}) {
     } else {
       const detectionSpinner = createStepSpinner(1, TOTAL_STEPS, "Preparing sync");
       detectionSpinner.start();
-      sourceType = selectedSource;
+      if (selectedSource === "git") {
+        try {
+          const { detected } = await sourceDetector.detectSources();
+          const gitSource = detected.find(
+            (source) => ["github", "gitlab", "bitbucket", "atlassian"].includes(source.type)
+          );
+          if (!gitSource) {
+            failStepSpinner(detectionSpinner, 1, TOTAL_STEPS, "Not a git repository");
+            logger.log("");
+            logger.error("No git repository detected in current directory");
+            logger.log("");
+            logger.info("Navigate to a git repository or select a different service");
+            return;
+          }
+          sourceType = gitSource.type;
+          logger.debug(`Detected git service: ${sourceType}`);
+        } catch (error) {
+          logger.debug(`Git detection error: ${error}`);
+          failStepSpinner(detectionSpinner, 1, TOTAL_STEPS, "Failed to detect git service");
+          logger.log("");
+          logger.error("Could not detect git repository");
+          logger.log("");
+          return;
+        }
+      } else {
+        sourceType = selectedSource;
+      }
       if (sourceType === "jira" || sourceType === "confluence") {
         const creds = await storageService.getServiceCredentials(sourceType);
         const envInstance = loadEnvConfig()[`${sourceType}Instance`];