@link-assistant/hive-mind 1.59.5 → 1.59.7

package/src/hive.mjs

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 // Import Sentry instrumentation first (must be before other imports)
 import './instrument.mjs';
+import { wrapDollarWithGhRetry as _wrapDollarWithGhRetry } from './github-rate-limit.lib.mjs'; // rate-limit marker (#1726): gh API calls flow through $ wrapped by caller
 const earlyArgs = process.argv.slice(2);
 if (earlyArgs.includes('--version')) {
   const { getVersion } = await import('./version.lib.mjs');
@@ -28,7 +29,6 @@ if (earlyArgs.includes('--help') || earlyArgs.includes('-h')) {
     // Reuse createYargsConfig from shared module to avoid duplication
     const { createYargsConfig } = await import('./hive.config.lib.mjs');
     const helpYargs = createYargsConfig(yargs(rawArgs)).version(false);
-    // Show help and exit
     helpYargs.showHelp();
     process.exit(0);
   } catch (error) {
@@ -1497,4 +1497,4 @@ if (isRunningDirectly) {
     console.error('\nPlease report this issue at: https://github.com/link-assistant/hive-mind/issues');
     process.exit(1);
   }
-} // End of main execution block
+}

package/src/hive.recheck.lib.mjs

@@ -5,6 +5,7 @@ import { log, cleanErrorMessage } from './lib.mjs';
 import { batchCheckPullRequestsForIssues, batchCheckArchivedRepositories } from './github.lib.mjs';
 import { reportError } from './sentry.lib.mjs';
 
