@link-assistant/hive-mind 0.51.6 → 0.51.9

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @link-assistant/hive-mind
 
+## 0.51.9
+
+### Patch Changes
+
+- de72c12: fix: ensure log attachment works when PR is merged during session
+
+  Fixes issue where log files would not be attached to pull requests when the PR was merged during the AI solving session. The `gh pr list` command only returns OPEN PRs by default, causing merged PRs to not be found. Added `--state all` flag to find PRs regardless of their state (OPEN, MERGED, or CLOSED), and added handling to skip operations that don't work on merged PRs (like `gh pr edit` and `gh pr ready`) while still allowing log attachment.
+
+## 0.51.7
+
+### Patch Changes
+
+- b7c7a2c: feat: add GitHub API rate limits to /limits command
+
+  Adds GitHub API core rate limit information to the Telegram bot's /limits command output, allowing users to monitor GitHub API usage alongside Claude usage limits and disk space. This helps plan issue execution when GitHub API limits are approaching.
+
 ## 0.51.6
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-assistant/hive-mind",
-  "version": "0.51.6",
+  "version": "0.51.9",
   "description": "AI-powered issue solver and hive mind for collaborative problem solving",
   "main": "src/hive.mjs",
   "type": "module",

package/src/claude-limits.lib.mjs

@@ -147,6 +147,83 @@ function formatBytes(bytes) {
   return `${value.toFixed(decimals)} ${sizes[i]}`;
 }
 
+/**
+ * Get GitHub API rate limits by calling gh api rate_limit
+ * Returns rate limit info for core, search, graphql, and other resources
+ *
+ * @param {boolean} verbose - Whether to log verbose output
+ * @returns {Object} Object with success boolean, and either rate limit data or error message
+ */
+export async function getGitHubRateLimits(verbose = false) {
+  try {
+    const { stdout } = await execAsync('gh api rate_limit 2>/dev/null');
+    const data = JSON.parse(stdout);
+
+    if (verbose) {
+      console.log('[VERBOSE] /limits GitHub rate limit response:', JSON.stringify(data, null, 2));
+    }
+
+    // Extract the core rate limit (most important for general API usage)
+    const core = data.resources?.core;
+    if (!core) {
+      return {
+        success: false,
+        error: 'Could not parse GitHub rate limit response',
+      };
+    }
+
+    // Calculate remaining percentage
+    const usedPercentage = core.limit > 0 ? Math.round((core.used / core.limit) * 100) : 0;
+    const remainingPercentage = 100 - usedPercentage;
+
+    // Format reset time from Unix timestamp
+    const resetDate = new Date(core.reset * 1000);
+    const resetTimeFormatted = formatResetTime(resetDate.toISOString());
+
+    // Calculate relative time until reset
+    const now = new Date();
+    const diffMs = resetDate - now;
+    let relativeReset = null;
+    if (diffMs > 0) {
+      const totalMinutes = Math.floor(diffMs / (1000 * 60));
+      const hours = Math.floor(totalMinutes / 60);
+      const minutes = totalMinutes % 60;
+      if (hours > 0) {
+        relativeReset = `${hours}h ${minutes}m`;
+      } else {
+        relativeReset = `${minutes}m`;
+      }
+    }
+
+    if (verbose) {
+      console.log(`[VERBOSE] /limits GitHub API: ${core.remaining}/${core.limit} remaining (${remainingPercentage}% available)`);
+    }
+
+    return {
+      success: true,
+      githubRateLimit: {
+        limit: core.limit,
+        used: core.used,
+        remaining: core.remaining,
+        usedPercentage,
+        remainingPercentage,
+        resetTimestamp: core.reset,
+        resetTime: resetTimeFormatted,
+        relativeReset,
+        resetsAt: resetDate.toISOString(),
+      },
+    };
+  } catch (error) {
+    if (verbose) {
+      console.error('[VERBOSE] /limits GitHub rate limit error:', error);
+    }
+    return {
+      success: false,
+      error: `Failed to get GitHub rate limits: ${error.message}`,
+    };
+  }
+}
+
 /**
  * Get disk space information for the current filesystem
  * Returns total, used, available space and usage percentage
@@ -385,9 +462,10 @@ export function calculateTimePassedPercentage(resetsAt, periodHours) {
  * Format Claude usage data into a Telegram-friendly message
  * @param {Object} usage - The usage object from getClaudeUsageLimits
  * @param {Object} diskSpace - Optional disk space info from getDiskSpaceInfo
+ * @param {Object} githubRateLimit - Optional GitHub rate limit info from getGitHubRateLimits
  * @returns {string} Formatted message
  */
