@link-assistant/hive-mind 1.53.0 → 1.53.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @link-assistant/hive-mind
 
+## 1.53.1
+
+### Patch Changes
+
+- c0e8c6d: Fix `--auto-attach-solution-summary` falsely detecting solve.mjs's own session bookkeeping comments ("AI Work Session Started", "Solution Draft Log", "Auto-restart", "Ready to merge", etc.) as AI-authored comments, which caused the solution summary to always be suppressed even when the AI session produced no comments of its own.
+
+  The fix introduces a new `src/tool-comments.lib.mjs` module as the single source of truth for every marker string embedded in tool-posted comments, along with in-memory tracking of the GitHub comment IDs that solve.mjs itself creates during a session. `checkForAiCreatedComments` now uses the tracked ID set as the primary filter — any comment the tool posted in this session is excluded regardless of body text — and falls back to marker-based substring matching only when an ID was not captured.
+
+  Every tool-posting site (`solve.session.lib.mjs`, `solve.auto-merge.lib.mjs`, `solve.watch.lib.mjs`, `github.lib.mjs`'s `attachLogToGitHub`/`attachTruncatedLog`/`attachRegularComment`, `claude.lib.mjs`'s force-kill notice, `interactive-mode.lib.mjs`, `solve.progress-monitoring.lib.mjs`, `solve.repo-setup.lib.mjs`, `solve.repository.lib.mjs`, and `solve.mjs`'s usage-limit notifications) now routes through `postTrackedComment` / `postTrackedCommentFromFile`, so every solve-posted comment is registered and filtered correctly across all supported AI tools (claude, codex, agent, opencode). See issue #1625.
+
 ## 1.53.0
 
 ### Minor Changes

package/package.json

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

package/src/claude.lib.mjs

@@ -16,6 +16,7 @@ import { sanitizeObjectStrings } from './unicode-sanitization.lib.mjs';
 import Decimal from 'decimal.js-light';
 import { displayBudgetStats, createEmptySubSessionUsage, accumulateModelUsage, displayModelUsage, displayCostComparison, mergeResultModelUsage, createSubAgentCallEntry, accumulateSubAgentUsage } from './claude.budget-stats.lib.mjs';
 import { buildClaudeResumeCommand } from './claude.command-builder.lib.mjs';
+import { SESSION_FORCE_KILLED_MARKER, postTrackedComment } from './tool-comments.lib.mjs'; // Issue #1625
 import { handleClaudeRuntimeSwitch } from './claude.runtime-switch.lib.mjs'; // see issue #1141
 import { CLAUDE_MODELS as availableModels } from './models/index.mjs'; // Issue #1221
 import { buildMcpConfigWithoutPlaywright } from './playwright-mcp.lib.mjs';
@@ -1207,9 +1208,9 @@ export const executeClaudeCommand = async params => {
               const timeoutType = isActivityTimeout ? 'activity' : 'startup';
               const sessionInfo = sessionId ? `\nSession ID: \`${sessionId}\`` : '';
               const resumeInfo = isStartupTimeout ? 'Session will be restarted (fresh start).' : `Session will be resumed with \`--resume\` (context preserved).`;
-              const commentBody = `## :warning: Session Force-Killed (${timeoutType} timeout)\n\nThe working session was force-killed due to ${timeoutType} timeout (no stream output for ${isActivityTimeout ? timeouts.streamActivityMs / 1000 : timeouts.streamStartupMs / 1000}s).\n\n**Auto-resuming**: Retry ${retryCount + 1}/${maxRetries} in ${delayLabel}. ${resumeInfo}${sessionInfo}\n\n*This is an automated notification — the session will continue automatically.*`;
-              await $`gh pr comment ${prNumber} --repo ${owner}/${repo} --body ${commentBody}`;
-              await log(`   Posted force-kill notification to PR #${prNumber}`, { verbose: true });
+              const commentBody = `## :warning: ${SESSION_FORCE_KILLED_MARKER} (${timeoutType} timeout)\n\nThe working session was force-killed due to ${timeoutType} timeout (no stream output for ${isActivityTimeout ? timeouts.streamActivityMs / 1000 : timeouts.streamStartupMs / 1000}s).\n\n**Auto-resuming**: Retry ${retryCount + 1}/${maxRetries} in ${delayLabel}. ${resumeInfo}${sessionInfo}\n\n*This is an automated notification — the session will continue automatically.*`;
+              const posted = await postTrackedComment({ $, owner, repo, targetNumber: prNumber, body: commentBody });
+              await log(posted.ok ? `   Posted force-kill notification to PR #${prNumber}${posted.commentId ? ` (id=${posted.commentId})` : ''}` : `   Warning: Could not post force-kill comment to PR: ${posted.stderr || 'unknown error'}`, { verbose: true });
             } catch (commentError) {
               await log(`   Warning: Could not post force-kill comment to PR: ${commentError.message}`, { verbose: true });
             }

package/src/github.lib.mjs

@@ -16,6 +16,9 @@ export { getToolDisplayName }; // Re-export for use by other modules
 import { buildBudgetStatsString } from './claude.budget-stats.lib.mjs';
 import { buildCostInfoString } from './github-cost-info.lib.mjs';
 export { buildCostInfoString };
+// Issue #1625: Named marker constants (single source of truth) + in-memory
+// tracking for tool-posted comments. See tool-comments.lib.mjs for design.
+import { SOLUTION_DRAFT_LOG_MARKER, SOLUTION_DRAFT_FAILED_MARKER, SOLUTION_DRAFT_FINISHED_WITH_ERRORS_MARKER, USAGE_LIMIT_REACHED_MARKER, NOW_WORKING_SESSION_IS_ENDED_MARKER, postTrackedComment, postTrackedCommentFromFile } from './tool-comments.lib.mjs';
 export const maskGitHubToken = maskToken; // Alias for backward compatibility
 export const escapeCodeBlocksInLog = logContent => logContent.replace(/```/g, '\\`\\`\\`'); // Escape ``` in logs
 export const checkFileInBranch = async (owner, repo, fileName, branchName) => {
@@ -260,13 +263,16 @@ Could you please enable the **"Allow edits by maintainers"** checkbox? This will
 3. Check the box ✅
 Alternatively, you can enable it when creating/editing the PR. See: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork
 Thank you! 🙏`;
-    const commentResult = await $`gh pr comment ${prNumber} --repo ${owner}/${repo} --body ${commentBody}`;
-    if (commentResult.code === 0) {
-      await log('✅ Comment posted successfully', { verbose: true });
+    // Issue #1625: track this comment so it's not counted as AI-authored by
+    // --auto-attach-solution-summary. The "Allow edits by maintainers"
+    // phrase embedded above matches MAINTAINER_ACCESS_REQUEST_MARKER as a
+    // fallback if the ID capture fails.
+    const posted = await postTrackedComment({ $, owner, repo, targetNumber: prNumber, body: commentBody });
+    if (posted.ok) {
+      await log(`✅ Comment posted successfully${posted.commentId ? ` (id=${posted.commentId})` : ''}`, { verbose: true });
       return true;
     } else {
-      const errorOutput = (commentResult.stderr ? commentResult.stderr.toString() : '') + (commentResult.stdout ? commentResult.stdout.toString() : '');
-      await log(`⚠️  Warning: Failed to post comment: ${cleanErrorMessage(errorOutput)}`, { level: 'warning' });
+      await log(`⚠️  Warning: Failed to post comment: ${cleanErrorMessage(posted.stderr || 'unknown error')}`, { level: 'warning' });
       return false;
     }
   } catch (error) {
@@ -295,7 +301,7 @@ export async function attachLogToGitHub(options) {
     sanitizeLogContent,
     verbose = false,
     errorMessage,
-    customTitle = '🤖 Solution Draft Log',
+    customTitle = `🤖 ${SOLUTION_DRAFT_LOG_MARKER}`,
     sessionId = null,
     tempDir = null,
     anthropicTotalCostUSD = null,
@@ -316,7 +322,6 @@ export async function attachLogToGitHub(options) {
   } = options;
   const budgetStats = budgetStatsData ? buildBudgetStatsString(budgetStatsData.tokenUsage, budgetStatsData.subAgentCalls) : '';
   const targetName = targetType === 'pr' ? 'Pull Request' : 'Issue';
-  const ghCommand = targetType === 'pr' ? 'pr' : 'issue';
   try {
     // Issue #1212: Check disk space before attempting log upload (100MB minimum)
     try {
@@ -411,7 +416,7 @@ export async function attachLogToGitHub(options) {
     // regardless of whether a generic errorMessage is provided.
     if (isUsageLimit) {
       // Usage limit error format - separate from general failures
-      logComment = `## ⏳ Usage Limit Reached
+      logComment = `## ⏳ ${USAGE_LIMIT_REACHED_MARKER}
 
 The automated solution draft was interrupted because the ${toolName} usage limit was reached.
 
@@ -477,7 +482,7 @@ ${logContent}
 ${footerNote}`;
     } else if (errorMessage) {
       // Failure log format (non-usage-limit errors)
-      logComment = `## 🚨 Solution Draft Failed
+      logComment = `## 🚨 ${SOLUTION_DRAFT_FAILED_MARKER}
 The automated solution draft encountered an error:
 \`\`\`
 ${errorMessage}
@@ -493,11 +498,11 @@ ${logContent}
 </details>
 
 ---
-*Now working session is ended, feel free to review and add any feedback on the solution draft.*`;
+*${NOW_WORKING_SESSION_IS_ENDED_MARKER}, feel free to review and add any feedback on the solution draft.*`;
     } else if (errorDuringExecution) {
       // Issue #1088: "Finished with errors" format - work may have been completed but errors occurred
       const costInfo = buildCostInfoString(totalCostUSD, anthropicTotalCostUSD, pricingInfo);
-      logComment = `## ⚠️ Solution Draft Finished with Errors
+      logComment = `## ⚠️ ${SOLUTION_DRAFT_FINISHED_WITH_ERRORS_MARKER}
 This log file contains the complete execution trace of the AI ${targetType === 'pr' ? 'solution draft' : 'analysis'} process.${costInfo}${budgetStats}${modelInfoString}
 
 > **Note**: The session encountered errors during execution, but some work may have been completed. Please review the changes carefully.
@@ -512,20 +517,23 @@ ${logContent}
 </details>
 
 ---
-*Now working session is ended, feel free to review and add any feedback on the solution draft.*`;
+*${NOW_WORKING_SESSION_IS_ENDED_MARKER}, feel free to review and add any feedback on the solution draft.*`;
     } else {
       const costInfo = buildCostInfoString(totalCostUSD, anthropicTotalCostUSD, pricingInfo);
       // Determine title based on session type (Issue #1152)
+      // Issue #1625: Every title variant embeds SOLUTION_DRAFT_LOG_MARKER so
+      // the filter in checkForAiCreatedComments matches every variant with a
+      // single substring check against the centralized marker constant.
       let title = customTitle;
       let sessionNote = '';
       if (sessionType === 'auto-resume') {
-        title = '🔄 Draft log of auto resume (on limit reset)';
+        title = `🔄 ${SOLUTION_DRAFT_LOG_MARKER} (auto resume on limit reset)`;
         sessionNote = '\n\n**Note**: This session was automatically resumed after a usage limit reset, with the previous context preserved.';
       } else if (sessionType === 'auto-restart') {
-        title = '🔄 Draft log of auto restart (on limit reset)';
+        title = `🔄 ${SOLUTION_DRAFT_LOG_MARKER} (auto restart on limit reset)`;
         sessionNote = '\n\n**Note**: This session was automatically restarted after a usage limit reset (fresh start).';
       } else if (sessionType === 'resume') {
-        title = '🔄 Solution Draft Log (Resumed)';
+        title = `🔄 ${SOLUTION_DRAFT_LOG_MARKER} (Resumed)`;
         sessionNote = '\n\n**Note**: This session was manually resumed using the --resume flag.';
       }
       logComment = `## ${title}
@@ -541,11 +549,10 @@ ${logContent}
 </details>
 
 ---
-*Now working session is ended, feel free to review and add any feedback on the solution draft.*`;
+*${NOW_WORKING_SESSION_IS_ENDED_MARKER}, feel free to review and add any feedback on the solution draft.*`;
     }
     // Check GitHub comment size limit or large file mode
     // Issue #1173: Also use gh-upload-log for large files, not just long comments
-    let commentResult;
     if (useLargeFileMode || logComment.length > githubLimits.commentMaxSize) {
       if (useLargeFileMode) {
         await log(`  📁 Log file too large for inline comment (${Math.round(logStats.size / 1024 / 1024)}MB), using gh-upload-log`);
@@ -604,7 +611,7 @@ ${logContent}
           // For usage limit cases, always use the dedicated format regardless of errorMessage
           if (isUsageLimit) {
             // Usage limit error format
-            logUploadComment = `## ⏳ Usage Limit Reached
+            logUploadComment = `## ⏳ ${USAGE_LIMIT_REACHED_MARKER}
 
 The automated solution draft was interrupted because the ${toolName} usage limit was reached.
 
@@ -664,7 +671,7 @@ ${resumeCommand}
 ${uploadFooterNote}`;
           } else if (errorMessage) {
             // Failure log format (non-usage-limit errors)
-            logUploadComment = `## 🚨 Solution Draft Failed
+            logUploadComment = `## 🚨 ${SOLUTION_DRAFT_FAILED_MARKER}
 The automated solution draft encountered an error:
 \`\`\`
 ${errorMessage}
@@ -674,11 +681,11 @@ ${errorMessage}
 - [View complete failure log](${logUrl})
 
 ---
-*Now working session is ended, feel free to review and add any feedback on the solution draft.*`;
+*${NOW_WORKING_SESSION_IS_ENDED_MARKER}, feel free to review and add any feedback on the solution draft.*`;
           } else if (errorDuringExecution) {
             // Issue #1088: "Finished with errors" format - work may have been completed but errors occurred
             const costInfo = buildCostInfoString(totalCostUSD, anthropicTotalCostUSD, pricingInfo);
-            logUploadComment = `## ⚠️ Solution Draft Finished with Errors
+            logUploadComment = `## ⚠️ ${SOLUTION_DRAFT_FINISHED_WITH_ERRORS_MARKER}
 This log file contains the complete execution trace of the AI ${targetType === 'pr' ? 'solution draft' : 'analysis'} process.${costInfo}${budgetStats}${modelInfoString}
 
 > **Note**: The session encountered errors during execution, but some work may have been completed. Please review the changes carefully.
@@ -687,22 +694,23 @@ This log file contains the complete execution trace of the AI ${targetType === '
 - [View complete solution draft log](${logUrl})
 
 ---
-*Now working session is ended, feel free to review and add any feedback on the solution draft.*`;
+*${NOW_WORKING_SESSION_IS_ENDED_MARKER}, feel free to review and add any feedback on the solution draft.*`;
           } else {
             // Success log format - use helper function for cost info
             const costInfo = buildCostInfoString(totalCostUSD, anthropicTotalCostUSD, pricingInfo);
             // Determine title based on session type
             // See: https://github.com/link-assistant/hive-mind/issues/1152
+            // Issue #1625: titles embed SOLUTION_DRAFT_LOG_MARKER (single source).
             let title = customTitle;
             let sessionNote = '';
             if (sessionType === 'auto-resume') {
-              title = '🔄 Draft log of auto resume (on limit reset)';
+              title = `🔄 ${SOLUTION_DRAFT_LOG_MARKER} (auto resume on limit reset)`;
               sessionNote = '\n**Note**: This session was automatically resumed after a usage limit reset, with the previous context preserved.\n';
             } else if (sessionType === 'auto-restart') {
-              title = '🔄 Draft log of auto restart (on limit reset)';
+              title = `🔄 ${SOLUTION_DRAFT_LOG_MARKER} (auto restart on limit reset)`;
               sessionNote = '\n**Note**: This session was automatically restarted after a usage limit reset (fresh start).\n';
             } else if (sessionType === 'resume') {
-              title = '🔄 Solution Draft Log (Resumed)';
+              title = `🔄 ${SOLUTION_DRAFT_LOG_MARKER} (Resumed)`;
               sessionNote = '\n**Note**: This session was manually resumed using the --resume flag.\n';
             }
             logUploadComment = `## ${title}
@@ -712,19 +720,22 @@ ${sessionNote}
 - [View complete solution draft log](${logUrl})
 
 ---
-*Now working session is ended, feel free to review and add any feedback on the solution draft.*`;
+*${NOW_WORKING_SESSION_IS_ENDED_MARKER}, feel free to review and add any feedback on the solution draft.*`;
           }
           const tempCommentFile = `/tmp/log-upload-comment-${targetType}-${Date.now()}.md`;
           await fs.writeFile(tempCommentFile, logUploadComment);
-          commentResult = await $`gh ${ghCommand} comment ${targetNumber} --repo ${owner}/${repo} --body-file "${tempCommentFile}"`;
+          // Issue #1625: post via postTrackedCommentFromFile so the returned
+          // comment ID is registered in-memory and excluded from the
+          // "did the AI post anything?" check.
+          const posted = await postTrackedCommentFromFile({ $, owner, repo, targetNumber, bodyFile: tempCommentFile });
           await fs.unlink(tempCommentFile).catch(() => {});
-          if (commentResult.code === 0) {
-            await log(`  ✅ Solution draft log uploaded to ${targetName} as ${isPublicRepo ? 'public' : 'private'} ${uploadTypeLabel}${chunkInfo}`);
+          if (posted.ok) {
+            await log(`  ✅ Solution draft log uploaded to ${targetName} as ${isPublicRepo ? 'public' : 'private'} ${uploadTypeLabel}${chunkInfo}${posted.commentId ? ` (comment id=${posted.commentId})` : ''}`);
             await log(`  🔗 Log URL: ${logUrl}`);
             await log(`  📊 Log size: ${Math.round(logStats.size / 1024)}KB`);
             return true;
           } else {
-            await log(`  ❌ Failed to post comment with log link: ${commentResult.stderr ? commentResult.stderr.toString().trim() : 'unknown error'}`);
+            await log(`  ❌ Failed to post comment with log link: ${posted.stderr || 'unknown error'}`);
             return false;
           }
         } else {
@@ -774,7 +785,7 @@ async function attachTruncatedLog(options) {
   const maxContentLength = GITHUB_COMMENT_LIMIT - 500;
   const truncatedContent = logContent.substring(0, maxContentLength) + '\n\n[... Log truncated due to length ...]';
 
-  const truncatedComment = `## 🤖 Solution Draft Log (Truncated)
+  const truncatedComment = `## 🤖 ${SOLUTION_DRAFT_LOG_MARKER} (Truncated)
 This log file contains the complete execution trace of the AI ${targetType === 'pr' ? 'solution draft' : 'analysis'} process.
 ⚠️ **Log was truncated** due to GitHub comment size limits.
 
@@ -788,20 +799,23 @@ ${truncatedContent}
 </details>
 
 ---
-*Now working session is ended, feel free to review and add any feedback on the solution draft.*`;
+*${NOW_WORKING_SESSION_IS_ENDED_MARKER}, feel free to review and add any feedback on the solution draft.*`;
   const tempFile = `/tmp/log-truncated-comment-${targetType}-${Date.now()}.md`;
   await fs.writeFile(tempFile, truncatedComment);
 
-  const result = await $`gh ${ghCommand} comment ${targetNumber} --repo ${owner}/${repo} --body-file "${tempFile}"`;
-
+  // Issue #1625: track the posted comment ID so it's excluded from the
+  // AI-authored-comment check in --auto-attach-solution-summary.
+  const posted = await postTrackedCommentFromFile({ $, owner, repo, targetNumber, bodyFile: tempFile });
   await fs.unlink(tempFile).catch(() => {});
-
-  if (result.code === 0) {
-    await log(`  ✅ Truncated solution draft log uploaded to ${targetName}`);
+  // ghCommand and targetName are retained in signature for symmetry with
+  // attachLogToGitHub's logging vocabulary.
+  void ghCommand;
+  if (posted.ok) {
+    await log(`  ✅ Truncated solution draft log uploaded to ${targetName}${posted.commentId ? ` (comment id=${posted.commentId})` : ''}`);
     await log(`  📊 Log size: ${Math.round(logStats.size / 1024)}KB (truncated)`);
     return true;
   } else {
-    await log(`  ❌ Failed to upload truncated log: ${result.stderr ? result.stderr.toString().trim() : 'unknown error'}`);
+    await log(`  ❌ Failed to upload truncated log: ${posted.stderr || 'unknown error'}`);
     return false;
   }
 }
@@ -814,21 +828,23 @@ async function attachRegularComment(options, logComment) {
 
   const targetName = targetType === 'pr' ? 'Pull Request' : 'Issue';
   const ghCommand = targetType === 'pr' ? 'pr' : 'issue';
+  void ghCommand;
   const logStats = await fs.stat(logFile);
 
   const tempFile = `/tmp/log-comment-${targetType}-${Date.now()}.md`;
   await fs.writeFile(tempFile, logComment);
 
-  const result = await $`gh ${ghCommand} comment ${targetNumber} --repo ${owner}/${repo} --body-file "${tempFile}"`;
-
+  // Issue #1625: track the posted comment ID so it's excluded from the
+  // AI-authored-comment check in --auto-attach-solution-summary.
+  const posted = await postTrackedCommentFromFile({ $, owner, repo, targetNumber, bodyFile: tempFile });
   await fs.unlink(tempFile).catch(() => {});
 
-  if (result.code === 0) {
-    await log(`  ✅ Solution draft log uploaded to ${targetName} as comment`);
+  if (posted.ok) {
+    await log(`  ✅ Solution draft log uploaded to ${targetName} as comment${posted.commentId ? ` (id=${posted.commentId})` : ''}`);
     await log(`  📊 Log size: ${Math.round(logStats.size / 1024)}KB`);
     return true;
   } else {
-    await log(`  ❌ Failed to upload log to ${targetName}: ${result.stderr ? result.stderr.toString().trim() : 'unknown error'}`);
+    await log(`  ❌ Failed to upload log to ${targetName}: ${posted.stderr || 'unknown error'}`);
     return false;
   }
 }

package/src/interactive-mode.lib.mjs

@@ -33,6 +33,11 @@
  */
 
 import { CONFIG, createCollapsible, createRawJsonSection, escapeMarkdown, execFileAsync, formatCost, formatDuration, getToolIcon, safeJsonStringify, sanitizeUnicode, truncateMiddle } from './interactive-mode.shared.lib.mjs';
+// Issue #1625: track interactive-mode comment IDs so they're excluded from
+// the "did the AI post anything?" check in checkForAiCreatedComments().
+// Use the session-started marker as the single source of truth for the
+// header string, keeping posting and filtering in lock-step.
+import { INTERACTIVE_SESSION_STARTED_MARKER, trackToolCommentId } from './tool-comments.lib.mjs';
 
 /**
  * Creates an interactive mode handler for processing Claude/Codex CLI events
@@ -136,6 +141,11 @@ export const createInteractiveHandler = options => {
         commentId = match ? match[1] || match[2] : null;
       }
 
+      // Issue #1625: register this comment ID in the shared in-memory tracking
+      // set so --auto-attach-solution-summary correctly excludes it from the
+      // AI-authored-comment check. Tracking is a no-op when commentId is null.
+      trackToolCommentId(commentId);
+
       if (verbose) {
         await log(`✅ Interactive mode: Comment posted${commentId ? ` (ID: ${commentId})` : ''} (body: ${body.length} chars)`, { verbose: true });
       }
@@ -288,7 +298,7 @@ export const createInteractiveHandler = options => {
     const agents = data.agents || [];
     const agentsList = agents.length > 0 ? agents.map(a => `\`${a}\``).join(', ') : '_None_';
 
-    const comment = `## 🚀 Interactive session started
+    const comment = `## 🚀 ${INTERACTIVE_SESSION_STARTED_MARKER}
 
 | Property | Value |
 |----------|-------|
@@ -989,7 +999,7 @@ ${createRawJsonSection(data)}`;
     state.sessionId = data.thread_id || data.session_id || null;
     state.startTime = Date.now();
 
-    const comment = `## 🚀 Interactive session started
+    const comment = `## 🚀 ${INTERACTIVE_SESSION_STARTED_MARKER}
 
 | Property | Value |
 |----------|-------|

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

@@ -35,6 +35,12 @@ const { reportError } = sentryLib;
 const githubMergeLib = await import('./github-merge.lib.mjs');
 const { checkPRMergeable, checkForBillingLimitError, getDetailedCIStatus, getWorkflowRunsForSha, getActiveRepoWorkflows, getCommitDate, checkWorkflowsHavePRTriggers, checkPreviousPRCommitsHadCI } = githubMergeLib;
 
+// Issue #1625: Import centralized session-ending markers so the duplicate-
+// search scope for checkForExistingComment() stays in lock-step with the
+// markers actually embedded in tool-posted comments.
+const toolComments = await import('./tool-comments.lib.mjs');
+const { SESSION_ENDING_MARKERS } = toolComments;
+
 /**
  * Issue #1323: Check if a comment with specific content already exists on the PR
  * This prevents duplicate status comments when multiple processes or restarts occur
@@ -85,14 +91,11 @@ export const checkForExistingComment = async (owner, repo, prNumber, commentSign
       // Session-ending markers indicate the end of a working session,
       // so any "Ready to merge" before it belongs to a previous session.
       //
-      // Session-ending markers:
-      // - "Now working session is ended" — in all log upload comments
-      //   (Solution Draft Log, Auto-restart Log, Auto-restart-until-mergeable Log, etc.)
-      // - "AI Work Session Completed" — posted when logs are not attached
-      const sessionEndingMarkers = ['Now working session is ended', 'AI Work Session Completed'];
+      // Issue #1625: Session-ending markers are now imported from
+      // tool-comments.lib.mjs (single source of truth for all markers).
       let searchStartIndex = 0;
       for (let i = commentBodies.length - 1; i >= 0; i--) {
-        if (commentBodies[i] && sessionEndingMarkers.some(marker => commentBodies[i].includes(marker))) {
+        if (commentBodies[i] && SESSION_ENDING_MARKERS.some(marker => commentBodies[i].includes(marker))) {
           searchStartIndex = i + 1;
           if (verbose) {
             console.log(`[VERBOSE] Found last session-ending comment at index ${i}, searching from index ${searchStartIndex}`);

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

@@ -54,6 +54,10 @@ import { limitReset } from './config.lib.mjs';
 const autoMergeHelpers = await import('./solve.auto-merge-helpers.lib.mjs');
 const { checkForExistingComment, checkForNonBotComments, getMergeBlockers } = autoMergeHelpers;
 
+// Issue #1625: Shared marker constants + posting/tracking helpers
+const toolComments = await import('./tool-comments.lib.mjs');
+const { READY_TO_MERGE_MARKER, AUTO_RESTART_MARKER, AUTO_MERGED_MARKER, postTrackedComment } = toolComments;
+
 // Issue #1574: Interruptible sleep so CTRL+C is never blocked by a lingering timer
 const { interruptibleSleep } = await import('./interruptible-sleep.lib.mjs');
 
@@ -263,8 +267,8 @@ export const watchUntilMergeable = async params => {
             try {
               // Issue #1345: Differentiate message when no CI is configured
               const ciLine = noCiConfigured ? '- No CI/CD checks are configured for this repository' : noCiTriggered ? (workflowRunConclusions ? `- CI workflows completed without executing (${workflowRunConclusions})` : '- CI workflows exist but were not triggered for this commit') : '- All CI checks have passed';
-              const commentBody = `## 🎉 Auto-merged\n\nThis pull request has been automatically merged by hive-mind.\n${ciLine}\n\n---\n*Auto-merged by hive-mind with --auto-merge flag*`;
-              await $`gh pr comment ${prNumber} --repo ${owner}/${repo} --body ${commentBody}`;
+              const commentBody = `## 🎉 ${AUTO_MERGED_MARKER}\n\nThis pull request has been automatically merged by hive-mind.\n${ciLine}\n\n---\n*Auto-merged by hive-mind with --auto-merge flag*`;
+              await postTrackedComment({ $, owner, repo, targetNumber: prNumber, body: commentBody });
             } catch {
               // Don't fail if comment posting fails
             }
@@ -291,19 +295,20 @@ export const watchUntilMergeable = async params => {
               // Issue #1567: Cross-process deduplication — check if another process already
               // posted a "Ready to merge" comment. This catches the case where two concurrent
               // watchUntilMergeable processes both detect mergeability simultaneously.
-              const hasExistingReadyComment = await checkForExistingComment(owner, repo, prNumber, '## ✅ Ready to merge', argv.verbose);
+              const hasExistingReadyComment = await checkForExistingComment(owner, repo, prNumber, `## ✅ ${READY_TO_MERGE_MARKER}`, argv.verbose);
               if (hasExistingReadyComment) {
-                await log(formatAligned('', 'Skipping duplicate "Ready to merge" comment (already posted by another process)', '', 2));
+                await log(formatAligned('', `Skipping duplicate "${READY_TO_MERGE_MARKER}" comment (already posted by another process)`, '', 2));
                 readyToMergeCommentPosted = true;
               } else {
                 // Issue #1345: Differentiate message when no CI is configured
                 const ciLine = noCiConfigured ? '- No CI/CD checks are configured for this repository' : noCiTriggered ? (workflowRunConclusions ? `- CI workflows completed without executing (${workflowRunConclusions})` : '- CI workflows exist but were not triggered for this commit') : '- All CI checks have passed';
-                const commentBody = `## ✅ Ready to merge\n\nThis pull request is now ready to be merged:\n${ciLine}\n- No merge conflicts\n- No pending changes\n\n---\n*Monitored by hive-mind with --auto-restart-until-mergeable flag*`;
-                await $`gh pr comment ${prNumber} --repo ${owner}/${repo} --body ${commentBody}`;
+                const commentBody = `## ✅ ${READY_TO_MERGE_MARKER}\n\nThis pull request is now ready to be merged:\n${ciLine}\n- No merge conflicts\n- No pending changes\n\n---\n*Monitored by hive-mind with --auto-restart-until-mergeable flag*`;
+                // Issue #1625: Track this comment ID so it can't falsely count as an AI-authored comment
+                await postTrackedComment({ $, owner, repo, targetNumber: prNumber, body: commentBody });
                 readyToMergeCommentPosted = true;
               }
             } else {
-              await log(formatAligned('', 'Skipping duplicate "Ready to merge" comment (already posted this session)', '', 2));
+              await log(formatAligned('', `Skipping duplicate "${READY_TO_MERGE_MARKER}" comment (already posted this session)`, '', 2));
             }
           } catch {
             // Don't fail if comment posting fails
@@ -370,7 +375,7 @@ Once the billing issue is resolved, you can re-run the CI checks or push a new c
 
 ---
 *Detected by hive-mind with --auto-restart-until-mergeable flag. This is NOT a code issue - human intervention is required.*`;
-            await $`gh pr comment ${prNumber} --repo ${owner}/${repo} --body ${commentBody}`;
+            await postTrackedComment({ $, owner, repo, targetNumber: prNumber, body: commentBody });
             await log(formatAligned('', '💬 Posted billing limit notification to PR', '', 2));
           } catch (commentError) {
             reportError(commentError, {
@@ -488,8 +493,9 @@ Once the billing issue is resolved, you can re-run the CI checks or push a new c
         // Post a comment to PR about the restart
         // Issue #1356: Include restart count for tracking and add deduplication
         try {
-          const commentBody = `## 🔄 Auto-restart triggered (iteration ${restartCount})\n\n**Reason:** ${restartReason}\n\nStarting new session to address the issues.\n\n---\n*Auto-restart-until-mergeable mode is active. Will continue until PR becomes mergeable.*`;
-          await $`gh pr comment ${prNumber} --repo ${owner}/${repo} --body ${commentBody}`;
+          const commentBody = `## 🔄 ${AUTO_RESTART_MARKER} triggered (iteration ${restartCount})\n\n**Reason:** ${restartReason}\n\nStarting new session to address the issues.\n\n---\n*Auto-restart-until-mergeable mode is active. Will continue until PR becomes mergeable.*`;
+          // Issue #1625: Track so this doesn't falsely count as an AI-authored comment
+          await postTrackedComment({ $, owner, repo, targetNumber: prNumber, body: commentBody });
           await log(formatAligned('', '💬 Posted auto-restart notification to PR', '', 2));
         } catch (commentError) {
           reportError(commentError, {
@@ -910,8 +916,8 @@ export const attemptAutoMerge = async params => {
 
     // Post success comment
     try {
-      const commentBody = `## 🎉 Auto-merged\n\nThis pull request has been automatically merged by hive-mind after all CI checks passed and the PR became mergeable.\n\n---\n*Auto-merged by hive-mind with --auto-merge flag*`;
-      await $`gh pr comment ${prNumber} --repo ${owner}/${repo} --body ${commentBody}`;
+      const commentBody = `## 🎉 ${AUTO_MERGED_MARKER}\n\nThis pull request has been automatically merged by hive-mind after all CI checks passed and the PR became mergeable.\n\n---\n*Auto-merged by hive-mind with --auto-merge flag*`;
+      await postTrackedComment({ $, owner, repo, targetNumber: prNumber, body: commentBody });
     } catch {
       // Don't fail if comment posting fails
     }
@@ -954,14 +960,15 @@ export const startAutoRestartUntilMergeable = async params => {
 
     // Issue #1323: Post a comment to the PR notifying the maintainer (with deduplication)
     try {
-      const readyToMergeSignature = '## ✅ Ready to merge';
+      const readyToMergeSignature = `## ✅ ${READY_TO_MERGE_MARKER}`;
       const hasExistingComment = await checkForExistingComment(owner, repo, prNumber, readyToMergeSignature, argv.verbose);
       if (!hasExistingComment) {
-        const commentBody = `## ✅ Ready to merge\n\nThis pull request is ready to be merged. Auto-merge was requested (\`--auto-merge\`) but cannot be performed because this PR was created from a fork (no write access to the target repository).\n\nPlease merge manually.\n\n---\n*hive-mind with --auto-merge flag (fork mode)*`;
-        await $`gh pr comment ${prNumber} --repo ${owner}/${repo} --body ${commentBody}`;
+        const commentBody = `## ✅ ${READY_TO_MERGE_MARKER}\n\nThis pull request is ready to be merged. Auto-merge was requested (\`--auto-merge\`) but cannot be performed because this PR was created from a fork (no write access to the target repository).\n\nPlease merge manually.\n\n---\n*hive-mind with --auto-merge flag (fork mode)*`;
+        // Issue #1625: Track so this doesn't falsely count as AI-authored.
+        await postTrackedComment({ $, owner, repo, targetNumber: prNumber, body: commentBody });
         await log(formatAligned('', '💬 Posted merge readiness notification to PR', '', 2));
       } else {
-        await log(formatAligned('', 'Skipping duplicate "Ready to merge" comment', '', 2));
+        await log(formatAligned('', `Skipping duplicate "${READY_TO_MERGE_MARKER}" comment`, '', 2));
       }
     } catch {
       // Don't fail if comment posting fails
@@ -983,14 +990,15 @@ export const startAutoRestartUntilMergeable = async params => {
 
       // Issue #1323: Post a comment to the PR notifying the maintainer (with deduplication)
       try {
-        const readyToMergeSignature = '## ✅ Ready to merge';
+        const readyToMergeSignature = `## ✅ ${READY_TO_MERGE_MARKER}`;
         const hasExistingComment = await checkForExistingComment(owner, repo, prNumber, readyToMergeSignature, argv.verbose);
         if (!hasExistingComment) {
-          const commentBody = `## ✅ Ready to merge\n\nThis pull request is ready to be merged. Auto-merge was requested (\`--auto-merge\`) but cannot be performed because the authenticated user lacks write access to \`${owner}/${repo}\` (current permission: \`${permission || 'unknown'}\`).\n\nPlease merge manually.\n\n---\n*hive-mind with --auto-merge flag*`;
-          await $`gh pr comment ${prNumber} --repo ${owner}/${repo} --body ${commentBody}`;
+          const commentBody = `## ✅ ${READY_TO_MERGE_MARKER}\n\nThis pull request is ready to be merged. Auto-merge was requested (\`--auto-merge\`) but cannot be performed because the authenticated user lacks write access to \`${owner}/${repo}\` (current permission: \`${permission || 'unknown'}\`).\n\nPlease merge manually.\n\n---\n*hive-mind with --auto-merge flag*`;
+          // Issue #1625: Track so this doesn't falsely count as AI-authored.
+          await postTrackedComment({ $, owner, repo, targetNumber: prNumber, body: commentBody });
           await log(formatAligned('', '💬 Posted merge readiness notification to PR', '', 2));
         } else {
-          await log(formatAligned('', 'Skipping duplicate "Ready to merge" comment', '', 2));
+          await log(formatAligned('', `Skipping duplicate "${READY_TO_MERGE_MARKER}" comment`, '', 2));
         }
       } catch {
         // Don't fail if comment posting fails

package/src/solve.mjs

@@ -54,6 +54,10 @@ const { handleAutoPrCreation } = await import('./solve.auto-pr.lib.mjs');
 const { setupRepositoryAndClone, verifyDefaultBranchAndStatus } = await import('./solve.repo-setup.lib.mjs');
 const { createOrCheckoutBranch } = await import('./solve.branch.lib.mjs');
 const { startWorkSession, endWorkSession, SESSION_TYPES } = await import('./solve.session.lib.mjs');
+// Issue #1625: centralized markers + tracked comment posting for solve.mjs's
+// own usage-limit notifications (so they're excluded from the
+// "did the AI post anything?" check in --auto-attach-solution-summary).
+const { postTrackedComment, USAGE_LIMIT_REACHED_MARKER } = await import('./tool-comments.lib.mjs');
 const { prepareFeedbackAndTimestamps, checkUncommittedChanges, checkForkActions } = await import('./solve.preparation.lib.mjs');
 const { validateAndExitOnInvalidModel } = await import('./models/index.mjs');
 const { autoAcceptInviteForRepo } = await import('./solve.accept-invite.lib.mjs');
@@ -964,11 +968,11 @@ try {
           // Format the reset time with relative time and UTC conversion if available
           const timezone = global.limitTimezone || null;
           const formattedResetTime = resetTime ? formatResetTimeWithRelative(resetTime, timezone) : null;
-          const failureComment = formattedResetTime ? `❌ **Usage Limit Reached**\n\nThe AI tool has reached its usage limit. The limit will reset at: **${formattedResetTime}**\n\n${resumeSection}` : `❌ **Usage Limit Reached**\n\nThe AI tool has reached its usage limit. Please wait for the limit to reset.\n\n${resumeSection}`;
+          const failureComment = formattedResetTime ? `❌ **${USAGE_LIMIT_REACHED_MARKER}**\n\nThe AI tool has reached its usage limit. The limit will reset at: **${formattedResetTime}**\n\n${resumeSection}` : `❌ **${USAGE_LIMIT_REACHED_MARKER}**\n\nThe AI tool has reached its usage limit. Please wait for the limit to reset.\n\n${resumeSection}`;
 
-          const commentResult = await $`gh pr comment ${prNumber} --repo ${owner}/${repo} --body ${failureComment}`;
-          if (commentResult.code === 0) {
-            await log('   Posted failure comment to PR');
+          const posted = await postTrackedComment({ $, owner, repo, targetNumber: prNumber, body: failureComment });
+          if (posted.ok) {
+            await log(`   Posted failure comment to PR${posted.commentId ? ` (id=${posted.commentId})` : ''}`);
           }
         } catch (error) {
           await log(`   Warning: Could not post failure comment: ${cleanErrorMessage(error)}`, { verbose: true });
@@ -1049,11 +1053,11 @@ try {
             // Format reset time with relative time and UTC for better user understanding
             // See: https://github.com/link-assistant/hive-mind/issues/1236
             const waitingResetTimeFormatted = formatResetTimeWithRelative(global.limitResetTime, global.limitTimezone || null) || global.limitResetTime;
-            const waitingComment = `⏳ **Usage Limit Reached - Waiting to ${limitContinueMode === 'restart' ? 'Restart' : 'Continue'}**\n\nThe AI tool has reached its usage limit. ${continueModeName} is enabled.\n\n**Reset time:** ${waitingResetTimeFormatted}\n**Wait time:** ${formatWaitTime(waitMs)} (days:hours:minutes:seconds)\n\n${continueDescription}\n\nSession ID: \`${sessionId}\``;
+            const waitingComment = `⏳ **${USAGE_LIMIT_REACHED_MARKER} - Waiting to ${limitContinueMode === 'restart' ? 'Restart' : 'Continue'}**\n\nThe AI tool has reached its usage limit. ${continueModeName} is enabled.\n\n**Reset time:** ${waitingResetTimeFormatted}\n**Wait time:** ${formatWaitTime(waitMs)} (days:hours:minutes:seconds)\n\n${continueDescription}\n\nSession ID: \`${sessionId}\``;
 
-            const commentResult = await $`gh pr comment ${prNumber} --repo ${owner}/${repo} --body ${waitingComment}`;
-            if (commentResult.code === 0) {
-              await log('   Posted waiting comment to PR');
+            const posted = await postTrackedComment({ $, owner, repo, targetNumber: prNumber, body: waitingComment });
+            if (posted.ok) {
+              await log(`   Posted waiting comment to PR${posted.commentId ? ` (id=${posted.commentId})` : ''}`);
             }
           } catch (error) {
             await log(`   Warning: Could not post waiting comment: ${cleanErrorMessage(error)}`, { verbose: true });

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

@@ -24,6 +24,10 @@
  * @experimental
  */
 
+// Issue #1625: centralized markers + tracking helpers so the live-progress
+// 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';
+
 /**
  * Configuration constants for progress monitoring
  */
@@ -33,9 +37,10 @@ const CONFIG = {
   // Progress bar characters
   PROGRESS_CHAR_FILLED: '█',
   PROGRESS_CHAR_EMPTY: '░',
-  // Marker comments for identifying the progress section
-  PROGRESS_SECTION_START: '<!-- LIVE-PROGRESS-START -->',
-  PROGRESS_SECTION_END: '<!-- LIVE-PROGRESS-END -->',
+  // Marker comments for identifying the progress section (imported from
+  // tool-comments.lib.mjs — single source of truth).
+  PROGRESS_SECTION_START: LIVE_PROGRESS_SECTION_START_MARKER,
+  PROGRESS_SECTION_END: LIVE_PROGRESS_SECTION_END_MARKER,
   // Minimum interval between PR description updates (in ms)
   MIN_UPDATE_INTERVAL: 10000, // 10 seconds to avoid rate limiting
   // Valid display modes
@@ -223,25 +228,25 @@ export const createProgressMonitor = ({ owner, repo, prNumber, $, log, verbose =
         await $`gh api repos/${owner}/${repo}/issues/comments/${state.commentId} --method PATCH --field body=@${tempFile}`;
         await fs.unlink(tempFile).catch(() => {});
       } else {
-        // Create new comment
+        // Create new comment. Issue #1625: post via postTrackedCommentFromFile
+        // so the comment ID is captured directly from the GitHub API response
+        // (and registered in the in-memory tracking set that excludes tool-
+        // posted comments from the "did the AI post anything?" check).
         const fs = (await import('fs')).promises;
         const tempFile = `/tmp/pr-progress-comment-${prNumber}-${Date.now()}.md`;
         await fs.writeFile(tempFile, progressSection);
-        const result = await $`gh pr comment ${prNumber} --repo ${owner}/${repo} --body-file ${tempFile}`;
+        const posted = await postTrackedCommentFromFile({ $, owner, repo, targetNumber: prNumber, bodyFile: tempFile });
         await fs.unlink(tempFile).catch(() => {});
 
-        // Extract comment ID from the created comment URL for future edits
-        // gh pr comment outputs the URL of the created comment
-        const output = result.stdout?.toString?.() || '';
-        const urlMatch = output.match(/\/comments\/(\d+)/);
-        if (urlMatch) {
-          state.commentId = urlMatch[1];
+        if (posted.ok && posted.commentId) {
+          state.commentId = posted.commentId;
         } else {
           // Fallback: find the comment we just created by looking for our marker
           const commentsResult = await $`gh api repos/${owner}/${repo}/issues/${prNumber}/comments --jq ${`[.[] | select(.body | contains("${CONFIG.PROGRESS_SECTION_START}")) | .id] | last`}`;
           const commentId = commentsResult.stdout?.toString?.().trim();
           if (commentId && commentId !== 'null') {
             state.commentId = commentId;
+            trackToolCommentId(commentId);
           }
         }
       }

package/src/solve.repo-setup.lib.mjs

@@ -3,6 +3,10 @@
  * Handles repository cloning, forking, and remote setup
  */
 
+// Issue #1625: centralized markers + tracked posting for the "empty repo"
+// issue comment so it's excluded from --auto-attach-solution-summary's check.
+import { REPOSITORY_INITIALIZATION_REQUIRED_MARKER, postTrackedComment } from './tool-comments.lib.mjs';
+
 export async function setupRepositoryAndClone({ argv, owner, repo, forkOwner, forkRepoName, tempDir, isContinueMode, issueUrl, log, $, needsClone = true }) {
   // Set up repository and handle forking
   const { repoToClone, forkedRepo, upstreamRemote, prForkOwner } = await setupRepository(argv, owner, repo, forkOwner, issueUrl, forkRepoName);
@@ -223,7 +227,7 @@ async function tryCommentOnIssueAboutEmptyRepo({ issueUrl, owner, repo, log, for
     const issueNumber = issueMatch[1];
     await log(`${formatAligned('💬', 'Creating comment:', 'Informing about empty repository...')}`);
 
-    const commentBody = `## ⚠️ Repository Initialization Required
+    const commentBody = `## ⚠️ ${REPOSITORY_INITIALIZATION_REQUIRED_MARKER}
 
 Hello! I attempted to work on this issue, but encountered a problem:
 
@@ -245,9 +249,9 @@ Once the repository contains at least one commit with any file, I'll be able to
 
 Thank you!`;
 
-    const commentResult = await $`gh issue comment ${issueNumber} --repo ${owner}/${repo} --body ${commentBody}`;
-    if (commentResult.code === 0) {
-      await log(`${formatAligned('✅', 'Comment created:', `Posted to issue #${issueNumber}`)}`);
+    const posted = await postTrackedComment({ $, owner, repo, targetNumber: issueNumber, body: commentBody });
+    if (posted.ok) {
+      await log(`${formatAligned('✅', 'Comment created:', `Posted to issue #${issueNumber}${posted.commentId ? ` (id=${posted.commentId})` : ''}`)}`);
     } else {
       await log(`${formatAligned('⚠️', 'Note:', 'Could not post comment to issue (this is not critical)')}`);
     }

package/src/solve.repository.lib.mjs

@@ -32,6 +32,8 @@ import { safeExit } from './exit-handler.lib.mjs';
 // Import GitHub utilities for permission checks
 const githubLib = await import('./github.lib.mjs');
 const { checkRepositoryWritePermission } = githubLib;
+// Issue #1625: centralized markers + tracked posting.
+const { REPOSITORY_INITIALIZATION_REQUIRED_MARKER, postTrackedComment } = await import('./tool-comments.lib.mjs');
 
 // Get root repository (fork source or self), or null if inaccessible
 export const getRootRepository = async (owner, repo) => {
@@ -698,7 +700,7 @@ export const setupRepository = async (argv, owner, repo, forkOwner = null, issue
                     const issueNumber = issueMatch[1];
                     await log(`${formatAligned('💬', 'Creating comment:', 'Requesting maintainer to initialize repository...')}`);
 
-                    const commentBody = `## ⚠️ Repository Initialization Required
+                    const commentBody = `## ⚠️ ${REPOSITORY_INITIALIZATION_REQUIRED_MARKER}
 
 Hello! I attempted to work on this issue, but encountered a problem:
 
@@ -717,9 +719,9 @@ Once the repository contains at least one commit with any file, I'll be able to
 
 Thank you!`;
 
-                    const commentResult = await $`gh issue comment ${issueNumber} --repo ${owner}/${repo} --body ${commentBody}`;
-                    if (commentResult.code === 0) {
-                      await log(`${formatAligned('✅', 'Comment created:', `Posted to issue #${issueNumber}`)}`);
+                    const posted = await postTrackedComment({ $, owner, repo, targetNumber: issueNumber, body: commentBody });
+                    if (posted.ok) {
+                      await log(`${formatAligned('✅', 'Comment created:', `Posted to issue #${issueNumber}${posted.commentId ? ` (id=${posted.commentId})` : ''}`)}`);
                     } else {
                       await log(`${formatAligned('⚠️', 'Note:', 'Could not post comment to issue (this is not critical)')}`);
                     }

package/src/solve.results.lib.mjs

@@ -1041,12 +1041,22 @@ export const handleExecutionError = async (error, shouldAttachLogs, owner, repo,
   await safeExit(1, 'Execution error');
 };
 
+// Issue #1625: Markers and in-memory comment-ID tracking are centralized in
+// src/tool-comments.lib.mjs so that every place that *posts* a tool-generated
+// comment and the filter that *detects* them share the exact same constants.
+// Re-exported here for backwards compatibility with imports that expect them
+// from solve.results.lib.mjs.
+const toolComments = await import('./tool-comments.lib.mjs');
+export const { TOOL_GENERATED_COMMENT_MARKERS, isToolGeneratedComment, trackToolCommentId, isToolTrackedCommentId, getTrackedToolCommentIds, postTrackedComment } = toolComments;
+
 /**
  * Check if new comments were created by the AI during the session.
  * This is used by --auto-attach-solution-summary to determine if the AI
  * already provided feedback.
  *
  * Issue #1263: Support for --attach-solution-summary and --auto-attach-solution-summary
+ * Issue #1625: Filter out comments produced by solve.mjs itself (session start,
+ * log upload, auto-restart, etc.) so they do not falsely count as AI-authored.
  *
  * @param {Date} referenceTime - The timestamp before tool execution
  * @param {string} owner - Repository owner
@@ -1067,13 +1077,62 @@ export const checkForAiCreatedComments = async (referenceTime, owner, repo, prNu
       return false;
     }
 
+    await log(`🔎 Checking comments by '${currentUser}' after ${referenceTime.toISOString()} (PR #${prNumber ?? 'none'}, issue #${issueNumber ?? 'none'})`, { verbose: true });
+
+    // Issue #1625: A comment counts as an "AI comment" only if it was posted
+    // by the current user AFTER referenceTime AND solve.mjs did NOT post it
+    // itself. We identify tool-posted comments in two ways, in order:
+    //   1. Primary: comment ID is in the in-memory tracked set populated by
+    //      every solve.mjs posting site (postTrackedComment / trackToolCommentId).
+    //      This is robust to comment-body changes.
+    //   2. Fallback: comment body matches a known TOOL_GENERATED_COMMENT_MARKERS
+    //      marker. This catches comments whose IDs weren't captured — for
+    //      example, on resumed sessions where the posting happened in an
+    //      earlier process, or legacy code paths that predate tracking.
+    // Review-type inline comments cannot be posted by solve.mjs, so they are
+    // treated as AI-authored by default.
+    const filterNewAiComments = (comments, kind) => {
+      const filtered = [];
+      const skippedCounts = {};
+      const skippedByIdCount = { n: 0 };
+      for (const comment of comments) {
+        if (!comment || !comment.user || comment.user.login !== currentUser) continue;
+        if (!(new Date(comment.created_at) > referenceTime)) continue;
+
+        const isReview = kind === 'review';
+        if (!isReview) {
+          if (isToolTrackedCommentId(comment.id)) {
+            skippedByIdCount.n += 1;
+            continue;
+          }
+          if (isToolGeneratedComment(comment.body)) {
+            const markerMatch = TOOL_GENERATED_COMMENT_MARKERS.find(m => (comment.body || '').includes(m)) || 'unknown';
+            skippedCounts[markerMatch] = (skippedCounts[markerMatch] || 0) + 1;
+            continue;
+          }
+        }
+        filtered.push(comment);
+      }
+      if (skippedByIdCount.n > 0) {
+        log(`   ⏭️  Skipped ${kind} tool-tracked comment IDs: ${skippedByIdCount.n}`, { verbose: true }).catch(() => {});
+      }
+      if (Object.keys(skippedCounts).length > 0) {
+        const summary = Object.entries(skippedCounts)
+          .map(([m, c]) => `${m}=${c}`)
+          .join(', ');
+        log(`   ⏭️  Skipped ${kind} tool-generated comments (marker fallback): ${summary}`, { verbose: true }).catch(() => {});
+      }
+      return filtered;
+    };
+
     // Check comments on the PR first (if we have a PR)
     if (prNumber) {
       // Check PR conversation comments
       const prCommentsResult = await $`gh api repos/${owner}/${repo}/issues/${prNumber}/comments --paginate`;
       if (prCommentsResult.code === 0) {
         const prComments = JSON.parse(prCommentsResult.stdout.toString().trim() || '[]');
-        const newPrComments = prComments.filter(comment => comment.user.login === currentUser && new Date(comment.created_at) > referenceTime);
+        const newPrComments = filterNewAiComments(prComments, 'pr');
+        await log(`   📨 PR conversation comments after referenceTime by '${currentUser}' (excluding tool-generated): ${newPrComments.length}`, { verbose: true });
         if (newPrComments.length > 0) {
           return true;
         }
@@ -1083,7 +1142,8 @@ export const checkForAiCreatedComments = async (referenceTime, owner, repo, prNu
       const reviewCommentsResult = await $`gh api repos/${owner}/${repo}/pulls/${prNumber}/comments --paginate`;
       if (reviewCommentsResult.code === 0) {
         const reviewComments = JSON.parse(reviewCommentsResult.stdout.toString().trim() || '[]');
-        const newReviewComments = reviewComments.filter(comment => comment.user.login === currentUser && new Date(comment.created_at) > referenceTime);
+        const newReviewComments = filterNewAiComments(reviewComments, 'review');
+        await log(`   📝 PR review (inline) comments after referenceTime by '${currentUser}': ${newReviewComments.length}`, { verbose: true });
         if (newReviewComments.length > 0) {
           return true;
         }
@@ -1095,7 +1155,8 @@ export const checkForAiCreatedComments = async (referenceTime, owner, repo, prNu
       const issueCommentsResult = await $`gh api repos/${owner}/${repo}/issues/${issueNumber}/comments --paginate`;
       if (issueCommentsResult.code === 0) {
         const issueComments = JSON.parse(issueCommentsResult.stdout.toString().trim() || '[]');
-        const newIssueComments = issueComments.filter(comment => comment.user.login === currentUser && new Date(comment.created_at) > referenceTime);
+        const newIssueComments = filterNewAiComments(issueComments, 'issue');
+        await log(`   📨 Issue comments after referenceTime by '${currentUser}' (excluding tool-generated): ${newIssueComments.length}`, { verbose: true });
         if (newIssueComments.length > 0) {
           return true;
         }

package/src/solve.session.lib.mjs

@@ -3,6 +3,11 @@
  * Handles starting and ending work sessions, PR status changes, and session comments
  */
 
+// Issue #1625: Use the single source of truth for session-comment marker
+// strings. Building comment bodies via these constants guarantees the filter
+// in checkForAiCreatedComments() always matches what we actually posted.
+import { AI_WORK_SESSION_STARTED_MARKER, AI_WORK_SESSION_COMPLETED_MARKER, AI_WORK_SESSION_RESUMED_MARKER, AUTO_RESUME_ON_LIMIT_RESET_MARKER, AUTO_RESTART_ON_LIMIT_RESET_MARKER, postTrackedComment } from './tool-comments.lib.mjs';
+
 /**
  * Session type definitions for different work session contexts
  * See: https://github.com/link-assistant/hive-mind/issues/1152
@@ -27,26 +32,26 @@ function getSessionCommentContent(sessionType, timestamp) {
     case SESSION_TYPES.RESUME:
       return {
         emoji: '🔄',
-        header: 'AI Work Session Resumed',
+        header: AI_WORK_SESSION_RESUMED_MARKER,
         description: `Resuming automated work session at ${isoTime}\n\nThis session continues from a previous session using the \`--resume\` flag.\n\nThe PR has been converted to draft mode while work is in progress.\n\n_This comment marks the resumption of an AI work session. Please wait for the session to finish, and provide your feedback._`,
       };
     case SESSION_TYPES.AUTO_RESUME:
       return {
         emoji: '⏰',
-        header: 'Auto Resume (on limit reset)',
+        header: AUTO_RESUME_ON_LIMIT_RESET_MARKER,
         description: `Auto-resuming automated work session at ${isoTime}\n\nThis session automatically resumed after the usage limit reset, continuing with the previous context preserved.\n\nThe PR has been converted to draft mode while work is in progress.\n\n_This is an auto-resumed session. Please wait for the session to finish, and provide your feedback._`,
       };
     case SESSION_TYPES.AUTO_RESTART:
       return {
         emoji: '🔄',
-        header: 'Auto Restart (on limit reset)',
+        header: AUTO_RESTART_ON_LIMIT_RESET_MARKER,
         description: `Auto-restarting automated work session at ${isoTime}\n\nThis session automatically restarted after the usage limit reset (fresh start without previous context).\n\nThe PR has been converted to draft mode while work is in progress.\n\n_This is a fresh restart after limit reset. Please wait for the session to finish, and provide your feedback._`,
       };
     case SESSION_TYPES.NEW:
     default:
       return {
         emoji: '🤖',
-        header: 'AI Work Session Started',
+        header: AI_WORK_SESSION_STARTED_MARKER,
         description: `Starting automated work session at ${isoTime}\n\nThe PR has been converted to draft mode while work is in progress.\n\n_This comment marks the beginning of an AI work session. Please wait for the session to finish, and provide your feedback._`,
       };
   }
@@ -97,13 +102,17 @@ export async function startWorkSession({ isContinueMode, prNumber, argv, log, fo
       await log('Warning: Could not check/convert PR draft status', { level: 'warning' });
     }
 
-    // Post a comment marking the start of work session with appropriate header based on session type
+    // Post a comment marking the start of work session with appropriate header based on session type.
+    // Issue #1625: Use postTrackedComment so the comment ID is registered in-memory and can be
+    // excluded from the "did the AI post anything?" check in checkForAiCreatedComments().
     try {
       const { emoji, header, description } = getSessionCommentContent(sessionType, workStartTime);
       const startComment = `${emoji} **${header}**\n\n${description}`;
-      const commentResult = await $`gh pr comment ${prNumber} --repo ${global.owner}/${global.repo} --body ${startComment}`;
-      if (commentResult.code === 0) {
-        await log(formatAligned('💬', 'Posted:', `${header} comment`, 2));
+      const { ok, commentId, stderr } = await postTrackedComment({ $, owner: global.owner, repo: global.repo, targetNumber: prNumber, body: startComment });
+      if (ok) {
+        await log(formatAligned('💬', 'Posted:', `${header} comment${commentId ? ` (id=${commentId})` : ''}`, 2));
+      } else {
+        await log(`Warning: Could not post work start comment: ${stderr || 'unknown error'}`, { level: 'warning' });
       }
     } catch (error) {
       const sentryLib = await import('./sentry.lib.mjs');
@@ -129,12 +138,15 @@ export async function endWorkSession({ isContinueMode, prNumber, argv, log, form
     // Only post end comment if logs were NOT already attached
     // The attachLogToGitHub comment already serves as finishing status with "Now working session is ended" text
     if (!logsAttached) {
-      // Post a comment marking the end of work session
+      // Post a comment marking the end of work session.
+      // Issue #1625: Track the comment ID so it won't be mistaken for AI-authored content.
       try {
-        const endComment = `🤖 **AI Work Session Completed**\n\nWork session ended at ${workEndTime.toISOString()}\n\nThe PR will be converted back to ready for review.\n\n_This comment marks the end of an AI work session. New comments after this time will be considered as feedback._`;
-        const commentResult = await $`gh pr comment ${prNumber} --repo ${global.owner}/${global.repo} --body ${endComment}`;
-        if (commentResult.code === 0) {
-          await log(formatAligned('💬', 'Posted:', 'Work session end comment', 2));
+        const endComment = `🤖 **${AI_WORK_SESSION_COMPLETED_MARKER}**\n\nWork session ended at ${workEndTime.toISOString()}\n\nThe PR will be converted back to ready for review.\n\n_This comment marks the end of an AI work session. New comments after this time will be considered as feedback._`;
+        const { ok, commentId, stderr } = await postTrackedComment({ $, owner: global.owner, repo: global.repo, targetNumber: prNumber, body: endComment });
+        if (ok) {
+          await log(formatAligned('💬', 'Posted:', `Work session end comment${commentId ? ` (id=${commentId})` : ''}`, 2));
+        } else {
+          await log(`Warning: Could not post work end comment: ${stderr || 'unknown error'}`, { level: 'warning' });
         }
       } catch (error) {
         const sentryLib = await import('./sentry.lib.mjs');

package/src/solve.watch.lib.mjs

@@ -40,6 +40,10 @@ const { checkPRMerged, checkForUncommittedChanges, getUncommittedChangesDetails,
 // Issue #1574: Interruptible sleep so CTRL+C is never blocked by a lingering timer
 const { interruptibleSleep } = await import('./interruptible-sleep.lib.mjs');
 
+// Issue #1625: Central marker constants + tracked comment posting
+const toolComments = await import('./tool-comments.lib.mjs');
+const { AUTO_RESTART_MARKER, postTrackedComment } = toolComments;
+
 /**
  * Monitor for feedback in a loop and trigger restart when detected
  */
@@ -192,8 +196,9 @@ export const watchForFeedback = async params => {
                 uncommittedFilesList = '\n\n**Uncommitted files:**\n```\n' + changes.join('\n') + '\n```';
               }
 
-              const commentBody = `## 🔄 Auto-restart ${autoRestartCount}/${maxAutoRestartIterations}\n\nDetected uncommitted changes from previous run. Starting new session to review and commit or discard them.${uncommittedFilesList}\n\n---\n*Auto-restart will stop after changes are committed or discarded, or after ${remainingIterations} more iteration${remainingIterations !== 1 ? 's' : ''}. Please wait until working session will end and give your feedback.*`;
-              await $`gh pr comment ${prNumber} --repo ${owner}/${repo} --body ${commentBody}`;
+              const commentBody = `## 🔄 ${AUTO_RESTART_MARKER} ${autoRestartCount}/${maxAutoRestartIterations}\n\nDetected uncommitted changes from previous run. Starting new session to review and commit or discard them.${uncommittedFilesList}\n\n---\n*Auto-restart will stop after changes are committed or discarded, or after ${remainingIterations} more iteration${remainingIterations !== 1 ? 's' : ''}. Please wait until working session will end and give your feedback.*`;
+              // Issue #1625: Track so this doesn't falsely count as AI-authored.
+              await postTrackedComment({ $, owner, repo, targetNumber: prNumber, body: commentBody });
               await log(formatAligned('', '💬 Posted auto-restart notification to PR', '', 2));
             } catch (commentError) {
               reportError(commentError, {

package/src/tool-comments.lib.mjs

@@ -0,0 +1,271 @@
+#!/usr/bin/env node
+
+/**
+ * Centralized definitions for GitHub comments posted by solve.mjs itself
+ * (session bookkeeping, log uploads, auto-restart notices, etc.) — as
+ * opposed to comments posted by the AI agent via its own tool calls.
+ *
+ * Issue #1625: --auto-attach-solution-summary was broken because the tool's
+ * own "AI Work Session Started" / "Solution Draft Log" / "Ready to merge"
+ * comments counted as AI-authored comments, so the summary was always
+ * suppressed even when the AI session produced zero comments of its own.
+ *
+ * This module is the single source of truth for the marker strings embedded
+ * in those comments. Posting sites use these constants to *build* comment
+ * bodies; the summary filter uses the same constants to *detect* them. If a
+ * marker needs to change, changing it here updates both sides — no more
+ * duplicate literals drifting apart.
+ *
+ * It also provides in-memory tracking: any comment posted by solve.mjs can
+ * be registered by its numeric GitHub comment ID, and checkForAiCreatedComments
+ * uses that set as the *primary* filter (marker matching is the fallback for
+ * comments whose IDs were not captured, e.g. when `gh pr comment` didn't
+ * return JSON).
+ */
+
+// ----------------------------------------------------------------------------
+// Marker constants — single source of truth for comment header/keyphrase text.
+// Each constant is the exact substring that both (a) appears in the posted
+// comment body and (b) is searched for when filtering out tool-generated
+// comments. Do NOT duplicate these literals elsewhere.
+// ----------------------------------------------------------------------------
+
+// solve.session.lib.mjs — startWorkSession() / endWorkSession()
+export const AI_WORK_SESSION_STARTED_MARKER = 'AI Work Session Started';
+export const AI_WORK_SESSION_COMPLETED_MARKER = 'AI Work Session Completed';
+export const AI_WORK_SESSION_RESUMED_MARKER = 'AI Work Session Resumed';
+
+// solve.session.lib.mjs — auto-resume / auto-restart on limit reset
+export const AUTO_RESUME_ON_LIMIT_RESET_MARKER = 'Auto Resume (on limit reset)';
+export const AUTO_RESTART_ON_LIMIT_RESET_MARKER = 'Auto Restart (on limit reset)';
+
+// github.lib.mjs — attachLogToGitHub() success / resumed / truncated log comments
+export const SOLUTION_DRAFT_LOG_MARKER = 'Solution Draft Log';
+
+// solve.watch.lib.mjs / solve.auto-merge.lib.mjs — auto-restart notifications
+export const AUTO_RESTART_MARKER = 'Auto-restart';
+export const AUTO_RESTART_UNTIL_MERGEABLE_LOG_MARKER = 'Auto-restart-until-mergeable Log';
+
+// solve.auto-merge.lib.mjs — "ready to merge" status comments
+export const READY_TO_MERGE_MARKER = 'Ready to merge';
+
+// solve.auto-merge.lib.mjs — "auto-merged successfully" status comments
+export const AUTO_MERGED_MARKER = 'Auto-merged';
+
+// solve.auto-merge.lib.mjs — billing-limit notification (spending cap / free tier)
+export const BILLING_LIMIT_MARKER = 'GitHub Actions Billing Limit';
+
+// github.lib.mjs — fork contributor "Allow edits by maintainers" request
+export const MAINTAINER_ACCESS_REQUEST_MARKER = 'Allow edits by maintainers';
+
+// solve.progress-monitoring.lib.mjs — live-progress comment section markers.
+// These are HTML comments so they don't render in the GitHub UI; they exist
+// specifically to let the tool find its own comment later.
+export const LIVE_PROGRESS_SECTION_START_MARKER = '<!-- LIVE-PROGRESS-START -->';
+export const LIVE_PROGRESS_SECTION_END_MARKER = '<!-- LIVE-PROGRESS-END -->';
+
+// claude.lib.mjs — "session force-killed due to stream timeout" notifications
+export const SESSION_FORCE_KILLED_MARKER = 'Session Force-Killed';
+
+// solve.repo-setup.lib.mjs / solve.repository.lib.mjs — issue comments posted
+// when the target repository is empty / uninitialized so solving can't start.
+export const REPOSITORY_INITIALIZATION_REQUIRED_MARKER = 'Repository Initialization Required';
+
+// interactive-mode.lib.mjs — interactive mode session comments
+export const INTERACTIVE_SESSION_STARTED_MARKER = 'Interactive session started';
+export const INTERACTIVE_SESSION_ENDED_MARKER = 'Interactive session ended';
+
+// github.lib.mjs — closing footer present in every log upload comment variant
+export const NOW_WORKING_SESSION_IS_ENDED_MARKER = 'Now working session is ended';
+
+// Failure-path markers (github.lib.mjs error paths)
+export const SOLUTION_DRAFT_FAILED_MARKER = 'Solution Draft Failed';
+export const SOLUTION_DRAFT_FINISHED_WITH_ERRORS_MARKER = 'Solution Draft Finished with Errors';
+export const USAGE_LIMIT_REACHED_MARKER = 'Usage Limit Reached';
+
+/**
+ * Every marker that identifies a tool-posted comment. Derived from the
+ * named constants above so that adding a new marker only requires adding
+ * the constant and appending it here.
+ */
+export const TOOL_GENERATED_COMMENT_MARKERS = [AI_WORK_SESSION_STARTED_MARKER, AI_WORK_SESSION_COMPLETED_MARKER, AI_WORK_SESSION_RESUMED_MARKER, AUTO_RESUME_ON_LIMIT_RESET_MARKER, AUTO_RESTART_ON_LIMIT_RESET_MARKER, SOLUTION_DRAFT_LOG_MARKER, AUTO_RESTART_MARKER, AUTO_RESTART_UNTIL_MERGEABLE_LOG_MARKER, READY_TO_MERGE_MARKER, AUTO_MERGED_MARKER, BILLING_LIMIT_MARKER, MAINTAINER_ACCESS_REQUEST_MARKER, LIVE_PROGRESS_SECTION_START_MARKER, SESSION_FORCE_KILLED_MARKER, REPOSITORY_INITIALIZATION_REQUIRED_MARKER, INTERACTIVE_SESSION_STARTED_MARKER, INTERACTIVE_SESSION_ENDED_MARKER, NOW_WORKING_SESSION_IS_ENDED_MARKER, SOLUTION_DRAFT_FAILED_MARKER, SOLUTION_DRAFT_FINISHED_WITH_ERRORS_MARKER, USAGE_LIMIT_REACHED_MARKER];
+
+/**
+ * Markers that indicate the end of a working session. Used by
+ * solve.auto-merge-helpers.checkForExistingComment to scope the
+ * duplicate-search window to the current session only (Issue #1584).
+ */
+export const SESSION_ENDING_MARKERS = [NOW_WORKING_SESSION_IS_ENDED_MARKER, AI_WORK_SESSION_COMPLETED_MARKER];
+
+/**
+ * Determine whether a GitHub comment body matches any known tool-generated
+ * marker. Used as a fallback when a comment's ID was not captured by
+ * in-memory tracking (see below).
+ *
+ * @param {string} body - The comment body
+ * @returns {boolean} - True if the body contains a tool-generated marker
+ */
+export const isToolGeneratedComment = body => {
+  if (!body || typeof body !== 'string') return false;
+  return TOOL_GENERATED_COMMENT_MARKERS.some(marker => body.includes(marker));
+};
+
+// ----------------------------------------------------------------------------
+// In-memory tracking of comments posted by solve.mjs during this session.
+//
+// Every tool-initiated comment-post helper should register its comment ID
+// via trackToolCommentId(). checkForAiCreatedComments() then uses the set
+// as the primary filter, falling back to marker-based detection for any
+// comment whose ID was not captured.
+//
+// IDs are GitHub numeric comment IDs (from issue/PR/review comment APIs),
+// coerced to strings for consistent Set membership. Review (inline) comments
+// and conversation comments share the same ID namespace at the API layer,
+// but we never mix them since solve.mjs only posts to conversation + issue
+// endpoints — review comments are AI-only.
+// ----------------------------------------------------------------------------
+
+const trackedToolCommentIds = new Set();
+
+/**
+ * Register a comment ID as tool-generated. Safe to call with null/undefined
+ * (e.g., when comment posting failed or the ID couldn't be extracted).
+ * @param {string|number|null|undefined} commentId
+ */
+export const trackToolCommentId = commentId => {
+  if (commentId === null || commentId === undefined) return;
+  trackedToolCommentIds.add(String(commentId));
+};
+
+/**
+ * Returns whether a given comment ID was posted by solve.mjs itself during
+ * this session.
+ * @param {string|number|null|undefined} commentId
+ * @returns {boolean}
+ */
+export const isToolTrackedCommentId = commentId => {
+  if (commentId === null || commentId === undefined) return false;
+  return trackedToolCommentIds.has(String(commentId));
+};
+
+/**
+ * Returns the set of tracked comment IDs (read-only snapshot).
+ * Primarily for tests and diagnostics.
+ * @returns {Set<string>}
+ */
+export const getTrackedToolCommentIds = () => new Set(trackedToolCommentIds);
+
+/**
+ * Reset tracking state. Primarily for tests; solve.mjs does not need to
+ * call this between real sessions because each invocation is a fresh
+ * process.
+ */
+export const resetTrackedToolCommentIds = () => {
+  trackedToolCommentIds.clear();
+};
+
+/**
+ * Post a GitHub comment on a PR or issue via `gh api` and return the
+ * numeric comment ID (as string). The ID is also automatically tracked in
+ * the in-memory set above.
+ *
+ * This is the preferred path for all tool-posted comments because `gh pr
+ * comment` / `gh issue comment` only print the comment URL to stdout, and
+ * extracting the numeric ID from a URL is brittle. `gh api POST` returns
+ * full JSON, from which the ID is trivial to extract.
+ *
+ * Falls back to best-effort URL parsing if JSON parsing fails, so a single
+ * API change cannot break the code path.
+ *
+ * @param {Object} options
+ * @param {Function} options.$ - command-stream tagged template (required — we
+ *   accept it as a parameter so this module has no top-level dependency on
+ *   `command-stream`, keeping it cheap to import from tests)
+ * @param {string} options.owner
+ * @param {string} options.repo
+ * @param {number|string} options.targetNumber - PR or issue number
+ * @param {string} options.body
+ * @returns {Promise<{ok: boolean, commentId: string|null, stderr?: string}>}
+ */
+export const postTrackedComment = async ({ $, owner, repo, targetNumber, body }) => {
+  if (!$) {
+    throw new Error('postTrackedComment requires a command-stream $ helper');
+  }
+
+  // Use `gh api` with stdin to avoid shell-quoting problems on multi-line
+  // bodies and to get JSON back so we can extract the comment ID.
+  // We use the /issues/<n>/comments endpoint because it works identically
+  // for both PRs and issues (a PR is an issue at this endpoint).
+  const apiPath = `repos/${owner}/${repo}/issues/${targetNumber}/comments`;
+  const payload = JSON.stringify({ body });
+
+  // `gh api --input -` reads from stdin. command-stream supports .stdin(...)
+  // on the returned process handle (same API used in interactive-mode.lib.mjs
+  // via execFileAsync). We build the invocation through $ so callers can
+  // inject a mock.
+  let result;
+  try {
+    result = await $({ input: payload })`gh api ${apiPath} -X POST --input -`;
+  } catch (err) {
+    return { ok: false, commentId: null, stderr: err && err.message ? err.message : String(err) };
+  }
+
+  if (result.code !== 0) {
+    const stderr = result.stderr ? result.stderr.toString() : '';
+    return { ok: false, commentId: null, stderr };
+  }
+
+  const stdout = result.stdout ? result.stdout.toString() : '';
+  let commentId = null;
+  try {
+    const parsed = JSON.parse(stdout);
+    if (parsed && parsed.id !== undefined && parsed.id !== null) {
+      commentId = String(parsed.id);
+    }
+  } catch {
+    // Fallback: match numeric id in the JSON text, or the issuecomment-<n>
+    // fragment in the html_url, whichever shows up first.
+    const match = stdout.match(/"id"\s*:\s*(\d+)|issuecomment-(\d+)/);
+    if (match) commentId = match[1] || match[2] || null;
+  }
+
+  trackToolCommentId(commentId);
+
+  return { ok: true, commentId };
+};
+
+/**
+ * Post a GitHub comment whose body is already written to a file on disk.
+ * Used by attachLogToGitHub() where the comment body can be tens of KB
+ * (entire execution log embedded in a <details>) — too large for inline
+ * shell arguments and awkward to pipe as stdin JSON.
+ *
+ * Reads the file and posts via postTrackedComment() so the returned comment
+ * ID is tracked exactly like any other tool-posted comment. Kept separate
+ * from postTrackedComment so callers that already have a body string don't
+ * pay for a tempfile round-trip.
+ *
+ * @param {Object} options
+ * @param {Function} options.$ - command-stream tagged template
+ * @param {string} options.owner
+ * @param {string} options.repo
+ * @param {number|string} options.targetNumber
+ * @param {string} options.bodyFile - absolute path to the comment body file
+ * @returns {Promise<{ok: boolean, commentId: string|null, stderr?: string}>}
+ */
+export const postTrackedCommentFromFile = async ({ $, owner, repo, targetNumber, bodyFile }) => {
+  if (!$) {
+    throw new Error('postTrackedCommentFromFile requires a command-stream $ helper');
+  }
+  if (typeof globalThis.use === 'undefined') {
+    globalThis.use = (await eval(await (await fetch('https://unpkg.com/use-m/use.js')).text())).use;
+  }
+  const fs = (await globalThis.use('fs')).promises;
+  let body;
+  try {
+    body = await fs.readFile(bodyFile, 'utf8');
+  } catch (err) {
+    return { ok: false, commentId: null, stderr: err && err.message ? err.message : String(err) };
+  }
+  return postTrackedComment({ $, owner, repo, targetNumber, body });
+};