@link-assistant/hive-mind 2.11.3 → 2.11.4

package/src/solve.results.lib.mjs

@@ -67,6 +67,10 @@ const { reportError } = sentryLib;
 const prIssueLinking = await import('./pr-issue-linking.lib.mjs');
 const { buildIssueReference, ensureIssueLinkInPullRequestBody } = prIssueLinking;
 
+// Issue #2119: the one place that decides whether a pull request changed anything.
+const { formatChangeSummary, getPullRequestChangeStats } = await import('./pull-request-changes.lib.mjs');
+const { buildNoChangesNotice, redactWorkspacePaths } = await import('./working-session-summary.lib.mjs');
+
 /**
  * Placeholder patterns used to detect auto-generated PR content that was not updated by the agent.
  * These patterns match the initial WIP PR created by solve.auto-pr.lib.mjs.
@@ -158,7 +162,7 @@ export const ensurePullRequestIssueLink = async ({ prNumber, issueNumber, owner,
   await writeSanitizedPublicationFile(tempBodyFile, linkResult.body);
 
   try {
-    const updateResult = await command`gh pr edit ${prNumber} --repo ${owner}/${repo} --body-file "${tempBodyFile}"`;
+    const updateResult = await command`gh pr edit ${prNumber} --repo ${owner}/${repo} --body-file ${tempBodyFile}`;
     await fs.unlink(tempBodyFile).catch(() => {});
 
     if (updateResult.code === 0) {
@@ -787,7 +791,7 @@ export const verifyResults = async (owner, repo, branchName, issueNumber, prNumb
           if (prTitleHasPlaceholder && !argv.autoRestartOnNonUpdatedPullRequestDescription) {
             const updatedTitle = await sanitizeForPublication(pr.title.replace(/^\[WIP\]\s*/, ''));
             await log(`  📝 Removing [WIP] prefix from PR title...`);
