@link-assistant/hive-mind 1.50.12 → 1.50.13

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @link-assistant/hive-mind
 
+## 1.50.13
+
+### Patch Changes
+
+- 3eb1428: Preserve GitHub issue-closing links after temporary auto-restart sessions edit pull request descriptions.
+
 ## 1.50.12
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-assistant/hive-mind",
-  "version": "1.50.12",
+  "version": "1.50.13",
   "description": "AI-powered issue solver and hive mind for collaborative problem solving",
   "main": "src/hive.mjs",
   "type": "module",
@@ -13,7 +13,7 @@
     "hive-telegram-bot": "./src/telegram-bot.mjs"
   },
   "scripts": {
-    "test": "node tests/solve-queue.test.mjs && node tests/limits-display.test.mjs && node tests/test-usage-limit.mjs && node tests/test-telegram-message-filters.mjs && node tests/test-solve-queue-command.mjs && node tests/test-queue-display-1267.mjs && node tests/test-telegram-bot-launcher.mjs",
+    "test": "node tests/solve-queue.test.mjs && node tests/limits-display.test.mjs && node tests/test-usage-limit.mjs && node tests/test-issue-1616-pr-issue-link-preservation.mjs && node tests/test-telegram-message-filters.mjs && node tests/test-solve-queue-command.mjs && node tests/test-queue-display-1267.mjs && node tests/test-telegram-bot-launcher.mjs",
     "test:queue": "node tests/solve-queue.test.mjs",
     "test:limits-display": "node tests/limits-display.test.mjs",
     "test:usage-limit": "node tests/test-usage-limit.mjs",

package/src/pr-issue-linking.lib.mjs

@@ -0,0 +1,91 @@
+#!/usr/bin/env node
+
+/**
+ * Helpers for preserving GitHub issue-closing links in pull request bodies.
+ */
+
+import { hasGitHubLinkingKeyword } from './github-linking.lib.mjs';
+
+/**
+ * Build the issue reference text to use in a GitHub closing keyword.
+ *
+ * @param {Object} options
+ * @param {string|number} options.issueNumber
+ * @param {string|null} [options.owner]
+ * @param {string|null} [options.repo]
+ * @param {boolean} [options.fork]
+ * @returns {string}
+ */
+export function buildIssueReference({ issueNumber, owner = null, repo = null, fork = false } = {}) {
+  if (!issueNumber) {
+    return '';
+  }
+
+  if (fork && owner && repo) {
+    return `${owner}/${repo}#${issueNumber}`;
+  }
+
+  return `#${issueNumber}`;
+}
+
+/**
+ * Ensure a pull request body has a GitHub-recognized closing keyword for the issue.
+ *
+ * @param {string|null|undefined} prBody
+ * @param {Object} options
+ * @param {string|number} options.issueNumber
+ * @param {string|null} [options.owner]
+ * @param {string|null} [options.repo]
+ * @param {boolean} [options.fork]
+ * @returns {{body: string, updated: boolean, issueRef: string}}
+ */
+export function ensureIssueLinkInPullRequestBody(prBody, { issueNumber, owner = null, repo = null, fork = false } = {}) {
+  const body = prBody ?? '';
+  const issueRef = buildIssueReference({ issueNumber, owner, repo, fork });
+
+  if (!issueNumber) {
+    return { body, updated: false, issueRef };
+  }
+
+  const hasLinkingKeyword = hasGitHubLinkingKeyword(body, issueNumber, owner, repo);
+  if (hasLinkingKeyword) {
+    return { body, updated: false, issueRef };
+  }
+
+  const separator = body.length > 0 ? '\n\n' : '';
+  return {
+    body: `${body}${separator}Fixes ${issueRef}`,
+    updated: true,
+    issueRef,
+  };
+}
+
+/**
+ * Parse GraphQL closingIssuesReferences stdout into issue number strings.
+ *
+ * @param {string|Buffer|null|undefined} output
+ * @returns {string[]}
+ */
+export function parseClosingIssueNumbers(output) {
+  return String(output ?? '')
+    .trim()
+    .split('\n')
+    .map(value => value.trim())
+    .filter(Boolean);
+}
+
+/**
+ * Check whether parsed closing issue numbers contain the requested issue number.
+ *
+ * @param {Array<string|number>} linkedIssues
+ * @param {string|number} issueNumber
+ * @returns {boolean}
+ */
+export function closingIssueNumbersContain(linkedIssues, issueNumber) {
+  if (!issueNumber || !Array.isArray(linkedIssues)) {
+    return false;
+  }
+
+  const expectedIssueNumber = String(issueNumber);
+  return linkedIssues.map(value => String(value).trim()).includes(expectedIssueNumber);
+}

package/src/solve.auto-pr.lib.mjs

@@ -3,6 +3,8 @@
  * Handles automatic creation of draft pull requests with initial commits
  */
 
+import { closingIssueNumbersContain, parseClosingIssueNumbers } from './pr-issue-linking.lib.mjs';
+
 export async function handleAutoPrCreation({ argv, tempDir, branchName, issueNumber, owner, repo, defaultBranch, forkedRepo, isContinueMode, prNumber, log, formatAligned, $, reportError, path, fs }) {
   // Skip auto-PR creation if:
   // 1. Auto-PR creation is disabled AND we're not in continue mode with no PR
@@ -1329,12 +1331,8 @@ ${prBody}`,
                 const linkCheckResult = await $`gh api graphql -f query='query { repository(owner: "${owner}", name: "${repo}") { pullRequest(number: ${localPrNumber}) { closingIssuesReferences(first: 10) { nodes { number } } } } }' --jq '.data.repository.pullRequest.closingIssuesReferences.nodes[].number'`;
 
                 if (linkCheckResult.code === 0) {
-                  const linkedIssues = linkCheckResult.stdout
-                    .toString()
-                    .trim()
-                    .split('\n')
-                    .filter(n => n);
-                  if (linkedIssues.includes(issueNumber)) {
+                  const linkedIssues = parseClosingIssueNumbers(linkCheckResult.stdout);
+                  if (closingIssueNumbersContain(linkedIssues, issueNumber)) {
                     await log(formatAligned('✅', 'Link verified:', `Issue #${issueNumber} → PR #${localPrNumber}`));
                   } else {
                     // This is a problem - the link wasn't created

package/src/solve.mjs

@@ -29,7 +29,7 @@ const { processAutoContinueForIssue } = autoContinue;
 const repository = await import('./solve.repository.lib.mjs');
 const { setupTempDirectory, cleanupTempDirectory } = repository;
 const results = await import('./solve.results.lib.mjs');
-const { cleanupClaudeFile, showSessionSummary, verifyResults, buildClaudeResumeCommand, buildSolveResumeCommand, checkForAiCreatedComments, attachSolutionSummary } = results;
+const { cleanupClaudeFile, showSessionSummary, verifyResults, buildClaudeResumeCommand, buildSolveResumeCommand, checkForAiCreatedComments, attachSolutionSummary, verifyPullRequestIssueLinkAfterAutoRestart } = results;
 const claudeLib = await import('./claude.lib.mjs');
 const { executeClaude, checkPlaywrightMcpAvailability } = claudeLib;
 
@@ -1358,6 +1358,8 @@ try {
       await log(`   cd ${tempDir} && git push origin ${branchName}`, { level: 'error' });
     }
 
+    await verifyPullRequestIssueLinkAfterAutoRestart({ prNumber, issueNumber, owner, repo, argv, cleanErrorMessage });
+
     // Attach updated logs to PR after auto-restart completes
     // Issue #1154: Skip if logs were already uploaded by verifyResults() to prevent duplicates
     // Issue #1290: Always upload if auto-restart ran but last iteration's logs weren't uploaded

package/src/solve.results.lib.mjs

@@ -78,9 +78,9 @@ export const buildSolveResumeCommand = ({ issueUrl, sessionId, tool = null, mode
 const sentryLib = await import('./sentry.lib.mjs');
 const { reportError } = sentryLib;
 
-// Import GitHub linking detection library
-const githubLinking = await import('./github-linking.lib.mjs');
-const { hasGitHubLinkingKeyword } = githubLinking;
+// Import pull request issue-link preservation helpers
+const prIssueLinking = await import('./pr-issue-linking.lib.mjs');
+const { buildIssueReference, ensureIssueLinkInPullRequestBody } = prIssueLinking;
 
 /**
  * Placeholder patterns used to detect auto-generated PR content that was not updated by the agent.
@@ -127,6 +127,83 @@ export const buildPRNotUpdatedHint = (titleNotUpdated, descriptionNotUpdated) =>
   return lines;
 };
 
+/**
+ * Ensure an existing pull request body contains a GitHub closing keyword for the issue.
+ *
+ * @param {Object} options
+ * @param {string|number} options.prNumber - Pull request number
+ * @param {string|number} options.issueNumber - Issue number to link
+ * @param {string} options.owner - Repository owner
+ * @param {string} options.repo - Repository name
+ * @param {Object} [options.argv] - Parsed CLI arguments
+ * @param {Function} [options.command] - command-stream tagged template
+ * @param {Function} [options.logger] - Logger function
+ * @returns {Promise<{checked: boolean, updated: boolean, body: string, issueRef: string, error?: string}>}
+ */
+export const ensurePullRequestIssueLink = async ({ prNumber, issueNumber, owner, repo, argv = {}, command = $, logger = log }) => {
+  if (!prNumber || !issueNumber || !owner || !repo) {
+    return { checked: false, updated: false, body: '', issueRef: buildIssueReference({ issueNumber, owner, repo, fork: argv.fork }), error: 'missing required pull request or issue data' };
+  }
+
+  let prBody = '';
+  const prBodyResult = await command`gh pr view ${prNumber} --repo ${owner}/${repo} --json body --jq .body`;
+  if (prBodyResult.code !== 0) {
+    const error = prBodyResult.stderr ? prBodyResult.stderr.toString().trim() : 'Unknown error';
+    await logger(`  ⚠️  Could not read PR body for issue link check: ${error}`);
+    return { checked: false, updated: false, body: prBody, issueRef: buildIssueReference({ issueNumber, owner, repo, fork: argv.fork }), error };
+  }
+
+  prBody = prBodyResult.stdout.toString();
+  const linkResult = ensureIssueLinkInPullRequestBody(prBody, {
+    issueNumber,
+    owner,
+    repo,
+    fork: argv.fork,
+  });
+
+  if (!linkResult.updated) {
+    await logger('  ✅ PR body already contains issue reference');
+    return { checked: true, updated: false, body: linkResult.body, issueRef: linkResult.issueRef };
+  }
+
+  await logger(`  📝 Updating PR body to link issue #${issueNumber}...`);
+
+  const fs = (await use('fs')).promises;
+  const tempBodyFile = `/tmp/pr-body-update-${prNumber}-${Date.now()}.md`;
+  await fs.writeFile(tempBodyFile, linkResult.body);
+
+  try {
+    const updateResult = await command`gh pr edit ${prNumber} --repo ${owner}/${repo} --body-file "${tempBodyFile}"`;
+    await fs.unlink(tempBodyFile).catch(() => {});
+
+    if (updateResult.code === 0) {
+      await logger(`  ✅ Updated PR body to include "Fixes ${linkResult.issueRef}"`);
+      return { checked: true, updated: true, body: linkResult.body, issueRef: linkResult.issueRef };
+    }
+
+    const error = updateResult.stderr ? updateResult.stderr.toString().trim() : 'Unknown error';
+    await logger(`  ⚠️  Could not update PR body: ${error}`);
+    return { checked: true, updated: false, body: prBody, issueRef: linkResult.issueRef, error };
+  } catch (updateError) {
+    await fs.unlink(tempBodyFile).catch(() => {});
+    throw updateError;
+  }
+};
+
+export const verifyPullRequestIssueLinkAfterAutoRestart = async ({ prNumber, issueNumber, owner, repo, argv = {}, cleanErrorMessage = error => error.message }) => {
+  if (!prNumber) {
+    return { checked: false, updated: false, body: '', issueRef: buildIssueReference({ issueNumber, owner, repo, fork: argv.fork }) };
+  }
+
+  await log('🔗 Verifying PR issue link after auto-restart...');
+  try {
+    return await ensurePullRequestIssueLink({ prNumber, issueNumber, owner, repo, argv });
+  } catch (issueLinkError) {
+    await log(`⚠️  Could not verify PR issue link after auto-restart: ${cleanErrorMessage(issueLinkError)}`, { level: 'warning' });
+    return { checked: false, updated: false, body: '', issueRef: buildIssueReference({ issueNumber, owner, repo, fork: argv.fork }), error: issueLinkError.message };
+  }
+};
+
 /**
  * Detect the CLAUDE.md or .gitkeep commit hash from branch structure when not available in session
  * This handles continue mode where the commit hash was lost between sessions
@@ -622,52 +699,16 @@ export const verifyResults = async (owner, repo, branchName, issueNumber, prNumb
 
         // 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
-          let prBody = '';
-          const prBodyResult = await $`gh pr view ${pr.number} --repo ${owner}/${repo} --json body --jq .body`;
-          if (prBodyResult.code === 0) {
-            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;
-              }
-            } else {
-              await log('  ✅ PR body already contains issue reference');
-            }
-          }
+          const issueLinkResult = await ensurePullRequestIssueLink({
+            prNumber: pr.number,
+            issueNumber,
+            owner,
+            repo,
+            argv,
+            command: $,
+            logger: log,
+          });
+          const prBody = issueLinkResult.body || '';
 
           // Issue #1162: Detect if PR title/description still have auto-generated placeholder content
           // Track this before cleanup for --auto-restart-on-non-updated-pull-request-description
@@ -709,7 +750,7 @@ export const verifyResults = async (owner, repo, branchName, issueNumber, prNumb
 
             // Build new description
             const fs = (await use('fs')).promises;
-            const issueRef = argv.fork ? `${owner}/${repo}#${issueNumber}` : `#${issueNumber}`;
+            const issueRef = buildIssueReference({ issueNumber, owner, repo, fork: argv.fork });
             const newDescription = `## Summary
 
 This pull request implements a solution for ${issueRef}: ${issueTitle}