@link-assistant/hive-mind 1.12.0 → 1.13.0

package/src/solve.watch.lib.mjs

@@ -3,6 +3,8 @@
 /**
  * Watch mode module for solve.mjs
  * Monitors for feedback continuously and restarts when changes are detected
+ *
+ * Uses shared utilities from solve.restart-shared.lib.mjs for common functions.
  */
 
 // Check if use is already defined globally (when imported from solve.mjs)
@@ -15,10 +17,6 @@ const use = globalThis.use;
 // Use command-stream for consistent $ behavior across runtimes
 const { $ } = await use('command-stream');
 
-// Import path and fs for cleanup operations
-const path = (await use('path')).default;
-const fs = (await use('fs')).promises;
-
 // Import shared library functions
 const lib = await import('./lib.mjs');
 const { log, cleanErrorMessage, formatAligned, getLogFile } = lib;
@@ -35,75 +33,9 @@ const { sanitizeLogContent, attachLogToGitHub } = githubLib;
 
 const { detectAndCountFeedback } = feedbackLib;
 
-/**
- * Check if PR has been merged
- */
-const checkPRMerged = async (owner, repo, prNumber) => {
-  try {
-    const prResult = await $`gh api repos/${owner}/${repo}/pulls/${prNumber} --jq '.merged'`;
-    if (prResult.code === 0) {
-      return prResult.stdout.toString().trim() === 'true';
-    }
-  } catch (error) {
-    reportError(error, {
-      context: 'check_pr_merged',
-      owner,
-      repo,
-      prNumber,
-      operation: 'check_merge_status',
-    });
-    // If we can't check, assume not merged
-    return false;
-  }
-  return false;
-};
-
-/**
- * Clean up .playwright-mcp/ folder to prevent browser automation artifacts
- * from triggering auto-restart (Issue #1124)
- */
-const cleanupPlaywrightMcpFolder = async (tempDir, argv) => {
-  if (argv.playwrightMcpAutoCleanup !== false) {
-    const playwrightMcpDir = path.join(tempDir, '.playwright-mcp');
-    try {
-      const playwrightMcpExists = await fs
-        .stat(playwrightMcpDir)
-        .then(() => true)
-        .catch(() => false);
-      if (playwrightMcpExists) {
-        await fs.rm(playwrightMcpDir, { recursive: true, force: true });
-        await log('🧹 Cleaned up .playwright-mcp/ folder (browser automation artifacts)', { verbose: true });
-      }
-    } catch (cleanupError) {
-      // Non-critical error, just log and continue
-      await log(`⚠️  Could not clean up .playwright-mcp/ folder: ${cleanupError.message}`, { verbose: true });
-    }
-  }
-};
-
-/**
- * Check if there are uncommitted changes in the repository
- */
-const checkForUncommittedChanges = async (tempDir, $, argv = {}) => {
-  // First, clean up .playwright-mcp/ folder to prevent false positives (Issue #1124)
-  await cleanupPlaywrightMcpFolder(tempDir, argv);
-
-  try {
-    const gitStatusResult = await $({ cwd: tempDir })`git status --porcelain 2>&1`;
-    if (gitStatusResult.code === 0) {
-      const statusOutput = gitStatusResult.stdout.toString().trim();
-      return statusOutput.length > 0;
-    }
-  } catch (error) {
-    reportError(error, {
-      context: 'check_pr_closed',
-      tempDir,
-      operation: 'check_close_status',
-    });
-    // If we can't check, assume no uncommitted changes
-  }
-  return false;
-};
+// Import shared utilities from the restart-shared module
+const restartShared = await import('./solve.restart-shared.lib.mjs');
+const { checkPRMerged, checkForUncommittedChanges, getUncommittedChangesDetails, executeToolIteration, buildUncommittedChangesFeedback, isApiError } = restartShared;
 
 /**
  * Monitor for feedback in a loop and trigger restart when detected
@@ -143,7 +75,6 @@ export const watchForFeedback = async params => {
   await log('Press Ctrl+C to stop watching manually');
   await log('');
 
-  // let lastCheckTime = new Date(); // Not currently used
   let iteration = 0;
   let autoRestartCount = 0;
   let firstIterationInTemporaryMode = isTemporaryWatch;
@@ -164,7 +95,7 @@ export const watchForFeedback = async params => {
 
     // In temporary watch mode, check if all changes have been committed
     if (isTemporaryWatch && !firstIterationInTemporaryMode) {
-      const hasUncommitted = await checkForUncommittedChanges(tempDir, $, argv);
+      const hasUncommitted = await checkForUncommittedChanges(tempDir, argv);
       if (!hasUncommitted) {
         await log('');
         await log(formatAligned('✅', 'CHANGES COMMITTED!', 'Exiting auto-restart mode'));
@@ -219,7 +150,7 @@ export const watchForFeedback = async params => {
       // In temporary watch mode, also check for uncommitted changes as a restart trigger
       let hasUncommittedInTempMode = false;
       if (isTemporaryWatch && !firstIterationInTemporaryMode) {
-        hasUncommittedInTempMode = await checkForUncommittedChanges(tempDir, $, argv);
+        hasUncommittedInTempMode = await checkForUncommittedChanges(tempDir, argv);
       }
 
       const shouldRestart = hasFeedback || firstIterationInTemporaryMode || hasUncommittedInTempMode;
@@ -228,24 +159,10 @@ export const watchForFeedback = async params => {
         // Handle uncommitted changes in temporary watch mode (first iteration or subsequent)
         if (firstIterationInTemporaryMode || hasUncommittedInTempMode) {
           await log(formatAligned('📝', 'UNCOMMITTED CHANGES:', '', 2));
-          // Get uncommitted changes for display
-          try {
-            const gitStatusResult = await $({ cwd: tempDir })`git status --porcelain 2>&1`;
-            if (gitStatusResult.code === 0) {
-              const statusOutput = gitStatusResult.stdout.toString().trim();
-              for (const line of statusOutput.split('\n')) {
-                await log(formatAligned('', `• ${line}`, '', 4));
-              }
-            }
-          } catch (e) {
-            reportError(e, {
-              context: 'check_claude_file_exists',
-              owner,
-              repo,
-              branchName,
-              operation: 'check_file_in_branch',
-            });
-            // Ignore errors
+          // Get uncommitted changes for display using shared utility
+          const changes = await getUncommittedChangesDetails(tempDir);
+          for (const line of changes) {
+            await log(formatAligned('', `• ${line}`, '', 4));
           }
           await log('');
 
@@ -261,16 +178,8 @@ export const watchForFeedback = async params => {
 
               // Get uncommitted files list for the comment
               let uncommittedFilesList = '';
-              try {
-                const gitStatusResult = await $({ cwd: tempDir })`git status --porcelain 2>&1`;
-                if (gitStatusResult.code === 0) {
-                  const statusOutput = gitStatusResult.stdout.toString().trim();
-                  if (statusOutput) {
-                    uncommittedFilesList = '\n\n**Uncommitted files:**\n```\n' + statusOutput + '\n```';
-                  }
-                }
-              } catch {
-                // If we can't get the file list, continue without it
+              if (changes.length > 0) {
+                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 them.${uncommittedFilesList}\n\n---\n*Auto-restart will stop after changes are committed or after ${remainingIterations} more iteration${remainingIterations !== 1 ? 's' : ''}. Please wait until working session will end and give your feedback.*`;
@@ -289,39 +198,12 @@ export const watchForFeedback = async params => {
             }
           }
 
-          // Add uncommitted changes info to feedbackLines for the run
+          // Add uncommitted changes info to feedbackLines using shared utility
           if (!feedbackLines) {
             feedbackLines = [];
           }
-          feedbackLines.push('');
-          feedbackLines.push(`⚠️ UNCOMMITTED CHANGES DETECTED (Auto-restart ${autoRestartCount}/${maxAutoRestartIterations}):`);
-          feedbackLines.push('The following uncommitted changes were found in the repository:');
-
-          try {
-            const gitStatusResult = await $({ cwd: tempDir })`git status --porcelain 2>&1`;
-            if (gitStatusResult.code === 0) {
-              const statusOutput = gitStatusResult.stdout.toString().trim();
-              feedbackLines.push('');
-              for (const line of statusOutput.split('\n')) {
-                feedbackLines.push(`  ${line}`);
-              }
-              feedbackLines.push('');
-              feedbackLines.push('IMPORTANT: You MUST handle these uncommitted changes by either:');
-              feedbackLines.push('1. COMMITTING them if they are part of the solution (git add + git commit + git push)');
-              feedbackLines.push('2. REVERTING them if they are not needed (git checkout -- <file> or git clean -fd)');
-              feedbackLines.push('');
-              feedbackLines.push('DO NOT leave uncommitted changes behind. The session will auto-restart until all changes are resolved.');
-            }
-          } catch (e) {
-            reportError(e, {
-              context: 'recheck_claude_file',
-              owner,
-              repo,
-              branchName,
-              operation: 'verify_file_in_branch',
-            });
-            // Ignore errors
-          }
+          const uncommittedFeedback = buildUncommittedChangesFeedback(changes, autoRestartCount, maxAutoRestartIterations);
+          feedbackLines.push(...uncommittedFeedback);
         } else {
           await log(formatAligned('📢', 'FEEDBACK DETECTED!', '', 2));
           feedbackLines.forEach(async line => {
@@ -331,152 +213,23 @@ export const watchForFeedback = async params => {
           await log(formatAligned('🔄', 'Restarting:', `Re-running ${argv.tool.toUpperCase()} to handle feedback...`));
         }
 
-        // Import necessary modules for tool execution
-        const memoryCheck = await import('./memory-check.mjs');
-        const { getResourceSnapshot } = memoryCheck;
-
-        let toolResult;
-        if (argv.tool === 'opencode') {
-          // Use OpenCode
-          const opencodeExecLib = await import('./opencode.lib.mjs');
-          const { executeOpenCode } = opencodeExecLib;
-
-          // Get opencode path
-          const opencodePath = argv.opencodePath || 'opencode';
-
-          toolResult = await executeOpenCode({
-            issueUrl,
-            issueNumber,
-            prNumber,
-            prUrl: `https://github.com/${owner}/${repo}/pull/${prNumber}`,
-            branchName,
-            tempDir,
-            isContinueMode: true,
-            mergeStateStatus,
-            forkedRepo: argv.fork,
-            feedbackLines,
-            owner,
-            repo,
-            argv,
-            log,
-            formatAligned,
-            getResourceSnapshot,
-            opencodePath,
-            $,
-          });
-        } else if (argv.tool === 'codex') {
-          // Use Codex
-          const codexExecLib = await import('./codex.lib.mjs');
-          const { executeCodex } = codexExecLib;
-
-          // Get codex path
-          const codexPath = argv.codexPath || 'codex';
-
-          toolResult = await executeCodex({
-            issueUrl,
-            issueNumber,
-            prNumber,
-            prUrl: `https://github.com/${owner}/${repo}/pull/${prNumber}`,
-            branchName,
-            tempDir,
-            isContinueMode: true,
-            mergeStateStatus,
-            forkedRepo: argv.fork,
-            feedbackLines,
-            forkActionsUrl: null,
-            owner,
-            repo,
-            argv,
-            log,
-            setLogFile: () => {},
-            getLogFile: () => '',
-            formatAligned,
-            getResourceSnapshot,
-            codexPath,
-            $,
-          });
-        } else if (argv.tool === 'agent') {
-          // Use Agent
-          const agentExecLib = await import('./agent.lib.mjs');
-          const { executeAgent } = agentExecLib;
-
-          // Get agent path
-          const agentPath = argv.agentPath || 'agent';
-
-          toolResult = await executeAgent({
-            issueUrl,
-            issueNumber,
-            prNumber,
-            prUrl: `https://github.com/${owner}/${repo}/pull/${prNumber}`,
-            branchName,
-            tempDir,
-            isContinueMode: true,
-            mergeStateStatus,
-            forkedRepo: argv.fork,
-            feedbackLines,
-            forkActionsUrl: null,
-            owner,
-            repo,
-            argv,
-            log,
-            formatAligned,
-            getResourceSnapshot,
-            agentPath,
-            $,
-          });
-        } else {
-          // Use Claude (default)
-          const claudeExecLib = await import('./claude.lib.mjs');
-          const { executeClaude, checkPlaywrightMcpAvailability } = claudeExecLib;
-
-          // Get claude path
-          const claudePath = argv.claudePath || '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 });
-            }
-          }
-
-          toolResult = await executeClaude({
-            issueUrl,
-            issueNumber,
-            prNumber,
-            prUrl: `https://github.com/${owner}/${repo}/pull/${prNumber}`,
-            branchName,
-            tempDir,
-            isContinueMode: true,
-            mergeStateStatus,
-            forkedRepo: argv.fork,
-            feedbackLines,
-            owner,
-            repo,
-            argv,
-            log,
-            formatAligned,
-            getResourceSnapshot,
-            claudePath,
-            $,
-          });
-        }
+        // Execute tool using shared utility
+        const toolResult = await executeToolIteration({
+          issueUrl,
+          owner,
+          repo,
+          issueNumber,
+          prNumber,
+          branchName: prBranch || branchName,
+          tempDir,
+          mergeStateStatus,
+          feedbackLines,
+          argv,
+        });
 
         if (!toolResult.success) {
-          // Check if this is an API error (404, 401, 400, etc.) from the result
-          const isApiError = toolResult.result && (toolResult.result.includes('API Error:') || toolResult.result.includes('not_found_error') || toolResult.result.includes('authentication_error') || toolResult.result.includes('invalid_request_error'));
-
-          if (isApiError) {
+          // Check if this is an API error using shared utility
+          if (isApiError(toolResult)) {
             consecutiveApiErrors++;
             await log(formatAligned('⚠️', `${argv.tool.toUpperCase()} execution failed`, `API error detected (${consecutiveApiErrors}/${MAX_API_ERROR_RETRIES})`, 2));
 
@@ -578,8 +331,6 @@ export const watchForFeedback = async params => {
           }
         }
 
-        // Note: lastCheckTime tracking removed as it was not being used
-
         // Clear the first iteration flag after handling initial uncommitted changes
         if (firstIterationInTemporaryMode) {
           firstIterationInTemporaryMode = false;