@link-assistant/hive-mind 1.52.1 → 1.53.1

package/src/playwright-mcp.lib.mjs

@@ -0,0 +1,298 @@
+#!/usr/bin/env node
+// Playwright MCP session-level disable/restore utilities.
+if (typeof globalThis.use === 'undefined') {
+  globalThis.use = (await eval(await (await fetch('https://unpkg.com/use-m/use.js')).text())).use;
+}
+const { $ } = await use('command-stream');
+const fs = (await use('fs')).promises;
+const os = await use('os');
+const path = (await use('path')).default;
+
+export const getCommandResultCode = result => result?.code ?? result?.exitCode ?? null;
+
+export const getCommandResultOutput = result => `${result?.stdout?.toString() || ''}${result?.stderr?.toString() || ''}`;
+
+export const isCommandResultSuccess = result => getCommandResultCode(result) === 0;
+
+export const checkPlaywrightMcpPackageAvailability = async () => {
+  try {
+    const result = await $`timeout 5 npx --no-install @playwright/mcp --help 2>&1`.catch(() => null);
+    if (isCommandResultSuccess(result)) return true;
+    const npmResult = await $`timeout 5 npm ls -g @playwright/mcp 2>&1`.catch(() => null);
+    return getCommandResultOutput(npmResult).includes('@playwright/mcp');
+  } catch {
+    return false;
+  }
+};
+
+export const parseCodexMcpServerNames = output =>
+  output
+    .split(/\r?\n/)
+    .map(line => line.trim())
+    .filter(line => line && !line.startsWith('Name '))
+    .map(line => line.split(/\s+/)[0])
+    .filter(name => /^[A-Za-z0-9_-]+$/.test(name));
+
+export const getCodexPlaywrightMcpDisableConfigArgs = async log => {
+  try {
+    const result = await $`timeout 5 codex mcp list 2>&1`.catch(() => null);
+    if (!isCommandResultSuccess(result)) return [];
+    const names = parseCodexMcpServerNames(getCommandResultOutput(result)).filter(name => name.toLowerCase().includes('playwright'));
+    if (names.length === 0) {
+      if (log) await log('🎭 No Codex Playwright MCP server registration found to disable for this session', { verbose: true });
+      return [];
+    }
+    if (log) {
+      await log(`🎭 Playwright MCP disabled for this Codex session via config override: ${names.join(', ')}`, {
+        verbose: true,
+      });
+    }
+    return names.flatMap(name => ['-c', `mcp_servers.${name}.enabled=false`]);
+  } catch (err) {
+    if (log) await log(`⚠️  Could not build Codex Playwright MCP disable override: ${err.message}`, { verbose: true });
+    return [];
+  }
+};
+
+const isPlainObject = value => value && typeof value === 'object' && !Array.isArray(value);
+
+const mergeDeep = (base, override) => {
+  const result = { ...(isPlainObject(base) ? base : {}) };
+  for (const [key, value] of Object.entries(isPlainObject(override) ? override : {})) {
+    result[key] = isPlainObject(result[key]) && isPlainObject(value) ? mergeDeep(result[key], value) : value;
+  }
+  return result;
+};
+
+const stripJsonComments = input => {
+  let output = '';
+  let inString = false;
+  let quote = '';
+  let escaped = false;
+  for (let index = 0; index < input.length; index++) {
+    const char = input[index];
+    const next = input[index + 1];
+    if (inString) {
+      output += char;
+      if (escaped) {
+        escaped = false;
+      } else if (char === '\\') {
+        escaped = true;
+      } else if (char === quote) {
+        inString = false;
+      }
+      continue;
+    }
+    if (char === '"' || char === "'") {
+      inString = true;
+      quote = char;
+      output += char;
+      continue;
+    }
+    if (char === '/' && next === '/') {
+      while (index < input.length && input[index] !== '\n') index++;
+      output += '\n';
+      continue;
+    }
+    if (char === '/' && next === '*') {
+      index += 2;
+      while (index < input.length && !(input[index] === '*' && input[index + 1] === '/')) index++;
+      index++;
+      continue;
+    }
+    output += char;
+  }
+  return output;
+};
+
+const stripTrailingCommas = input => {
+  let output = '';
+  let inString = false;
+  let quote = '';
+  let escaped = false;
+  for (let index = 0; index < input.length; index++) {
+    const char = input[index];
+    if (inString) {
+      output += char;
+      if (escaped) {
+        escaped = false;
+      } else if (char === '\\') {
+        escaped = true;
+      } else if (char === quote) {
+        inString = false;
+      }
+      continue;
+    }
+    if (char === '"' || char === "'") {
+      inString = true;
+      quote = char;
+      output += char;
+      continue;
+    }
+    if (char === ',') {
+      let lookahead = index + 1;
+      while (/\s/.test(input[lookahead] || '')) lookahead++;
+      if (input[lookahead] === '}' || input[lookahead] === ']') continue;
+    }
+    output += char;
+  }
+  return output;
+};
+
+const parseConfigContent = content => {
+  if (!content || typeof content !== 'string') return {};
+  try {
+    return JSON.parse(content);
+  } catch {
+    try {
+      return JSON.parse(stripTrailingCommas(stripJsonComments(content)));
+    } catch {
+      return {};
+    }
+  }
+};
+
+const readConfigFile = async filePath => {
+  const content = await fs.readFile(filePath, 'utf-8').catch(() => null);
+  return parseConfigContent(content);
+};
+
+const pathExists = async filePath =>
+  fs
+    .stat(filePath)
+    .then(() => true)
+    .catch(() => false);
+
+const findUpConfigPaths = async (startDir, filenames) => {
+  const results = [];
+  let dir = startDir || process.cwd();
+  while (dir) {
+    for (const file of filenames) results.push(path.join(dir, file));
+    if (await pathExists(path.join(dir, '.git'))) break;
+    const parent = path.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return results;
+};
+
+const configFilesInDir = dir => (dir ? ['config.json', 'opencode.json', 'opencode.jsonc'].map(file => path.join(dir, file)) : []);
+
+const isPlaywrightMcpEntry = (name, config) => {
+  const haystack = `${name || ''} ${JSON.stringify(config || {})}`.toLowerCase();
+  return haystack.includes('playwright');
+};
+
+export const collectPlaywrightMcpServerNames = (...configs) => {
+  const names = new Set();
+  for (const config of configs.flat()) {
+    if (!isPlainObject(config?.mcp)) continue;
+    for (const [name, mcpConfig] of Object.entries(config.mcp)) {
+      if (isPlaywrightMcpEntry(name, mcpConfig)) names.add(name);
+    }
+  }
+  return [...names];
+};
+
+export const buildPlaywrightMcpDisableConfig = (serverNames = []) => {
+  const names = [...new Set(['playwright', ...serverNames].filter(Boolean))];
+  const mcp = {};
+  const tools = {
+    '*playwright*': false,
+    'mcp__playwright__*': false,
+  };
+  for (const name of names) {
+    mcp[name] = {
+      type: 'local',
+      command: ['npx', '-y', '@playwright/mcp@latest'],
+      enabled: false,
+    };
+    tools[`${name}_*`] = false;
+    tools[`mcp__${name}__*`] = false;
+  }
+  return {
+    $schema: 'https://opencode.ai/config.json',
+    mcp,
+    tools,
+  };
+};
+
+export const mergePlaywrightMcpDisableConfigContent = (existingContent = '', serverNames = []) => {
+  const existingConfig = parseConfigContent(existingContent);
+  const detectedNames = collectPlaywrightMcpServerNames(existingConfig);
+  const disableConfig = buildPlaywrightMcpDisableConfig([...serverNames, ...detectedNames]);
+  return JSON.stringify(mergeDeep(existingConfig, disableConfig), null, 2);
+};
+
+const collectPlaywrightMcpServerNamesFromFiles = async filePaths => {
+  const configs = [];
+  for (const filePath of filePaths) configs.push(await readConfigFile(filePath));
+  return collectPlaywrightMcpServerNames(configs);
+};
+
+const getConfigHome = env => env.XDG_CONFIG_HOME || path.join(os.homedir(), '.config');
+
+const getOpenCodeConfigFilePaths = async ({ env = process.env, cwd = process.cwd() } = {}) => [...configFilesInDir(path.join(getConfigHome(env), 'opencode')), ...(env.OPENCODE_CONFIG ? [env.OPENCODE_CONFIG] : []), ...(await findUpConfigPaths(cwd, ['opencode.jsonc', 'opencode.json'])), ...configFilesInDir(env.OPENCODE_CONFIG_DIR)];
+
+const getAgentConfigFilePaths = async ({ env = process.env, cwd = process.cwd() } = {}) => [...configFilesInDir(path.join(getConfigHome(env), 'link-assistant-agent')), ...(env.LINK_ASSISTANT_AGENT_CONFIG ? [env.LINK_ASSISTANT_AGENT_CONFIG] : []), ...(env.OPENCODE_CONFIG ? [env.OPENCODE_CONFIG] : []), ...(await findUpConfigPaths(cwd, ['opencode.jsonc', 'opencode.json'])), ...configFilesInDir(path.join(cwd, '.link-assistant-agent')), ...configFilesInDir(path.join(cwd, '.opencode')), ...configFilesInDir(env.LINK_ASSISTANT_AGENT_CONFIG_DIR), ...configFilesInDir(env.OPENCODE_CONFIG_DIR)];
+
+export const getOpenCodePlaywrightMcpDisableEnv = async ({ env = process.env, cwd = process.cwd(), includeConfigFiles = true, log } = {}) => {
+  const inlineConfig = env.OPENCODE_CONFIG_CONTENT || '';
+  const names = collectPlaywrightMcpServerNames(parseConfigContent(inlineConfig));
+  if (includeConfigFiles) {
+    names.push(...(await collectPlaywrightMcpServerNamesFromFiles(await getOpenCodeConfigFilePaths({ env, cwd }))));
+  }
+  const uniqueNames = [...new Set(names)];
+  const displayNames = [...new Set(['playwright', ...uniqueNames])];
+  if (log) await log(`🎭 OpenCode Playwright MCP disabled through OPENCODE_CONFIG_CONTENT for: ${displayNames.join(', ')}`, { verbose: true });
+  return {
+    OPENCODE_CONFIG_CONTENT: mergePlaywrightMcpDisableConfigContent(inlineConfig, uniqueNames),
+  };
+};
+
+export const getAgentPlaywrightMcpDisableEnv = async ({ env = process.env, cwd = process.cwd(), includeConfigFiles = true, log } = {}) => {
+  const agentInlineConfig = env.LINK_ASSISTANT_AGENT_CONFIG_CONTENT || env.OPENCODE_CONFIG_CONTENT || '';
+  const names = collectPlaywrightMcpServerNames(parseConfigContent(agentInlineConfig), parseConfigContent(env.OPENCODE_CONFIG_CONTENT || ''));
+  if (includeConfigFiles) {
+    names.push(...(await collectPlaywrightMcpServerNamesFromFiles(await getAgentConfigFilePaths({ env, cwd }))));
+  }
+  const uniqueNames = [...new Set(names)];
+  const displayNames = [...new Set(['playwright', ...uniqueNames])];
+  const configContent = mergePlaywrightMcpDisableConfigContent(agentInlineConfig, uniqueNames);
+  if (log) await log(`🎭 Agent Playwright MCP disabled through LINK_ASSISTANT_AGENT_CONFIG_CONTENT for: ${displayNames.join(', ')}`, { verbose: true });
+  return {
+    LINK_ASSISTANT_AGENT_CONFIG_CONTENT: configContent,
+    OPENCODE_CONFIG_CONTENT: mergePlaywrightMcpDisableConfigContent(env.OPENCODE_CONFIG_CONTENT || agentInlineConfig, uniqueNames),
+  };
+};
+
+/** Build a temporary MCP config JSON excluding Playwright, for use with --strict-mcp-config */
+export const buildMcpConfigWithoutPlaywright = async log => {
+  try {
+    const claudeJsonPath = path.join(os.homedir(), '.claude.json');
+    const claudeJson = JSON.parse(await fs.readFile(claudeJsonPath, 'utf-8'));
+    const mcpServers = claudeJson.mcpServers || {};
+    const filtered = {};
+    for (const [name, config] of Object.entries(mcpServers)) {
+      if (name.toLowerCase().includes('playwright')) continue;
+      filtered[name] = config;
+    }
+    const tempConfigPath = path.join(os.tmpdir(), `claude-mcp-no-playwright-${Date.now()}-${process.pid}.json`);
+    await fs.writeFile(tempConfigPath, JSON.stringify({ mcpServers: filtered }, null, 2));
+    if (log) await log(`🎭 Created filtered MCP config (without Playwright): ${tempConfigPath}`, { verbose: true });
+    return tempConfigPath;
+  } catch (err) {
+    if (log) await log(`⚠️  Could not build filtered MCP config: ${err.message}`, { verbose: true });
+    return null;
+  }
+};
+
+/** Cascade --no-playwright-mcp to disable related flags */
+export const cascadePlaywrightMcpDisable = async (argv, log) => {
+  if (argv.playwrightMcp === false) {
+    if (log) await log('🎭 Playwright MCP physically disabled via --no-playwright-mcp', { verbose: true });
+    argv.promptPlaywrightMcp = false;
+    argv.playwrightMcpAutoCleanup = false;
+    if (log) await log('ℹ️  --prompt-playwright-mcp and --playwright-mcp-auto-cleanup also disabled', { verbose: true });
+  }
+};

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.config.lib.mjs

@@ -366,7 +366,7 @@ export const SOLVE_OPTION_DEFINITIONS = {
   },
   'prompt-playwright-mcp': {
     type: 'boolean',
-    description: 'Enable Playwright MCP browser automation hints in system prompt (enabled by default, only takes effect if Playwright MCP is installed). Use --no-prompt-playwright-mcp to disable. Supported for --tool claude and --tool codex.',
+    description: 'Enable Playwright MCP browser automation hints in system prompt (enabled by default, only takes effect if Playwright MCP is installed). Use --no-prompt-playwright-mcp to disable. Supported for --tool claude, --tool codex, --tool opencode, and --tool agent.',
     default: true,
   },
   'prompt-check-sibling-pull-requests': {
@@ -384,6 +384,11 @@ export const SOLVE_OPTION_DEFINITIONS = {
     description: 'Path to examples folder used in system prompt. Set to empty string to disable examples folder prompt. Default: ./examples',
     default: './examples',
   },
+  'playwright-mcp': {
+    type: 'boolean',
+    description: 'Enable Playwright MCP server connection for this session (enabled by default). Use --no-playwright-mcp to physically disable the Playwright MCP server without affecting the global MCP registration. When disabled, also disables --prompt-playwright-mcp and --playwright-mcp-auto-cleanup. Supported for --tool claude, --tool codex, --tool opencode, and --tool agent.',
+    default: true,
+  },
   'playwright-mcp-auto-cleanup': {
     type: 'boolean',
     description: 'Automatically remove .playwright-mcp/ folder before checking for uncommitted changes. This prevents browser automation artifacts from triggering auto-restart. Use --no-playwright-mcp-auto-cleanup to keep the folder for debugging.',

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');
@@ -707,12 +711,31 @@ try {
     $,
   });
 
+  const { cascadePlaywrightMcpDisable } = await import('./playwright-mcp.lib.mjs');
+  await cascadePlaywrightMcpDisable(argv, log);
+
+  async function resolvePlaywrightMcp(checkFn) {
+    if (argv.playwrightMcp === false) return;
+    if (argv.promptPlaywrightMcp) {
+      const available = await checkFn();
+      if (available) {
+        await log('🎭 Playwright MCP detected - enabling browser automation hints', { verbose: true });
+      } else {
+        await log('ℹ️  Playwright MCP not detected - browser automation hints will be disabled', { verbose: true });
+        argv.promptPlaywrightMcp = false;
+      }
+    } else {
+      await log('ℹ️  Playwright MCP explicitly disabled via --no-prompt-playwright-mcp', { verbose: true });
+    }
+  }
+
   // Execute tool command with all prompts and settings
   let toolResult;
   if (argv.tool === 'opencode') {
     const opencodeLib = await import('./opencode.lib.mjs');
-    const { executeOpenCode } = opencodeLib;
+    const { executeOpenCode, checkPlaywrightMcpAvailability: checkOpenCodePlaywrightMcp } = opencodeLib;
     const opencodePath = process.env.OPENCODE_PATH || 'opencode';
+    await resolvePlaywrightMcp(checkOpenCodePlaywrightMcp);
 
     toolResult = await executeOpenCode({
       issueUrl,
@@ -742,18 +765,7 @@ try {
     const codexLib = await import('./codex.lib.mjs');
     const { executeCodex, checkPlaywrightMcpAvailability } = codexLib;
     const codexPath = process.env.CODEX_PATH || 'codex';
-
-    if (argv.promptPlaywrightMcp) {
-      const playwrightMcpAvailable = await checkPlaywrightMcpAvailability();
-      if (playwrightMcpAvailable) {
-        await log('🎭 Playwright MCP detected - enabling browser automation hints', { verbose: true });
-      } else {
-        await log('ℹ️  Playwright MCP not detected - browser automation hints will be disabled', { verbose: true });
-        argv.promptPlaywrightMcp = false;
-      }
-    } else {
-      await log('ℹ️  Playwright MCP explicitly disabled via --no-prompt-playwright-mcp', { verbose: true });
-    }
+    await resolvePlaywrightMcp(checkPlaywrightMcpAvailability);
 
     toolResult = await executeCodex({
       issueUrl,
@@ -781,8 +793,9 @@ try {
     });
   } else if (argv.tool === 'agent') {
     const agentLib = await import('./agent.lib.mjs');
-    const { executeAgent } = agentLib;
+    const { executeAgent, checkPlaywrightMcpAvailability: checkAgentPlaywrightMcp } = agentLib;
     const agentPath = process.env.AGENT_PATH || 'agent';
+    await resolvePlaywrightMcp(checkAgentPlaywrightMcp);
 
     toolResult = await executeAgent({
       issueUrl,
@@ -810,20 +823,8 @@ try {
     });
   } else {
     // Default to Claude
-    // Check for Playwright MCP availability if using Claude tool
     if (argv.tool === 'claude' || !argv.tool) {
-      // If flag is true (default), check if Playwright MCP is actually available
-      if (argv.promptPlaywrightMcp) {
-        const playwrightMcpAvailable = await checkPlaywrightMcpAvailability();
-        if (playwrightMcpAvailable) {
-          await log('🎭 Playwright MCP detected - enabling browser automation hints', { verbose: true });
-        } else {
-          await log('ℹ️  Playwright MCP not detected - browser automation hints will be disabled', { verbose: true });
-          argv.promptPlaywrightMcp = false;
-        }
-      } else {
-        await log('ℹ️  Playwright MCP explicitly disabled via --no-prompt-playwright-mcp', { verbose: true });
-      }
+      await resolvePlaywrightMcp(checkPlaywrightMcpAvailability);
     }
     const claudeResult = await executeClaude({
       issueUrl,
@@ -967,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 });
@@ -1052,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 });