-            const titleResult = await $`gh pr edit ${pr.number} --repo ${owner}/${repo} --title "${updatedTitle}"`;
+            const titleResult = await $`gh pr edit ${pr.number} --repo ${owner}/${repo} --title ${updatedTitle}`;
             if (titleResult.code === 0) {
               await log(`  ✅ Updated PR title to: "${updatedTitle}"`);
             } else {
@@ -801,14 +805,14 @@ export const verifyResults = async (owner, repo, branchName, issueNumber, prNumb
           if (hasPlaceholder && !argv.autoRestartOnNonUpdatedPullRequestDescription) {
             await log(`  📝 Updating PR description to remove placeholder text...`);
 
-            // Build a summary of the changes from the PR diff
-            const diffResult = await $`gh pr diff ${pr.number} --repo ${owner}/${repo} 2>&1`;
-            const diffOutput = diffResult.code === 0 ? diffResult.stdout.toString() : '';
-
-            // Count files changed
-            const filesChanged = (diffOutput.match(/^diff --git/gm) || []).length;
-            const additions = (diffOutput.match(/^\+[^+]/gm) || []).length;
-            const deletions = (diffOutput.match(/^-[^-]/gm) || []).length;
+            // Issue #2119: measure the net diff. The reproduction PRs published
+            // "1 file(s) modified, 1 line(s) added" for a pull request that
+            // changed nothing, because the stats were never checked for being
+            // empty.
+            const changeStats = await getPullRequestChangeStats({ owner, repo, prNumber: pr.number, $ });
+            if (!changeStats.hasChanges) {
+              await log(`  ⚠️  PR #${pr.number} has an empty diff - the description will say so instead of claiming changes`, { level: 'warning' });
+            }
 
             // Get the issue title for context
             const issueTitleResult = await $`gh issue view ${issueNumber} --repo ${owner}/${repo} --json title --jq .title 2>&1`;
@@ -822,9 +826,7 @@ export const verifyResults = async (owner, repo, branchName, issueNumber, prNumb
 This pull request implements a solution for ${issueRef}: ${issueTitle}
 
 ### Changes
-- ${filesChanged} file(s) modified
-- ${additions} line(s) added
-- ${deletions} line(s) removed
+${formatChangeSummary(changeStats)}
 
 ### Issue Reference
 Fixes ${issueRef}
@@ -836,7 +838,7 @@ Fixes ${issueRef}
             await writeSanitizedPublicationFile(tempBodyFile, newDescription);
 
             try {
-              const descResult = await $`gh pr edit ${pr.number} --repo ${owner}/${repo} --body-file "${tempBodyFile}"`;
+              const descResult = await $`gh pr edit ${pr.number} --repo ${owner}/${repo} --body-file ${tempBodyFile}`;
               await fs.unlink(tempBodyFile).catch(() => {});
 
               if (descResult.code === 0) {
@@ -1269,7 +1271,7 @@ export const buildWorkingSessionSummaryDetails = ({ publicPricingEstimate = null
   return `${costInfo}${budgetStats}`.trim();
 };
 
-export const attachSolutionSummary = async ({ resultSummary, prNumber, issueNumber, owner, repo, publicPricingEstimate = null, anthropicTotalCostUSD = null, pricingInfo = null, budgetStatsData = null }) => {
+export const attachSolutionSummary = async ({ resultSummary, prNumber, issueNumber, owner, repo, publicPricingEstimate = null, anthropicTotalCostUSD = null, pricingInfo = null, budgetStatsData = null, changeStats = null }) => {
   if (!resultSummary || typeof resultSummary !== 'string') {
     await log('⚠️  No working session summary available to attach', { verbose: true });
     return false;
@@ -1290,10 +1292,16 @@ export const attachSolutionSummary = async ({ resultSummary, prNumber, issueNumb
       pricingInfo,
       budgetStatsData,
     });
+    // Issue #2119: publish what the session actually produced. The reported
+    // summary said "The `pwd` command completed" and printed the solver's own
+    // /tmp workspace, on a pull request that was still empty.
+    const noChangesNotice = buildNoChangesNotice(changeStats);
+    const summaryBody = redactWorkspacePaths(resultSummary);
+
     const comment = `${toolComments.WORKING_SESSION_SUMMARY_AUTOMATION_MARKER}
 ## ${toolComments.WORKING_SESSION_SUMMARY_MARKER}
 
-${resultSummary}${usageDetails ? `\n\n${usageDetails}` : ''}
+${summaryBody}${noChangesNotice ? `\n\n${noChangesNotice}` : ''}${usageDetails ? `\n\n${usageDetails}` : ''}
 
 ---
 *${toolComments.WORKING_SESSION_SUMMARY_AUTOMATED_FOOTER}*`;
@@ -1395,6 +1403,10 @@ export const maybeAttachWorkingSessionSummary = async ({ argv, resultSummary, wo
           ...sessionUsage,
         })
       : null);
+  // Issue #2119: a summary posted on a pull request that changed nothing must
+  // say so, instead of reading as a report of completed work.
+  const changeStats = prNumber ? await getPullRequestChangeStats({ owner, repo, prNumber, $ }) : null;
+
   const ok = await attachSolutionSummary({
     resultSummary,
     prNumber,
@@ -1405,6 +1417,7 @@ export const maybeAttachWorkingSessionSummary = async ({ argv, resultSummary, wo
     anthropicTotalCostUSD,
     pricingInfo,
     budgetStatsData: resolvedBudgetStatsData,
+    changeStats,
   });
   return { attached: !!ok, reason: ok ? 'attached' : 'post_failed', budgetStatsData: resolvedBudgetStatsData };
 };

package/src/solve.watch.lib.mjs

@@ -46,7 +46,12 @@ const { checkGitHubTerminalState } = terminalStateLib;
 
 // Issue #1574: Interruptible sleep so CTRL+C is never blocked by a lingering timer
 const { interruptibleSleep } = await import('./interruptible-sleep.lib.mjs');
-const { formatAutoIterationLimit, hasReachedAutoIterationLimit, normalizeAutoIterationLimit } = await import('./auto-iteration-limits.lib.mjs');
+// Issue #2119: one auto-restart budget shared with solve.auto-merge.lib.mjs, so
+// a limit of 5 means 5 AI sessions in total rather than 5 per subsystem, and
+// every label renders in the same `N/M` form.
+const autoRestartBudget = await import('./auto-restart-budget.lib.mjs');
+const { beginAutoRestartBudget, consumeAutoRestartIteration, formatAutoRestartLabel, formatAutoRestartLimit, getAutoRestartIterationsUsed, getRemainingAutoRestartIterations, hasExhaustedAutoRestartBudget } = autoRestartBudget;
+const { failOnAutoRestartBudgetExhausted } = await import('./auto-restart-exhaustion.lib.mjs');
 
 // Issue #1625: Central marker constants + tracked comment posting
 const toolComments = await import('./tool-comments.lib.mjs');
@@ -78,7 +83,9 @@ export const watchForFeedback = async params => {
 
   const watchInterval = argv.watchInterval || 60; // seconds
   const isTemporaryWatch = argv.temporaryWatch || false;
-  const maxAutoRestartIterations = normalizeAutoIterationLimit(argv.autoRestartMaxIterations);
+  // Issue #2119: claim the shared budget; the same limit is honoured by the
+  // auto-merge restart loop that solve.mjs runs afterwards.
+  const maxAutoRestartIterations = beginAutoRestartBudget({ maxIterations: argv.autoRestartMaxIterations });
 
   // Track latest session data across all iterations for accurate pricing
   // Issue #1056: Seed from the *initial* tool execution so the first auto-restart
@@ -105,7 +112,7 @@ export const watchForFeedback = async params => {
     await log(formatAligned('', 'Monitoring PR:', `#${prNumber}`, 2));
     await log(formatAligned('', 'Mode:', 'Auto-restart (NOT --watch mode)', 2));
     await log(formatAligned('', 'Stop conditions:', 'All changes committed OR PR merged OR max iterations reached', 2));
-    await log(formatAligned('', 'Max iterations:', formatAutoIterationLimit(maxAutoRestartIterations), 2));
+    await log(formatAligned('', 'Max iterations:', formatAutoRestartLimit(), 2));
     await log(formatAligned('', 'Note:', 'No wait time between iterations in auto-restart mode', 2));
   } else {
     await log(formatAligned('👁️', 'WATCH MODE ACTIVATED', ''));
@@ -118,8 +125,12 @@ export const watchForFeedback = async params => {
   await log('');
 
   let iteration = 0;
-  let autoRestartCount = 0;
+  // Issue #2119: mirrors the shared budget counter so every label in this loop
+  // reports the run-wide iteration number, not a per-subsystem one.
+  let autoRestartCount = getAutoRestartIterationsUsed();
   let firstIterationInTemporaryMode = isTemporaryWatch;
+  // Issue #2119: set when the budget runs out, so the caller learns the run failed.
+  let budgetExhaustion = null;
 
   while (true) {
     iteration++;
@@ -211,13 +222,25 @@ export const watchForFeedback = async params => {
         break;
       }
 
-      // Check if we've reached max iterations
-      if (hasReachedAutoIterationLimit(autoRestartCount, maxAutoRestartIterations)) {
-        await log('');
-        await log(formatAligned('⚠️', 'MAX ITERATIONS REACHED', `Exiting auto-restart mode after ${autoRestartCount} iterations`));
-        await log(formatAligned('', 'Some uncommitted changes may remain', '', 2));
-        await log(formatAligned('', 'Please review and commit manually if needed', '', 2));
-        await log('');
+      // Issue #2119: the shared budget is exhausted. Previously this logged a
+      // warning and broke out of the loop, leaving the very uncommitted changes
+      // that triggered every restart on a temporary clone that is then deleted.
+      // Now the run fails and the work is auto-committed first, so the result
+      // stays visible in the PR.
+      if (hasExhaustedAutoRestartBudget()) {
+        const changes = await getUncommittedChangesDetails(tempDir);
+        budgetExhaustion = await failOnAutoRestartBudgetExhausted({
+          owner,
+          repo,
+          prNumber,
+          tempDir,
+          branchName: prBranch || branchName,
+          $,
+          log,
+          formatAligned,
+          blocker: changes.length > 0 ? `uncommitted changes remained: ${changes.join(', ')}` : 'uncommitted changes remained',
+          subsystem: 'auto-restart on uncommitted changes',
+        });
         break;
       }
     }
@@ -274,17 +297,18 @@ export const watchForFeedback = async params => {
           }
           await log('');
 
-          // Increment auto-restart counter and log restart number
-          autoRestartCount++;
+          // Issue #2119: claim one iteration from the run-wide budget shared with
+          // the auto-merge restart loop.
+          autoRestartCount = consumeAutoRestartIteration();
           autoRestartIterationsRan = true; // Issue #1290: Mark that auto-restart iterations ran
           lastIterationLogUploaded = false; // Reset log upload tracking for new iteration
-          const restartLabel = firstIterationInTemporaryMode ? 'Initial restart' : `Restart ${autoRestartCount}/${maxAutoRestartIterations}`;
+          const restartLabel = `Restart ${formatAutoRestartLabel(autoRestartCount)}`;
           await log(formatAligned('🔄', `${restartLabel}:`, `Running ${argv.tool.toUpperCase()} to handle uncommitted changes...`));
 
           // Post a comment to PR about auto-restart
           if (prNumber) {
             try {
-              const remainingIterations = maxAutoRestartIterations === 0 ? null : maxAutoRestartIterations - autoRestartCount;
+              const remainingIterations = getRemainingAutoRestartIterations();
 
               // Get uncommitted files list for the comment
               let uncommittedFilesList = '';
@@ -292,7 +316,7 @@ export const watchForFeedback = async params => {
                 uncommittedFilesList = '\n\n**Uncommitted files:**\n```\n' + changes.join('\n') + '\n```';
               }
 
-              const iterationLabel = maxAutoRestartIterations === 0 ? `${autoRestartCount}` : `${autoRestartCount}/${maxAutoRestartIterations}`;
+              const iterationLabel = formatAutoRestartLabel(autoRestartCount);
               const stopText = remainingIterations === null ? 'Auto-restart is configured with no iteration limit.' : `Auto-restart will stop after changes are committed or discarded, or after ${remainingIterations} more iteration${remainingIterations !== 1 ? 's' : ''}.`;
               const commentBody = `## 🔄 ${AUTO_RESTART_MARKER} ${iterationLabel}\n\nDetected uncommitted changes from previous run. Starting new session to review and commit or discard them.${uncommittedFilesList}\n\n---\n*${stopText} Please wait until working session will end and give your feedback.*`;
               // Issue #1625: Track so this doesn't falsely count as AI-authored.
@@ -471,7 +495,7 @@ export const watchForFeedback = async params => {
               const logFile = getLogFile();
               if (logFile) {
                 // Use "Auto-restart X/Y Failure Log" format to distinguish from success logs
-                const iterationLabel = maxAutoRestartIterations === 0 ? `${autoRestartCount}` : `${autoRestartCount}/${maxAutoRestartIterations}`;
+                const iterationLabel = formatAutoRestartLabel(autoRestartCount);
                 const customTitle = `⚠️ Auto-restart ${iterationLabel} Failure Log`;
                 const logUploadSuccess = await attachLogToGitHub({
                   logFile,
@@ -607,7 +631,7 @@ export const watchForFeedback = async params => {
               const logFile = getLogFile();
               if (logFile) {
                 // Use "Auto-restart X/Y Log" format as requested in issue #1107
-                const iterationLabel = maxAutoRestartIterations === 0 ? `${autoRestartCount}` : `${autoRestartCount}/${maxAutoRestartIterations}`;
+                const iterationLabel = formatAutoRestartLabel(autoRestartCount);
                 const customTitle = `🔄 Auto-restart ${iterationLabel} Log`;
                 const logUploadSuccess = await attachLogToGitHub({
                   logFile,
@@ -733,6 +757,11 @@ export const watchForFeedback = async params => {
     latestAnthropicCost,
     autoRestartIterationsRan, // True if any auto-restart iterations actually ran
     lastIterationLogUploaded, // True if the last iteration's logs were uploaded
+    // Issue #2119: false when the shared auto-restart budget ran out, so the run
+    // is reported as failed instead of silently exiting with work still pending.
+    success: !budgetExhaustion,
+    reason: budgetExhaustion?.reason || null,
+    autoRestartLimitReached: Boolean(budgetExhaustion),
   };
 };
 

package/src/working-session-summary.lib.mjs

@@ -0,0 +1,65 @@
+#!/usr/bin/env node
+
+/**
+ * Issue #2119: make the published "Working session summary" comment honest.
+ *
+ * The Kotlin reproduction run ended with the AI tool answering a single `pwd`
+ * and returning, and Hive Mind published exactly that as the session's result:
+ *
+ *     <!-- hive-mind:working-session-summary -->
+ *     ## Working session summary
+ *
+ *     The `pwd` command completed. Output:
+ *
+ *     ```text
+ *     /tmp/gh-issue-solver-1785421161275
+ *     ```
+ *
+ * (https://github.com/konard/test-hello-world-019fb330-fa49-7c9d-a664-b7ea33bb698a/pull/2#issuecomment-5132013034)
+ *
+ * Two things are wrong with that comment, and both are Hive Mind's to fix - the
+ * tool returning nothing useful is a separate, upstream problem:
+ *
+ *   1. It reads as a report of completed work. A reader has to open the diff to
+ *      discover the pull request is still empty. Stating that in the comment
+ *      turns a misleading summary into an accurate one.
+ *   2. It publishes the solver's private workspace path. That path is an
+ *      implementation detail of the machine the run happened on; it is noise in
+ *      a public comment and it tells readers about the host filesystem.
+ */
+
+/** Solver workspace directories, as created by solve.repository.lib.mjs. */
+const WORKSPACE_PATH_PATTERN = /(?:\/private)?\/(?:tmp|var\/folders\/[^\s/]+\/[^\s/]+\/[^\s/]+)\/gh-issue-solver(?:-resume)?-[A-Za-z0-9._-]+/g;
+
+/** Replacement shown in place of a redacted workspace path. */
+export const WORKSPACE_PATH_PLACEHOLDER = '<workspace>';
+
+/**
+ * Replace solver workspace paths with a placeholder.
+ *
+ * Only the solver's own `gh-issue-solver-*` directories are touched: paths the
+ * user actually cares about (repository-relative paths, other absolute paths)
+ * are left exactly as the AI wrote them.
+ *
+ * @param {string} text
+ * @returns {string}
+ */
+export const redactWorkspacePaths = text => {
+  if (typeof text !== 'string' || !text) return text;
+  return text.replace(WORKSPACE_PATH_PATTERN, WORKSPACE_PATH_PLACEHOLDER);
+};
+
+/**
+ * The line appended when the pull request still has an empty diff.
+ *
+ * @param {{measured: boolean, hasChanges: boolean}|null} changeStats - from
+ *   `getPullRequestChangeStats`; `null` or unmeasured stats produce no notice,
+ *   so a failed diff read never turns into a false "no changes" claim.
+ * @returns {string} the notice, or an empty string when none applies
+ */
+export const buildNoChangesNotice = changeStats => {
+  if (!changeStats || !changeStats.measured || changeStats.hasChanges) return '';
+  return '> ⚠️ This pull request still contains no changes - nothing was implemented yet.';
+};
+
+export default { buildNoChangesNotice, redactWorkspacePaths, WORKSPACE_PATH_PLACEHOLDER };

package/src/youtrack/youtrack-sync.mjs

@@ -101,7 +101,7 @@ ${youTrackIssue.description || 'No description provided.'}
     if (needsUpdate) {
       await log(`   📝 Updating issue #${existingIssue.number} for ${youTrackId}...`);
 
-      const updateResult = await $`gh issue edit ${existingIssue.number} --repo ${owner}/${repo} --title "${ghTitle}" --body "${ghBody}"`;
+      const updateResult = await $`gh issue edit ${existingIssue.number} --repo ${owner}/${repo} --title ${ghTitle} --body ${ghBody}`;
 
       if (updateResult.code === 0) {
         await log(`   ✅ Updated issue #${existingIssue.number}`);
@@ -130,7 +130,7 @@ ${youTrackIssue.description || 'No description provided.'}
     await log(`   ➕ Creating GitHub issue for ${youTrackId}...`);
 
     try {
-      const createResult = await $`gh issue create --repo ${owner}/${repo} --title "${ghTitle}" --body "${ghBody}" --label "help wanted"`;
+      const createResult = await $`gh issue create --repo ${owner}/${repo} --title ${ghTitle} --body ${ghBody} --label "help wanted"`;
 
       if (createResult.code === 0) {
         const issueUrl = createResult.stdout.toString().trim();