-export function formatUsageMessage(usage, diskSpace = null) {
+export function formatUsageMessage(usage, diskSpace = null, githubRateLimit = null) {
   // Use code block for monospace font to align progress bars properly
   let message = '```\n';
 
@@ -397,10 +475,25 @@ export function formatUsageMessage(usage, diskSpace = null) {
   // Disk space section (if provided)
   if (diskSpace) {
     message += 'Disk space\n';
-    // Show free percentage with progress bar (inverted - showing free space)
-    const freeBar = getProgressBar(diskSpace.freePercentage);
-    message += `${freeBar} ${diskSpace.freePercentage}% free\n`;
-    message += `${diskSpace.availableFormatted} free of ${diskSpace.totalFormatted}\n\n`;
+    // Show used percentage with progress bar
+    const usedBar = getProgressBar(diskSpace.usedPercentage);
+    message += `${usedBar} ${diskSpace.usedPercentage}% used\n`;
+    message += `${diskSpace.usedFormatted} used of ${diskSpace.totalFormatted}\n\n`;
+  }
+
+  // GitHub API rate limits section (if provided)
+  if (githubRateLimit) {
+    message += 'GitHub API\n';
+    // Show used percentage with progress bar
+    const usedBar = getProgressBar(githubRateLimit.usedPercentage);
+    message += `${usedBar} ${githubRateLimit.usedPercentage}% used\n`;
+    message += `${githubRateLimit.used}/${githubRateLimit.limit} requests used\n`;
+    if (githubRateLimit.relativeReset) {
+      message += `Resets in ${githubRateLimit.relativeReset} (${githubRateLimit.resetTime})\n`;
+    } else if (githubRateLimit.resetTime) {
+      message += `Resets ${githubRateLimit.resetTime}\n`;
+    }
+    message += '\n';
   }
 
   // Current session (five_hour)
@@ -493,6 +586,7 @@ export function formatUsageMessage(usage, diskSpace = null) {
 export default {
   getClaudeUsageLimits,
   getDiskSpaceInfo,
+  getGitHubRateLimits,
   getProgressBar,
   calculateTimePassedPercentage,
   formatUsageMessage,

package/src/solve.results.lib.mjs

@@ -417,7 +417,9 @@ export const verifyResults = async (owner, repo, branchName, issueNumber, prNumb
     await log('\n🔍 Checking for pull requests from branch ' + branchName + '...');
 
     // First, get all PRs from our branch
-    const allBranchPrsResult = await $`gh pr list --repo ${owner}/${repo} --head ${branchName} --json number,url,createdAt,headRefName,title,state,updatedAt,isDraft`;
+    // IMPORTANT: Use --state all to find PRs that may have been merged during the session (Issue #1008)
+    // Without --state all, gh pr list only returns OPEN PRs, missing merged ones
+    const allBranchPrsResult = await $`gh pr list --repo ${owner}/${repo} --head ${branchName} --state all --json number,url,createdAt,headRefName,title,state,updatedAt,isDraft`;
 
     if (allBranchPrsResult.code !== 0) {
       await log('  ⚠️  Failed to check pull requests');
@@ -438,63 +440,72 @@ export const verifyResults = async (owner, repo, branchName, issueNumber, prNumb
       if (isPrFromSession) {
         await log(`  ✅ Found pull request #${pr.number}: "${pr.title}"`);
 
-        // Check if PR body has proper issue linking keywords
-        const prBodyResult = await $`gh pr view ${pr.number} --repo ${owner}/${repo} --json body --jq .body`;
-        if (prBodyResult.code === 0) {
-          const prBody = prBodyResult.stdout.toString();
-          const issueRef = argv.fork ? `${owner}/${repo}#${issueNumber}` : `#${issueNumber}`;
-
-          // Use the new GitHub linking detection library to check for valid keywords
-          // This ensures we only detect actual GitHub-recognized linking keywords
-          // (fixes, closes, resolves and their variants) in proper format
-          // See: https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue
-          const hasLinkingKeyword = hasGitHubLinkingKeyword(prBody, issueNumber, argv.fork ? owner : null, argv.fork ? repo : null);
-
-          if (!hasLinkingKeyword) {
-            await log(`  📝 Updating PR body to link issue #${issueNumber}...`);
-
-            // Add proper issue reference to the PR body
-            const linkingText = `\n\nFixes ${issueRef}`;
-            const updatedBody = prBody + linkingText;
-
-            // Use --body-file instead of --body to avoid command-line length limits
-            // and special character escaping issues that can cause hangs/timeouts
-            const fs = (await use('fs')).promises;
-            const tempBodyFile = `/tmp/pr-body-update-${pr.number}-${Date.now()}.md`;
-            await fs.writeFile(tempBodyFile, updatedBody);
-
-            try {
-              const updateResult = await $`gh pr edit ${pr.number} --repo ${owner}/${repo} --body-file "${tempBodyFile}"`;
-
-              // Clean up temp file
-              await fs.unlink(tempBodyFile).catch(() => {});
+        // Check if PR was merged during the session (Issue #1008)
+        const isPrMerged = pr.state === 'MERGED';
+        if (isPrMerged) {
+          await log(`  ℹ️  PR #${pr.number} was merged during the session`);
+        }
 
-              if (updateResult.code === 0) {
-                await log(`  ✅ Updated PR body to include "Fixes ${issueRef}"`);
-              } else {
-                await log(`  ⚠️  Could not update PR body: ${updateResult.stderr ? updateResult.stderr.toString().trim() : 'Unknown error'}`);
+        // Skip PR body update and ready conversion for merged PRs (they can't be edited)
+        if (!isPrMerged) {
+          // Check if PR body has proper issue linking keywords
+          const prBodyResult = await $`gh pr view ${pr.number} --repo ${owner}/${repo} --json body --jq .body`;
+          if (prBodyResult.code === 0) {
+            const prBody = prBodyResult.stdout.toString();
+            const issueRef = argv.fork ? `${owner}/${repo}#${issueNumber}` : `#${issueNumber}`;
+
+            // Use the new GitHub linking detection library to check for valid keywords
+            // This ensures we only detect actual GitHub-recognized linking keywords
+            // (fixes, closes, resolves and their variants) in proper format
+            // See: https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue
+            const hasLinkingKeyword = hasGitHubLinkingKeyword(prBody, issueNumber, argv.fork ? owner : null, argv.fork ? repo : null);
+
+            if (!hasLinkingKeyword) {
+              await log(`  📝 Updating PR body to link issue #${issueNumber}...`);
+
+              // Add proper issue reference to the PR body
+              const linkingText = `\n\nFixes ${issueRef}`;
+              const updatedBody = prBody + linkingText;
+
+              // Use --body-file instead of --body to avoid command-line length limits
+              // and special character escaping issues that can cause hangs/timeouts
+              const fs = (await use('fs')).promises;
+              const tempBodyFile = `/tmp/pr-body-update-${pr.number}-${Date.now()}.md`;
+              await fs.writeFile(tempBodyFile, updatedBody);
+
+              try {
+                const updateResult = await $`gh pr edit ${pr.number} --repo ${owner}/${repo} --body-file "${tempBodyFile}"`;
+
+                // Clean up temp file
+                await fs.unlink(tempBodyFile).catch(() => {});
+
+                if (updateResult.code === 0) {
+                  await log(`  ✅ Updated PR body to include "Fixes ${issueRef}"`);
+                } else {
+                  await log(`  ⚠️  Could not update PR body: ${updateResult.stderr ? updateResult.stderr.toString().trim() : 'Unknown error'}`);
+                }
+              } catch (updateError) {
+                // Clean up temp file on error
+                await fs.unlink(tempBodyFile).catch(() => {});
+                throw updateError;
               }
-            } catch (updateError) {
-              // Clean up temp file on error
-              await fs.unlink(tempBodyFile).catch(() => {});
-              throw updateError;
+            } else {
+              await log('  ✅ PR body already contains issue reference');
             }
-          } else {
-            await log('  ✅ PR body already contains issue reference');
           }
-        }
 
-        // Check if PR is ready for review (convert from draft if necessary)
-        if (pr.isDraft) {
-          await log('  🔄 Converting PR from draft to ready for review...');
-          const readyResult = await $`gh pr ready ${pr.number} --repo ${owner}/${repo}`;
-          if (readyResult.code === 0) {
-            await log('  ✅ PR converted to ready for review');
+          // Check if PR is ready for review (convert from draft if necessary)
+          if (pr.isDraft) {
+            await log('  🔄 Converting PR from draft to ready for review...');
+            const readyResult = await $`gh pr ready ${pr.number} --repo ${owner}/${repo}`;
+            if (readyResult.code === 0) {
+              await log('  ✅ PR converted to ready for review');
+            } else {
+              await log(`  ⚠️  Could not convert PR to ready (${readyResult.stderr ? readyResult.stderr.toString().trim() : 'unknown error'})`);
+            }
           } else {
-            await log(`  ⚠️  Could not convert PR to ready (${readyResult.stderr ? readyResult.stderr.toString().trim() : 'unknown error'})`);
+            await log('  ✅ PR is already ready for review', { verbose: true });
           }
-        } else {
-          await log('  ✅ PR is already ready for review', { verbose: true });
         }
 
         // Upload log file to PR if requested

package/src/telegram-bot.mjs

@@ -45,7 +45,7 @@ const { parseGitHubUrl } = await import('./github.lib.mjs');
 const { validateModelName } = await import('./model-validation.lib.mjs');
 
 // Import Claude limits library for /limits command
-const { getClaudeUsageLimits, getDiskSpaceInfo, formatUsageMessage } = await import('./claude-limits.lib.mjs');
+const { getClaudeUsageLimits, getDiskSpaceInfo, getGitHubRateLimits, formatUsageMessage } = await import('./claude-limits.lib.mjs');
 
 // Import version info library for /version command
 const { getVersionInfo, formatVersionMessage } = await import('./version-info.lib.mjs');
@@ -848,8 +848,8 @@ bot.command('limits', async ctx => {
     reply_to_message_id: ctx.message.message_id,
   });
 
-  // Get the usage limits and disk space info in parallel
-  const [result, diskSpaceResult] = await Promise.all([getClaudeUsageLimits(VERBOSE), getDiskSpaceInfo(VERBOSE)]);
+  // Get the usage limits, disk space info, and GitHub rate limits in parallel
+  const [result, diskSpaceResult, githubLimitsResult] = await Promise.all([getClaudeUsageLimits(VERBOSE), getDiskSpaceInfo(VERBOSE), getGitHubRateLimits(VERBOSE)]);
 
   if (!result.success) {
     // Edit the fetching message to show the error
@@ -859,10 +859,8 @@ bot.command('limits', async ctx => {
     return;
   }
 
-  // Format and edit the fetching message with the results
-  // Pass disk space info if available (non-critical if it fails)
-  const diskSpace = diskSpaceResult.success ? diskSpaceResult.diskSpace : null;
-  const message = '📊 *Usage Limits*\n\n' + formatUsageMessage(result.usage, diskSpace);
+  // Format and edit the fetching message with the results (pass disk space and GitHub limits if available)
+  const message = '📊 *Usage Limits*\n\n' + formatUsageMessage(result.usage, diskSpaceResult.success ? diskSpaceResult.diskSpace : null, githubLimitsResult.success ? githubLimitsResult.githubRateLimit : null);
   await ctx.telegram.editMessageText(fetchingMessage.chat.id, fetchingMessage.message_id, undefined, message, {
     parse_mode: 'Markdown',
   });