@link-assistant/hive-mind 1.53.0 → 1.54.0

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, {