+import { wrapDollarWithGhRetry as _wrapDollarWithGhRetry } from './github-rate-limit.lib.mjs'; // rate-limit marker (#1726): gh API calls flow through $ wrapped by caller
 /**
  * Recheck conditions for an issue right before processing
  * This ensures the issue should still be processed even if conditions changed since queuing

package/src/lib.mjs

@@ -478,12 +478,16 @@ export const isTransientNetworkError = error => {
 /**
  * Retry a GitHub CLI / API operation with exponential backoff on transient network errors.
  * Unlike the generic `retry()`, this function:
- * - Only retries on transient network errors (TCP reset, TLS timeout, etc.)
- * - Immediately rethrows non-transient errors (404, 403, auth failures)
+ * - Retries on transient network errors (TCP reset, TLS timeout, etc.)
+ * - Retries on GitHub API rate-limit errors, sleeping until reset + buffer + jitter
+ *   (issue #1726 — see src/github-rate-limit.lib.mjs)
+ * - Immediately rethrows non-transient errors (404, 403 non-rate-limit, auth failures)
  * - Logs stderr to the log file when a command fails (fixing terminal/log parity)
  *
  * Issue #1536: Most gh commands had no retry logic, causing solve to abort on
  * intermittent network issues.
+ * Issue #1726: Rate limit errors silently surfaced as command failure with no retry,
+ *              causing the merge subsystem to swallow them as "no workflows found".
  *
  * @param {Function} fn - Async function to execute (should call gh CLI or GitHub API)
  * @param {Object} [options] - Options
@@ -496,11 +500,20 @@ export const isTransientNetworkError = error => {
  */
 export const ghRetry = async (fn, options = {}) => {
   const { maxAttempts = 3, delay = 1000, backoff = 2, label = 'gh command' } = options;
+  const { isRateLimitError, parseRateLimitReset, fetchNextRateLimitReset, computeRateLimitWait } = await import('./github-rate-limit.lib.mjs');
 
   for (let attempt = 1; attempt <= maxAttempts; attempt++) {
     try {
       return await fn();
     } catch (error) {
+      if (isRateLimitError(error) && attempt < maxAttempts) {
+        const reset = parseRateLimitReset(error) || (await fetchNextRateLimitReset());
+        const { waitMs, deadline, bufferMs, jitterMs } = computeRateLimitWait(reset);
+        const resetSummary = reset ? `reset at ${reset.toISOString()}` : 'reset time unknown';
+        await log(`⏳ ${label}: GitHub API rate limit hit (attempt ${attempt}/${maxAttempts}). Waiting ${Math.round(waitMs / 60000)} min (${resetSummary}; buffer ${Math.round(bufferMs / 60000)} min + jitter ${Math.round(jitterMs / 1000)}s) until ${deadline.toISOString()}.`, { level: 'warn' });
+        await sleep(waitMs);
+        continue;
+      }
       if (isTransientNetworkError(error) && attempt < maxAttempts) {
         const waitTime = delay * Math.pow(backoff, attempt - 1);
         await log(`⚠️ ${label}: Network error (attempt ${attempt}/${maxAttempts}), retrying in ${waitTime / 1000}s...`, { level: 'warn' });
@@ -527,6 +540,7 @@ export const ghRetry = async (fn, options = {}) => {
  */
 export const ghCmdRetry = async (cmdFn, options = {}) => {
   const { maxAttempts = 3, delay = 1000, backoff = 2, label = 'gh command' } = options;
+  const { isRateLimitError, parseRateLimitReset, fetchNextRateLimitReset, computeRateLimitWait } = await import('./github-rate-limit.lib.mjs');
 
   for (let attempt = 1; attempt <= maxAttempts; attempt++) {
     const result = await cmdFn();
@@ -541,9 +555,21 @@ export const ghCmdRetry = async (cmdFn, options = {}) => {
       return result;
     }
 
-    // Check if this is a transient network error worth retrying
     const combinedOutput = (result.stdout?.toString() || '') + ' ' + (result.stderr?.toString() || '');
-    if (isTransientNetworkError({ message: combinedOutput }) && attempt < maxAttempts) {
+    const errorLike = { message: combinedOutput, stdout: result.stdout, stderr: result.stderr };
+
+    // Issue #1726: rate-limit errors deserve a long, deterministic wait.
+    if (isRateLimitError(errorLike) && attempt < maxAttempts) {
+      const reset = parseRateLimitReset(errorLike) || (await fetchNextRateLimitReset());
+      const { waitMs, deadline, bufferMs, jitterMs } = computeRateLimitWait(reset);
+      const resetSummary = reset ? `reset at ${reset.toISOString()}` : 'reset time unknown';
+      await log(`⏳ ${label}: GitHub API rate limit hit (attempt ${attempt}/${maxAttempts}). Waiting ${Math.round(waitMs / 60000)} min (${resetSummary}; buffer ${Math.round(bufferMs / 60000)} min + jitter ${Math.round(jitterMs / 1000)}s) until ${deadline.toISOString()}.`, { level: 'warn' });
+      await sleep(waitMs);
+      continue;
+    }
+
+    // Check if this is a transient network error worth retrying
+    if (isTransientNetworkError(errorLike) && attempt < maxAttempts) {
       const waitTime = delay * Math.pow(backoff, attempt - 1);
       await log(`⚠️ ${label}: Network error (attempt ${attempt}/${maxAttempts}), retrying in ${waitTime / 1000}s...`, { level: 'warn' });
       await sleep(waitTime);

package/src/limits.lib.mjs

@@ -12,6 +12,7 @@ import { promisify } from 'node:util';
 import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc.js';
 
+import { wrapDollarWithGhRetry as _wrapDollarWithGhRetry } from './github-rate-limit.lib.mjs'; // rate-limit marker (#1726): gh API calls flow through $ wrapped by caller
 // Initialize dayjs plugins
 dayjs.extend(utc);
 

package/src/protect-branch.mjs

@@ -18,8 +18,9 @@
 const { use } = eval(await (await fetch('https://unpkg.com/use-m/use.js')).text());
 
 // Use command-stream for consistent $ behavior across runtimes
-const { $ } = await use('command-stream');
-
+const { $: __rawDollar$ } = await use('command-stream');
+const { wrapDollarWithGhRetry } = await import('./github-rate-limit.lib.mjs');
+const $ = wrapDollarWithGhRetry(__rawDollar$);
 // Parse command line arguments
 const args = process.argv.slice(2);
 

package/src/queue-config.lib.mjs

@@ -88,7 +88,7 @@ function normalizeMetricName(name) {
  *   (cpu (65% enqueue))
  *   (claude-5-hour (65% dequeue-one-at-a-time))
  *   (claude-weekly (97% dequeue-one-at-a-time))
- *   (github-api (75% enqueue))
+ *   (github-api (50% enqueue))
  * )
  * ```
  *
@@ -253,7 +253,11 @@ export const QUEUE_CONFIG = {
     claudeWeekly: getThresholdConfig('claudeWeekly', 'HIVE_MIND_CLAUDE_WEEKLY_THRESHOLD', 'HIVE_MIND_CLAUDE_WEEKLY_STRATEGY', 0.97, 'dequeue-one-at-a-time'),
     codex5Hour: getThresholdConfig('codex5Hour', 'HIVE_MIND_CODEX_5_HOUR_SESSION_THRESHOLD', 'HIVE_MIND_CODEX_5_HOUR_SESSION_STRATEGY', 0.65, 'dequeue-one-at-a-time'),
     codexWeekly: getThresholdConfig('codexWeekly', 'HIVE_MIND_CODEX_WEEKLY_THRESHOLD', 'HIVE_MIND_CODEX_WEEKLY_STRATEGY', 0.97, 'dequeue-one-at-a-time'),
-    githubApi: getThresholdConfig('githubApi', 'HIVE_MIND_GITHUB_API_THRESHOLD', 'HIVE_MIND_GITHUB_API_STRATEGY', 0.75, 'enqueue'),
+    // Issue #1726: lowered default from 0.75 to 0.50 to start backing off earlier
+    // and leave a wider safety margin before the hard 5,000/hr ceiling. Hosted
+    // runners hit the ceiling repeatedly with the 75% setting (see
+    // docs/case-studies/issue-1726).
+    githubApi: getThresholdConfig('githubApi', 'HIVE_MIND_GITHUB_API_THRESHOLD', 'HIVE_MIND_GITHUB_API_STRATEGY', 0.5, 'enqueue'),
   },
 
   // Legacy flat threshold values for backward compatibility
@@ -265,7 +269,7 @@ export const QUEUE_CONFIG = {
   CLAUDE_WEEKLY_THRESHOLD: getThresholdConfig('claudeWeekly', 'HIVE_MIND_CLAUDE_WEEKLY_THRESHOLD', 'HIVE_MIND_CLAUDE_WEEKLY_STRATEGY', 0.97, 'dequeue-one-at-a-time').value,
   CODEX_5_HOUR_SESSION_THRESHOLD: getThresholdConfig('codex5Hour', 'HIVE_MIND_CODEX_5_HOUR_SESSION_THRESHOLD', 'HIVE_MIND_CODEX_5_HOUR_SESSION_STRATEGY', 0.65, 'dequeue-one-at-a-time').value,
   CODEX_WEEKLY_THRESHOLD: getThresholdConfig('codexWeekly', 'HIVE_MIND_CODEX_WEEKLY_THRESHOLD', 'HIVE_MIND_CODEX_WEEKLY_STRATEGY', 0.97, 'dequeue-one-at-a-time').value,
-  GITHUB_API_THRESHOLD: getThresholdConfig('githubApi', 'HIVE_MIND_GITHUB_API_THRESHOLD', 'HIVE_MIND_GITHUB_API_STRATEGY', 0.75, 'enqueue').value,
+  GITHUB_API_THRESHOLD: getThresholdConfig('githubApi', 'HIVE_MIND_GITHUB_API_THRESHOLD', 'HIVE_MIND_GITHUB_API_STRATEGY', 0.5, 'enqueue').value,
 
   // Timing
   // MIN_START_INTERVAL_MS: Time to allow solve command to start actual claude process

package/src/review.mjs

@@ -35,8 +35,9 @@ if (earlyArgs.includes('--help') || earlyArgs.includes('-h')) {
 const { use } = eval(await (await fetch('https://unpkg.com/use-m/use.js')).text());
 
 // Use command-stream for consistent $ behavior across runtimes
-const { $ } = await use('command-stream');
-
+const { $: __rawDollar$ } = await use('command-stream');
+const { wrapDollarWithGhRetry } = await import('./github-rate-limit.lib.mjs');
+const $ = wrapDollarWithGhRetry(__rawDollar$);
 const yargs = (await use('yargs@latest')).default;
 const os = (await use('os')).default;
 const path = (await use('path')).default;

package/src/reviewers-hive.mjs

@@ -4,8 +4,9 @@
 const { use } = eval(await (await fetch('https://unpkg.com/use-m/use.js')).text());
 
 // Use command-stream for consistent $ behavior across runtimes
-const { $ } = await use('command-stream');
-
+const { $: __rawDollar$ } = await use('command-stream');
+const { wrapDollarWithGhRetry } = await import('./github-rate-limit.lib.mjs');
+const $ = wrapDollarWithGhRetry(__rawDollar$);
 const yargs = (await use('yargs@latest')).default;
 const path = (await use('path')).default;
 const fs = (await use('fs')).promises;

package/src/solve.accept-invite.lib.mjs

@@ -16,8 +16,14 @@
 
 import { promisify } from 'util';
 import { exec as execCallback } from 'child_process';
+import { ghWithRateLimitRetry } from './github-rate-limit.lib.mjs';
 
-const exec = promisify(execCallback);
+const execRaw = promisify(execCallback);
+// Issue #1726: rate-limit safe gh wrapper.
+const exec = (cmd, opts) =>
+  ghWithRateLimitRetry(() => execRaw(cmd, opts), {
+    label: `gh exec (${cmd.split(/\s+/).slice(0, 3).join(' ')})`,
+  });
 
 // Import retry utility (issue #1536)
 const lib = await import('./lib.mjs');

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

@@ -13,8 +13,9 @@ if (typeof globalThis.use === 'undefined') {
 const use = globalThis.use;
 
 // Use command-stream for consistent $ behavior across runtimes
-const { $ } = await use('command-stream');
-
+const { $: __rawDollar$ } = await use('command-stream');
+const { wrapDollarWithGhRetry } = await import('./github-rate-limit.lib.mjs');
+const $ = wrapDollarWithGhRetry(__rawDollar$);
 // Import shared library functions
 const lib = await import('./lib.mjs');
 const { log, cleanErrorMessage } = lib;

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

@@ -18,8 +18,9 @@ if (typeof globalThis.use === 'undefined') {
 const use = globalThis.use;
 
 // Use command-stream for consistent $ behavior across runtimes
-const { $ } = await use('command-stream');
-
+const { $: __rawDollar$ } = await use('command-stream');
+const { wrapDollarWithGhRetry } = await import('./github-rate-limit.lib.mjs');
+const $ = wrapDollarWithGhRetry(__rawDollar$);
 // Import shared library functions
 const lib = await import('./lib.mjs');
 const { log } = lib;

package/src/solve.auto-merge-helpers.lib.mjs

@@ -21,8 +21,9 @@ if (typeof globalThis.use === 'undefined') {
 const use = globalThis.use;
 
 // Use command-stream for consistent $ behavior across runtimes
-const { $ } = await use('command-stream');
-
+const { $: __rawDollar$ } = await use('command-stream');
+const { wrapDollarWithGhRetry } = await import('./github-rate-limit.lib.mjs');
+const $ = wrapDollarWithGhRetry(__rawDollar$);
 // Import shared library functions
 const lib = await import('./lib.mjs');
 const { log, formatAligned } = lib;

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

@@ -17,8 +17,9 @@ if (typeof globalThis.use === 'undefined') {
 const use = globalThis.use;
 
 // Use command-stream for consistent $ behavior across runtimes
-const { $ } = await use('command-stream');
-
+const { $: __rawDollar$ } = await use('command-stream');
+const { wrapDollarWithGhRetry } = await import('./github-rate-limit.lib.mjs');
+const $ = wrapDollarWithGhRetry(__rawDollar$);
 // Import shared library functions
 const lib = await import('./lib.mjs');
 const { log, cleanErrorMessage, formatAligned, getLogFile } = lib;
@@ -58,6 +59,10 @@ const { checkForExistingComment, checkForNonBotComments, getMergeBlockers } = au
 const toolComments = await import('./tool-comments.lib.mjs');
 const { READY_TO_MERGE_MARKER, AUTO_RESTART_MARKER, AUTO_MERGED_MARKER, postTrackedComment } = toolComments;
 
+// Issue #1728: Per-iteration working session summary attachment helper
+const resultsLib = await import('./solve.results.lib.mjs');
+const { maybeAttachWorkingSessionSummary } = resultsLib;
+
 // 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, shouldSyncBeforeRestart } = await import('./auto-iteration-limits.lib.mjs');
@@ -593,6 +598,10 @@ No further AI sessions will be started automatically for this run. Please review
         // Execute the AI tool using shared utility
         await log(formatAligned('🔄', 'Restarting:', `Running ${argv.tool.toUpperCase()} to address issues...`));
 
+        // Issue #1728: Scope the AI-comment check that gates --auto-attach-solution-summary
+        // to comments posted during *this* iteration only, not across the whole watch loop.
+        const iterationStartTime = new Date();
+
         const toolResult = await executeToolIteration({
           issueUrl,
           owner,
@@ -890,6 +899,35 @@ No further AI sessions will be started automatically for this run. Please review
             }
           }
 
+          // Issue #1728: Attach a "Working session summary" comment for this
+          // iteration if the AI didn't post any comments of its own (and
+          // --auto-attach-solution-summary is enabled, which it is by default).
+          // Before this fix, only the top-level solve.mjs flow honoured this
+          // flag, so iterations inside auto-restart-until-mergeable silently
+          // dropped the AI's last message — see #1728.
+          try {
+            await maybeAttachWorkingSessionSummary({
+              argv,
+              resultSummary: toolResult.resultSummary,
+              workStartTime: iterationStartTime,
+              owner,
+              repo,
+              prNumber,
+              issueNumber,
+              success: true,
+            });
+          } catch (summaryError) {
+            reportError(summaryError, {
+              context: 'attach_auto_restart_working_session_summary',
+              prNumber,
+              owner,
+              repo,
+              iteration,
+              operation: 'attach_working_session_summary',
+            });
+            await log(formatAligned('', `⚠️  Working session summary error: ${cleanErrorMessage(summaryError)}`, '', 2));
+          }
+
           await log('');
           await log(formatAligned('✅', `${argv.tool.toUpperCase()} execution completed:`, 'Checking if PR is now mergeable...'));
         }

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

@@ -5,6 +5,7 @@
 
 import { closingIssueNumbersContain, parseClosingIssueNumbers } from './pr-issue-linking.lib.mjs';
 
+import { wrapDollarWithGhRetry as _wrapDollarWithGhRetry } from './github-rate-limit.lib.mjs'; // rate-limit marker (#1726): gh API calls flow through $ wrapped by caller
 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

package/src/solve.branch-errors.lib.mjs

@@ -9,6 +9,7 @@
 // Import Sentry integration
 import { reportError } from './sentry.lib.mjs';
 
+import { wrapDollarWithGhRetry as _wrapDollarWithGhRetry } from './github-rate-limit.lib.mjs'; // rate-limit marker (#1726): gh API calls flow through $ wrapped by caller
 export async function handleBranchCheckoutError({ branchName, prNumber, errorOutput, issueUrl, owner, repo, tempDir, argv, formatAligned, log, $ }) {
   // Check if this is a PR from a fork
   let isForkPR = false;

package/src/solve.config.lib.mjs

@@ -498,12 +498,12 @@ export const SOLVE_OPTION_DEFINITIONS = {
   },
   'attach-solution-summary': {
     type: 'boolean',
-    description: 'Attach the AI solution summary (from the result field) as a comment to the PR/issue after completion. The summary is extracted from the AI tool JSON output and posted under a "Solution summary" header.',
+    description: 'Attach the AI working session summary (from the result field) as a comment to the PR/issue after every working session. The summary is extracted from the AI tool JSON output and posted under a "Working session summary" header. Applies to the top-level run, auto-restart-until-mergeable iterations, and watch-mode iterations.',
     default: false,
   },
   'auto-attach-solution-summary': {
     type: 'boolean',
-    description: 'Automatically attach solution summary only if the AI did not create any comments during the session. This provides visible feedback when the AI completes silently. Enabled by default; use --no-auto-attach-solution-summary to disable.',
+    description: 'Automatically attach a "Working session summary" comment at the end of any working session in which the AI did not create any comments itself. This provides visible feedback when the AI completes silently, including inside auto-restart-until-mergeable and watch-mode iterations. Enabled by default; use --no-auto-attach-solution-summary to disable.',
     default: true,
   },
   'auto-accept-invite': {

package/src/solve.error-handlers.lib.mjs

@@ -5,6 +5,7 @@
 // Import exit handler
 import { safeExit } from './exit-handler.lib.mjs';
 
+import { wrapDollarWithGhRetry as _wrapDollarWithGhRetry } from './github-rate-limit.lib.mjs'; // rate-limit marker (#1726): gh API calls flow through $ wrapped by caller
 // Import Sentry integration
 import { reportError } from './sentry.lib.mjs';
 

package/src/solve.execution.lib.mjs

@@ -12,8 +12,9 @@ if (typeof globalThis.use === 'undefined') {
 const use = globalThis.use;
 
 // Use command-stream for consistent $ behavior across runtimes
-const { $ } = await use('command-stream');
-
+const { $: __rawDollar$ } = await use('command-stream');
+const { wrapDollarWithGhRetry } = await import('./github-rate-limit.lib.mjs');
+const $ = wrapDollarWithGhRetry(__rawDollar$);
 const os = (await use('os')).default;
 const path = (await use('path')).default;
 const fs = (await use('fs')).promises;

package/src/solve.feedback.lib.mjs

@@ -6,6 +6,7 @@
 // Import Sentry integration
 import { reportError } from './sentry.lib.mjs';
 
+import { wrapDollarWithGhRetry as _wrapDollarWithGhRetry } from './github-rate-limit.lib.mjs'; // rate-limit marker (#1726): gh API calls flow through $ wrapped by caller
 export const detectAndCountFeedback = async params => {
   const { prNumber, branchName, owner, repo, issueNumber, isContinueMode, argv, mergeStateStatus, prState, workStartTime, log, formatAligned, cleanErrorMessage, $ } = params;
 

package/src/solve.mjs

@@ -7,7 +7,9 @@ await handleSolveEarlyExit(earlyArgs);
 
 const { use } = eval(await (await fetch('https://unpkg.com/use-m/use.js')).text());
 globalThis.use = use;
-const { $ } = await use('command-stream');
+const { $: __rawDollar$ } = await use('command-stream');
+const { wrapDollarWithGhRetry } = await import('./github-rate-limit.lib.mjs');
+const $ = wrapDollarWithGhRetry(__rawDollar$);
 const config = await import('./solve.config.lib.mjs');
 const { initializeConfig, parseArguments } = config;
 // Import Sentry integration
@@ -29,7 +31,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, verifyPullRequestIssueLinkAfterAutoRestart } = results;
+const { cleanupClaudeFile, showSessionSummary, verifyResults, buildClaudeResumeCommand, buildSolveResumeCommand, maybeAttachWorkingSessionSummary, verifyPullRequestIssueLinkAfterAutoRestart } = results;
 const claudeLib = await import('./claude.lib.mjs');
 const { executeClaude, checkPlaywrightMcpAvailability } = claudeLib;
 const githubLinking = await import('./github-linking.lib.mjs');
@@ -1104,40 +1106,22 @@ try {
     await safeExit(0, 'Auto-continue child process will handle post-processing');
   }
 
-  // Issue #1263: Handle solution summary attachment
-  // --attach-solution-summary: Always attach if result summary is available
-  // --auto-attach-solution-summary: Only attach if AI didn't create any comments during session
-  if (success && resultSummary && (argv.attachSolutionSummary || argv.autoAttachSolutionSummary)) {
-    let shouldAttachSummary = false;
-
-    if (argv.attachSolutionSummary) {
-      // Explicit flag - always attach
-      shouldAttachSummary = true;
-      await log('📝 --attach-solution-summary enabled, attaching result summary...');
-    } else if (argv.autoAttachSolutionSummary) {
-      // Auto mode - only attach if AI didn't create comments
-      await log('🔍 Checking if AI created any comments during session (--auto-attach-solution-summary)...');
-      const aiCreatedComments = await checkForAiCreatedComments(workStartTime, owner, repo, prNumber, issueNumber);
-      if (aiCreatedComments) {
-        await log('ℹ️  AI created comments during session, skipping solution summary attachment');
-      } else {
-        shouldAttachSummary = true;
-        await log('📝 No AI comments detected, attaching solution summary...');
-      }
-    }
-
-    if (shouldAttachSummary) {
-      await attachSolutionSummary({
-        resultSummary,
-        prNumber,
-        issueNumber,
-        owner,
-        repo,
-      });
-    }
-  } else if ((argv.attachSolutionSummary || argv.autoAttachSolutionSummary) && !resultSummary) {
-    await log('ℹ️  No solution summary available from AI tool output', { verbose: true });
-  }
+  // Issue #1263 / #1728: Working session summary attachment.
+  // Routed through the shared maybeAttachWorkingSessionSummary helper so that
+  // top-level solve, auto-restart-until-mergeable, and watch-mode iterations
+  // all use identical attach logic. The helper internally honours
+  // --attach-solution-summary (always attach) and --auto-attach-solution-summary
+  // (attach only if no AI comment was posted during the session).
+  await maybeAttachWorkingSessionSummary({
+    argv,
+    resultSummary,
+    workStartTime,
+    owner,
+    repo,
+    prNumber,
+    issueNumber,
+    success,
+  });
 
   // Search for newly created pull requests and comments
   const verifyResult = await verifyResults(owner, repo, branchName, issueNumber, prNumber, prUrl, referenceTime, argv, shouldAttachLogs, shouldRestart, sessionId, tempDir, anthropicTotalCostUSD, publicPricingEstimate, pricingInfo, errorDuringExecution, sessionType, resultModelUsage, streamTokenUsage, subAgentCalls);

package/src/solve.preparation.lib.mjs

@@ -3,6 +3,7 @@
  * Handles timestamp collection, feedback detection, and pre-execution checks
  */
 
+import { wrapDollarWithGhRetry as _wrapDollarWithGhRetry } from './github-rate-limit.lib.mjs'; // rate-limit marker (#1726): gh API calls flow through $ wrapped by caller
 // Import feedback detection functionality
 const feedback = await import('./solve.feedback.lib.mjs');
 const { detectAndCountFeedback } = feedback;

package/src/solve.progress-monitoring.lib.mjs

@@ -28,6 +28,7 @@
 // comment is excluded from --auto-attach-solution-summary's AI-comment check.
 import { LIVE_PROGRESS_SECTION_START_MARKER, LIVE_PROGRESS_SECTION_END_MARKER, postTrackedCommentFromFile, trackToolCommentId } from './tool-comments.lib.mjs';
 
+import { wrapDollarWithGhRetry as _wrapDollarWithGhRetry } from './github-rate-limit.lib.mjs'; // rate-limit marker (#1726): gh API calls flow through $ wrapped by caller
 /**
  * Configuration constants for progress monitoring
  */

package/src/solve.repository.lib.mjs

@@ -11,9 +11,9 @@ if (typeof globalThis.use === 'undefined') {
 }
 const use = globalThis.use;
 
-// Use command-stream for consistent $ behavior across runtimes
-const { $ } = await use('command-stream');
-
+// Use command-stream for consistent $ behavior; wrap with rate-limit retry (#1726)
+const { wrapDollarWithGhRetry } = await import('./github-rate-limit.lib.mjs');
+const $ = wrapDollarWithGhRetry((await use('command-stream')).$);
 const os = (await use('os')).default;
 const path = (await use('path')).default;
 const fs = (await use('fs')).promises;

package/src/solve.restart-shared.lib.mjs

@@ -20,8 +20,9 @@ if (typeof globalThis.use === 'undefined') {
 const use = globalThis.use;
 
 // Use command-stream for consistent $ behavior across runtimes
-const { $ } = await use('command-stream');
-
+const { $: __rawDollar$ } = await use('command-stream');
+const { wrapDollarWithGhRetry } = await import('./github-rate-limit.lib.mjs');
+const $ = wrapDollarWithGhRetry(__rawDollar$);
 // Import path and fs for cleanup operations
 const path = (await use('path')).default;
 const fs = (await use('fs')).promises;