@link-assistant/hive-mind 1.59.6 → 1.60.0

package/src/reviewers-hive.mjs

@@ -7,7 +7,7 @@ const { use } = eval(await (await fetch('https://unpkg.com/use-m/use.js')).text(
 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 { getLinoYargsFactory, hideBin, parseCliArgumentsWithLino } = await import('./cli-arguments.lib.mjs');
 const path = (await use('path')).default;
 const fs = (await use('fs')).promises;
 
@@ -46,97 +46,113 @@ const log = async (message, options = {}) => {
 };
 
 // Configure command line arguments
-const argv = yargs(process.argv.slice(2))
-  .usage('Usage: $0 <github-url> [options]')
-  .positional('github-url', {
-    type: 'string',
-    description: 'GitHub organization, repository, or user URL to monitor for pull requests',
-  })
-  .option('review-label', {
-    type: 'string',
-    description: 'GitHub label to identify PRs needing review',
-    default: 'needs-review',
-    alias: 'l',
-  })
-  .option('all-prs', {
-    type: 'boolean',
-    description: 'Review all open pull requests regardless of labels',
-    default: false,
-    alias: 'a',
-  })
-  .option('skip-draft', {
-    type: 'boolean',
-    description: 'Skip draft pull requests',
-    default: true,
-    alias: 'd',
-  })
-  .option('skip-approved', {
-    type: 'boolean',
-    description: 'Skip pull requests that already have approvals',
-    default: true,
-  })
-  .option('concurrency', {
-    type: 'number',
-    description: 'Number of concurrent review.mjs instances',
-    default: 2,
-    alias: 'c',
-  })
-  .option('reviews-per-pr', {
-    type: 'number',
-    description: 'Number of reviews to generate per PR (for diverse perspectives)',
-    default: 1,
-    alias: 'r',
-  })
-  .option('model', {
-    type: 'string',
-    description: 'Model to use for review.mjs (opus or sonnet)',
-    alias: 'm',
-    default: 'opus',
-    choices: ['opus', 'sonnet'],
-  })
-  .option('focus', {
-    type: 'string',
-    description: 'Focus areas for reviews (security, performance, logic, style, tests, all)',
-    default: 'all',
-    alias: 'f',
-  })
-  .option('auto-approve', {
-    type: 'boolean',
-    description: 'Auto-approve PRs that pass review criteria',
-    default: false,
-  })
-  .option('interval', {
-    type: 'number',
-    description: 'Polling interval in seconds',
-    default: 300, // 5 minutes
-    alias: 'i',
-  })
-  .option('max-prs', {
-    type: 'number',
-    description: 'Maximum number of PRs to process (0 = unlimited)',
-    default: 0,
-  })
-  .option('dry-run', {
-    type: 'boolean',
-    description: 'List PRs that would be reviewed without actually reviewing them',
-    default: false,
-  })
-  .option('verbose', {
-    type: 'boolean',
-    description: 'Enable verbose logging',
-    alias: 'v',
-    default: false,
-  })
-  .option('once', {
-    type: 'boolean',
-    description: 'Run once and exit instead of continuous monitoring',
-    default: false,
-  })
-  .demandCommand(1, 'GitHub URL is required')
-  .help('h')
-  .alias('h', 'help').argv;
-
-const githubUrl = argv['github-url'] || argv._[0];
+const createReviewersHiveYargsConfig = yargsInstance =>
+  yargsInstance
+    .usage('Usage: $0 <github-url> [options]')
+    .command('$0 <github-url>', 'Monitor pull requests for review', yargs =>
+      yargs.positional('github-url', {
+        type: 'string',
+        description: 'GitHub organization, repository, or user URL to monitor for pull requests',
+      })
+    )
+    .option('review-label', {
+      type: 'string',
+      description: 'GitHub label to identify PRs needing review',
+      default: 'needs-review',
+      alias: 'l',
+    })
+    .option('all-prs', {
+      type: 'boolean',
+      description: 'Review all open pull requests regardless of labels',
+      default: false,
+      alias: 'a',
+    })
+    .option('skip-draft', {
+      type: 'boolean',
+      description: 'Skip draft pull requests',
+      default: true,
+      alias: 'd',
+    })
+    .option('skip-approved', {
+      type: 'boolean',
+      description: 'Skip pull requests that already have approvals',
+      default: true,
+    })
+    .option('concurrency', {
+      type: 'number',
+      description: 'Number of concurrent review.mjs instances',
+      default: 2,
+      alias: 'c',
+    })
+    .option('reviews-per-pr', {
+      type: 'number',
+      description: 'Number of reviews to generate per PR (for diverse perspectives)',
+      default: 1,
+      alias: 'r',
+    })
+    .option('model', {
+      type: 'string',
+      description: 'Model to use for review.mjs (opus or sonnet)',
+      alias: 'm',
+      default: 'opus',
+      choices: ['opus', 'sonnet'],
+    })
+    .option('focus', {
+      type: 'string',
+      description: 'Focus areas for reviews (security, performance, logic, style, tests, all)',
+      default: 'all',
+      alias: 'f',
+    })
+    .option('auto-approve', {
+      type: 'boolean',
+      description: 'Auto-approve PRs that pass review criteria',
+      default: false,
+    })
+    .option('interval', {
+      type: 'number',
+      description: 'Polling interval in seconds',
+      default: 300, // 5 minutes
+      alias: 'i',
+    })
+    .option('max-prs', {
+      type: 'number',
+      description: 'Maximum number of PRs to process (0 = unlimited)',
+      default: 0,
+    })
+    .option('dry-run', {
+      type: 'boolean',
+      description: 'List PRs that would be reviewed without actually reviewing them',
+      default: false,
+    })
+    .option('verbose', {
+      type: 'boolean',
+      description: 'Enable verbose logging',
+      alias: 'v',
+      default: false,
+    })
+    .option('once', {
+      type: 'boolean',
+      description: 'Run once and exit instead of continuous monitoring',
+      default: false,
+    })
+    .demandCommand(1, 'GitHub URL is required')
+    .help('h')
+    .alias('h', 'help');
+
+if (process.argv.includes('--help') || process.argv.includes('-h')) {
+  const helpYargs = createReviewersHiveYargsConfig(getLinoYargsFactory()(hideBin(process.argv)));
+  helpYargs.showHelp();
+  process.exit(0);
+}
+
+const argv = parseCliArgumentsWithLino({
+  argv: process.argv,
+  commandName: 'reviewers-hive',
+  createYargsConfig: createReviewersHiveYargsConfig,
+  positionalAliases: ['github-url'],
+});
+
+const githubUrl = argv['github-url'] || argv.githubUrl || argv._[0];
 
 // Set global verbose mode
 global.verboseMode = argv.verbose;

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

@@ -59,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');
@@ -594,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,
@@ -891,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.config.lib.mjs

@@ -10,23 +10,13 @@
 import { enhanceErrorMessage, detectMalformedFlags } from './option-suggestions.lib.mjs';
 import { defaultModels, buildModelOptionDescription, resolveDefaultFallbackModel, resolveRuntimeDefaultModel } from './models/index.mjs';
 import { validateBranchName } from './solve.branch.lib.mjs';
-import { resolveYargsFactory } from './yargs-factory.lib.mjs';
+import { getLinoYargsFactory, hideBin, parseCliArgumentsWithLino } from './cli-arguments.lib.mjs';
 
 // Re-export for use by telegram-bot.mjs (avoids extra import lines there)
 export { detectMalformedFlags };
 
 // Export an initialization function that accepts 'use'
-export const initializeConfig = async use => {
-  // Import yargs with specific version for hideBin support
-  const yargsModule = await use('yargs@17.7.2');
-  const yargs = resolveYargsFactory(yargsModule);
-  const helpersModule = await use('yargs@17.7.2/helpers');
-  // Node 24 CJS/ESM interop may return the whole module object instead of named exports directly
-  const helpers = helpersModule.default || helpersModule;
-  const hideBin = helpers.hideBin || (argv => argv.slice(2));
-
-  return { yargs, hideBin };
-};
+export const initializeConfig = async () => ({ yargs: getLinoYargsFactory(), hideBin });
 
 // Solve option definitions as a plain data structure.
 // This is the single source of truth for all solve command options.
@@ -498,12 +488,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': {
@@ -582,8 +572,8 @@ export const createYargsConfig = yargsInstance => {
 };
 
 // Parse command line arguments - now needs yargs and hideBin passed in
-export const parseArguments = async (yargs, hideBin) => {
-  const rawArgs = hideBin(process.argv);
+export const parseArguments = async (yargs = getLinoYargsFactory(), hideBinFn = hideBin) => {
+  const rawArgs = hideBinFn(process.argv);
 
   // Issue #1092: Detect malformed flag patterns BEFORE yargs parsing
   // This catches cases like "-- model" which yargs silently treats as positional arguments
@@ -621,7 +611,12 @@ export const parseArguments = async (yargs, hideBin) => {
 
     try {
       yargsInstance = createYargsConfig(yargs());
-      argv = await yargsInstance.parse(rawArgs);
+      argv = parseCliArgumentsWithLino({
+        argv: process.argv,
+        commandName: 'solve',
+        createYargsConfig,
+        positionalAliases: ['issue-url'],
+      });
     } finally {
       // Always restore stderr.write
       process.stderr.write = originalStderrWrite;

package/src/solve.mjs

@@ -31,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');
@@ -1106,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.results.lib.mjs

@@ -1179,11 +1179,17 @@ export const checkForAiCreatedComments = async (sessionStartTime, owner, repo, p
 };
 
 /**
- * Attach the AI's solution summary as a comment to the PR or issue.
+ * Attach the AI's working session summary as a comment to the PR or issue.
  * The summary is extracted from the tool's result field and posted
- * with a "Solution summary" header.
+ * with a "Working session summary" header.
  *
  * Issue #1263: Support for --attach-solution-summary and --auto-attach-solution-summary
+ * Issue #1728: Renamed comment header from "Solution summary" to "Working session
+ * summary" so it accurately describes continuation/restart iterations too. CLI
+ * flag names are preserved for backwards compatibility. Posting now uses
+ * postTrackedComment so the comment ID is registered in the in-memory tool-
+ * comment set — that way the next iteration's --auto-attach-solution-summary
+ * check doesn't mistake a previous iteration's summary for an AI comment.
  *
  * @param {Object} options - Options object
  * @param {string} options.resultSummary - The AI's result summary text
@@ -1195,34 +1201,33 @@ export const checkForAiCreatedComments = async (sessionStartTime, owner, repo, p
  */
 export const attachSolutionSummary = async ({ resultSummary, prNumber, issueNumber, owner, repo }) => {
   if (!resultSummary || typeof resultSummary !== 'string') {
-    await log('⚠️  No solution summary available to attach', { verbose: true });
+    await log('⚠️  No working session summary available to attach', { verbose: true });
     return false;
   }
 
   const targetNumber = prNumber || issueNumber;
   const targetType = prNumber ? 'pr' : 'issue';
-  const ghCommand = prNumber ? 'pr' : 'issue';
 
   if (!targetNumber) {
-    await log('⚠️  No PR or issue number to attach solution summary to', { verbose: true });
+    await log('⚠️  No PR or issue number to attach working session summary to', { verbose: true });
     return false;
   }
 
   try {
-    const comment = `## Solution summary
+    const comment = `## Working session summary
 
 ${resultSummary}
 
 ---
 *This summary was automatically extracted from the AI working session output.*`;
 
-    const result = await $`gh ${ghCommand} comment ${targetNumber} --repo ${owner}/${repo} --body ${comment}`;
+    const { ok, commentId, stderr } = await postTrackedComment({ $, owner, repo, targetNumber, body: comment });
 
-    if (result.code === 0) {
-      await log(`✅ Solution summary attached to ${targetType} #${targetNumber}`);
+    if (ok) {
+      await log(`✅ Working session summary attached to ${targetType} #${targetNumber}${commentId ? ` (id=${commentId})` : ''}`);
       return true;
     } else {
-      await log(`⚠️  Failed to attach solution summary: ${result.stderr?.toString() || 'Unknown error'}`, {
+      await log(`⚠️  Failed to attach working session summary: ${stderr || 'Unknown error'}`, {
         level: 'warning',
       });
       return false;
@@ -1232,9 +1237,78 @@ ${resultSummary}
       context: 'attach_solution_summary',
       targetType,
       targetNumber,
-      operation: 'post_solution_summary_comment',
+      operation: 'post_working_session_summary_comment',
     });
-    await log(`⚠️  Error attaching solution summary: ${error.message}`, { level: 'warning' });
+    await log(`⚠️  Error attaching working session summary: ${error.message}`, { level: 'warning' });
     return false;
   }
 };
+
+/**
+ * Decide whether to attach a working session summary for a single working
+ * session and, if so, post it. Single source of truth for the attach decision
+ * shared by every working-session call site:
+ *
+ *   - solve.mjs (top-level, end-of-run)
+ *   - solve.auto-merge.lib.mjs (auto-restart-until-mergeable iterations)
+ *   - solve.watch.lib.mjs (watch / temporary auto-restart iterations)
+ *
+ * Issue #1728: Before this helper, only solve.mjs ran the attach decision, so
+ * iterations inside auto-restart-until-mergeable / watch silently dropped the
+ * AI's `resultSummary` whenever the AI itself posted no comment. Centralising
+ * the decision here means every working session ends with either an AI-authored
+ * comment OR an automated "Working session summary" comment, matching the
+ * issue's "unify logic for all working sessions" requirement.
+ *
+ * @param {Object} options
+ * @param {Object} options.argv - parsed CLI arguments (reads attachSolutionSummary
+ *   and autoAttachSolutionSummary; flag names preserved for backwards compat)
+ * @param {string|null|undefined} options.resultSummary - AI's last-message summary
+ * @param {Date} options.workStartTime - the iteration's own start time, used to
+ *   scope the AI-comment check to this iteration only
+ * @param {string} options.owner
+ * @param {string} options.repo
+ * @param {number|null} options.prNumber
+ * @param {number|null} options.issueNumber
+ * @param {boolean} [options.success=true] - skip attachment for failed iterations
+ * @returns {Promise<{attached: boolean, reason: string}>}
+ */
+export const maybeAttachWorkingSessionSummary = async ({ argv, resultSummary, workStartTime, owner, repo, prNumber, issueNumber, success = true }) => {
+  if (!success) {
+    return { attached: false, reason: 'iteration_failed' };
+  }
+
+  const attachFlag = argv && (argv.attachSolutionSummary || argv['attach-solution-summary']);
+  const autoAttachFlag = argv && (argv.autoAttachSolutionSummary || argv['auto-attach-solution-summary']);
+
+  if (!attachFlag && !autoAttachFlag) {
+    return { attached: false, reason: 'flag_disabled' };
+  }
+
+  if (!resultSummary || typeof resultSummary !== 'string') {
+    await log('ℹ️  No working session summary available from AI tool output', { verbose: true });
+    return { attached: false, reason: 'no_result_summary' };
+  }
+
+  let shouldAttach = false;
+  if (attachFlag) {
+    shouldAttach = true;
+    await log('📝 --attach-solution-summary enabled, attaching working session summary...');
+  } else if (autoAttachFlag) {
+    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 working session summary attachment');
+      return { attached: false, reason: 'ai_comments_present' };
+    }
+    shouldAttach = true;
+    await log('📝 No AI comments detected, attaching working session summary...');
+  }
+
+  if (!shouldAttach) {
+    return { attached: false, reason: 'no_attach_decision' };
+  }
+
+  const ok = await attachSolutionSummary({ resultSummary, prNumber, issueNumber, owner, repo });
+  return { attached: !!ok, reason: ok ? 'attached' : 'post_failed' };
+};

package/src/solve.watch.lib.mjs

@@ -46,6 +46,10 @@ const { formatAutoIterationLimit, hasReachedAutoIterationLimit, normalizeAutoIte
 const toolComments = await import('./tool-comments.lib.mjs');
 const { AUTO_RESTART_MARKER, postTrackedComment } = toolComments;
 
+// Issue #1728: Per-iteration working session summary attachment helper
+const resultsLib = await import('./solve.results.lib.mjs');
+const { maybeAttachWorkingSessionSummary } = resultsLib;
+
 /**
  * Monitor for feedback in a loop and trigger restart when detected
  */
@@ -232,6 +236,10 @@ export const watchForFeedback = async params => {
           await log(formatAligned('🔄', 'Restarting:', `Re-running ${argv.tool.toUpperCase()} to handle feedback...`));
         }
 
+        // 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();
+
         // Execute tool using shared utility
         const toolResult = await executeToolIteration({
           issueUrl,
@@ -424,6 +432,34 @@ export const watchForFeedback = async params => {
             }
           }
 
+          // 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).
+          // Same fix as in solve.auto-merge.lib.mjs — every working session,
+          // not just the top-level run, should honour the auto-attach flag.
+          try {
+            await maybeAttachWorkingSessionSummary({
+              argv,
+              resultSummary: toolResult.resultSummary,
+              workStartTime: iterationStartTime,
+              owner,
+              repo,
+              prNumber,
+              issueNumber,
+              success: true,
+            });
+          } catch (summaryError) {
+            reportError(summaryError, {
+              context: 'attach_watch_working_session_summary',
+              prNumber,
+              owner,
+              repo,
+              autoRestartCount,
+              operation: 'attach_working_session_summary',
+            });
+            await log(formatAligned('', `⚠️  Working session summary error: ${cleanErrorMessage(summaryError)}`, '', 2));
+          }
+
           await log('');
           if (isTemporaryWatch) {
             await log(formatAligned('✅', `${argv.tool.toUpperCase()} execution completed:`, 'Checking for remaining changes...'));