@link-assistant/hive-mind 2.11.13 → 2.12.1

package/src/solve.mjs

@@ -5,7 +5,6 @@ import { ensureUseM } from './use-m-bootstrap.lib.mjs';
 const earlyArgs = process.argv.slice(2);
 const { handleSolveEarlyExit } = await import('./solve.bootstrap.lib.mjs');
 await handleSolveEarlyExit(earlyArgs);
-
 const use = (globalThis.use = await ensureUseM());
 const { $: __rawDollar$ } = await use('command-stream');
 const { configureGitHubRateLimitLogging, wrapDollarWithGhRetry } = await import('./github-rate-limit.lib.mjs');
@@ -63,18 +62,16 @@ const { startWorkSession, endWorkSession, SESSION_TYPES } = await import('./solv
 const { attachFinalLogIfMissing } = await import('./attach-logs-guarantee.lib.mjs'); // Issue #1952
 const { collectAndCommitDevelopmentLogArtifacts, fetchIssueType, isDevelopmentLogEnabled, isIssueTypeAwarePromptEnabled } = await import('./development-log.lib.mjs');
 const { createDevelopmentLogFinalizer } = await import('./development-log.finalize.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).
+// 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 { validateAndExitOnInvalidClaudeSubAgentModel, validateAndExitOnInvalidModel } = await import('./models/index.mjs');
 const { autoAcceptInviteForRepo } = await import('./solve.accept-invite.lib.mjs');
 const { handleAutoForkOption, handleMaintainerForkAccess } = await import('./solve.fork-detection.lib.mjs');
+const { resolveUncommittedChangesTool } = await import('./solve.tool-uncommitted.lib.mjs');
 const logFile = await initializeLogFile(null);
 const versionInfo = await getVersionInfo();
 const rawCommand = await logSolveStartup(versionInfo);
-
 let finalResourceSnapshotRecorded = false;
 const safeExit = async (code = 0, reason = 'Process completed', options = {}) => {
   if (!finalResourceSnapshotRecorded) {
@@ -83,7 +80,6 @@ const safeExit = async (code = 0, reason = 'Process completed', options = {}) =>
   }
   return await baseSafeExit(code, reason, options);
 };
-
 let argv;
 try {
   argv = await parseArguments(yargs, hideBin);
@@ -95,7 +91,6 @@ try {
   await safeExit(1, 'Invalid command-line arguments');
 }
 global.verboseMode = argv.verbose;
-
 setupVerboseLogInterceptor(); // Issue #1466: capture [VERBOSE] output in log files
 setupStdioLogInterceptor(); // Issue #1549: capture ALL terminal output in log file
 configureGitHubRateLimitLogging({
@@ -103,33 +98,8 @@ configureGitHubRateLimitLogging({
   log,
 });
 await recordResourceSnapshot({ phase: RESOURCE_PHASE_SOLVE_START, log, diskPath: '/', label: 'solve start', logExecutionContext: true }); // #2001: detect+report container context
-
-// Early logs go to cwd; custom log dir takes effect after argv is parsed
-// Conditionally import tool-specific functions after argv is parsed
-// If --use-agent-commander is enabled, use agent-commander's checkForUncommittedChanges
-let checkForUncommittedChanges;
-let agentCommanderLib = null;
-if (argv.useAgentCommander) {
-  agentCommanderLib = await import('./agent-commander.lib.mjs');
-  checkForUncommittedChanges = agentCommanderLib.checkForUncommittedChanges;
-} else if (argv.tool === 'opencode') {
-  const opencodeLib = await import('./opencode.lib.mjs');
-  checkForUncommittedChanges = opencodeLib.checkForUncommittedChanges;
-} else if (argv.tool === 'gemini') {
-  const geminiLib = await import('./gemini.lib.mjs');
-  checkForUncommittedChanges = geminiLib.checkForUncommittedChanges;
-} else if (argv.tool === 'codex') {
-  const codexLib = await import('./codex.lib.mjs');
-  checkForUncommittedChanges = codexLib.checkForUncommittedChanges;
-} else if (argv.tool === 'agent') {
-  const agentLib = await import('./agent.lib.mjs');
-  checkForUncommittedChanges = agentLib.checkForUncommittedChanges;
-} else if (argv.tool === 'qwen') {
-  const qwenLib = await import('./qwen.lib.mjs');
-  checkForUncommittedChanges = qwenLib.checkForUncommittedChanges;
-} else {
-  checkForUncommittedChanges = claudeLib.checkForUncommittedChanges;
-}
+// Early logs go to cwd; custom log dir takes effect after argv is parsed.
+let { checkForUncommittedChanges, agentCommanderLib } = await resolveUncommittedChangesTool({ argv, claudeLib });
 const shouldAttachLogs = argv.attachLogs || argv['attach-logs'];
 await showAttachLogsWarning(shouldAttachLogs);
 const absoluteLogPath = path.resolve(logFile);
@@ -161,10 +131,7 @@ const cleanupWrapper = async () => {
 const interruptWrapper = createInterruptWrapper({ cleanupContext, checkForUncommittedChanges, shouldAttachLogs, attachLogToGitHub, getLogFile, sanitizeLogContent, $, log });
 initializeExitHandler(getAbsoluteLogPath, log, cleanupWrapper, interruptWrapper, ({ code, reason, failureActionSection }) => notifyIssueAboutPrePullRequestFailure({ code, reason, failureActionSection, argv, globalState: global, $, log, getLogFile, shouldAttachLogs, attachLogToGitHub, sanitizeLogContent, rawCommand }));
 installGlobalExitHandlers({ handleProcessErrors: false }); // #2117: solve's richer process-error handlers below must not race a duplicate pair.
-// Issue #1823: Configure the working-session guard. When the experimental
-// --do-not-shutdown-in-the-middle-of-working-session flag is set (hive passes it to every
-// worker), an interrupt received during an AI working session is deferred: solve lets the AI
-// finish, auto-commits, then shuts down gracefully instead of aborting the AI tool mid-run.
+// Issue #1823: Configure the working-session guard. When the experimental --do-not-shutdown-in-the-middle-of-working-session flag is set (hive passes it to every worker), an interrupt received during an AI working session is deferred: solve lets the AI finish, auto-commits, then shuts down gracefully instead of aborting the AI tool mid-run.
 configureWorkingSession({ enabled: argv['do-not-shutdown-in-the-middle-of-working-session'] === true, log });
 const markFailureNotificationPosted = targetType => {
   global.preExitFailureNotificationPosted = true;
@@ -174,7 +141,6 @@ const markFailureNotificationPosted = targetType => {
     global.prePullRequestFailureNotificationPosted = true;
   }
 };
-
 // Now handle argument validation that was moved from early checks
 let issueUrl = argv['issue-url'] || argv._[0];
 if (!issueUrl) {
@@ -192,8 +158,7 @@ const { isIssueUrl, isPrUrl, normalizedUrl, owner, repo, number: urlNumber } = u
 issueUrl = normalizedUrl || issueUrl;
 global.owner = owner;
 global.repo = repo;
-// Issue #1752: record the source issue as soon as the URL is validated so the pre-exit
-// notifier can still comment on it if a check fails before normal issue-mode setup below.
+// Issue #1752: record the source issue as soon as the URL is validated so the pre-exit notifier can still comment on it if a check fails before normal issue-mode setup below.
 if (isIssueUrl) {
   global.issueNumber = urlNumber;
 }
@@ -235,13 +200,11 @@ if (!(await validateUrlRequirement(issueUrl))) {
 if (!(await validateContinueOnlyOnFeedback(argv, isPrUrl, isIssueUrl))) {
   await safeExit(1, 'Feedback validation failed');
 }
-
 // Validate model name EARLY - always runs regardless of --skip-tool-connection-check
 const tool = argv.tool || 'claude';
 await validateAndExitOnInvalidModel(argv.model, tool, safeExit);
 if (argv.fallbackModel) await validateAndExitOnInvalidModel(argv.fallbackModel, tool, safeExit);
 argv.originalModel ||= argv.model;
-
 // Validate --plan-model if provided (Issue #1223)
 if (argv.planModel) {
   if (tool !== 'claude') {
@@ -251,7 +214,6 @@ if (argv.planModel) {
   await validateAndExitOnInvalidModel(argv.planModel, tool, safeExit);
 }
 if (argv.subAgentModel) await validateAndExitOnInvalidClaudeSubAgentModel(argv.subAgentModel, tool, safeExit);
-
 // Perform all system checks (skip tool connection check in dry-run or when --skip-tool-connection-check; model validation always runs)
 const prepareOnly = argv.dryRun || argv.onlyPrepareCommand;
 const skipToolConnectionCheck = prepareOnly || argv.skipToolConnectionCheck || argv.toolConnectionCheck === false;
@@ -277,8 +239,7 @@ if (argv.verbose) {
   await log(`   Is PR URL: ${!!isPrUrl}`, { verbose: true });
 }
 const claudePath = argv.executeToolWithBun ? 'bunx claude' : process.env.CLAUDE_PATH || 'claude';
-// Note: owner, repo, and urlNumber are extracted from validateGitHubUrl() above
-// Accept pending invitation BEFORE any access checks (auto-fork, permissions, entity validation)
+// Note: owner, repo, and urlNumber are extracted from validateGitHubUrl() above Accept pending invitation BEFORE any access checks (auto-fork, permissions, entity validation)
 if (argv.autoAcceptInvite) {
   await autoAcceptInviteForRepo(owner, repo, log, argv.verbose);
 }
@@ -290,27 +251,22 @@ const hasWriteAccess = await checkRepositoryWritePermission(owner, repo, {
   useFork: argv.fork,
   issueUrl: issueUrl,
 });
-
 if (!hasWriteAccess) {
   await log('');
   await log('❌ Cannot proceed without repository write access or --fork option', { level: 'error' });
   await safeExit(1, 'Permission check failed');
 }
-
 // Issue #1552: Validate entity existence AFTER permissions (cascade: user/org → repo → issue/PR)
 const entityCheck = await (await import('./github-entity-validation.lib.mjs')).validateGitHubEntityExistence({ owner, repo, number: urlNumber, type: isIssueUrl ? 'issue' : isPrUrl ? 'pull' : undefined, baseBranch: argv.baseBranch, verbose: argv.verbose, autoAcceptInvite: !!argv.autoAcceptInvite });
 if (!entityCheck.valid) {
   await log(`\n❌ ${entityCheck.error}\n`, { level: 'error' });
   await safeExit(1, `GitHub entity not found (${entityCheck.level})`);
 }
-
-// Detect repository visibility once and reuse for downstream decisions
-// (auto-cleanup default + Issue #1716 private-repo fork bypass)
+// Detect repository visibility once and reuse for downstream decisions (auto-cleanup default + Issue #1716 private-repo fork bypass)
 const { detectRepositoryVisibility } = githubLib;
 const { isPublic: isRepoPublic } = await detectRepositoryVisibility(owner, repo);
 if (argv.autoCleanup === undefined) {
-  // For public repos: keep temp directories (default false)
-  // For private repos: clean up temp directories (default true)
+  // For public repos: keep temp directories (default false) For private repos: clean up temp directories (default true)
   argv.autoCleanup = !isRepoPublic;
   if (argv.verbose) {
     await log(`   Auto-cleanup default: ${argv.autoCleanup} (repository is ${isRepoPublic ? 'public' : 'private'})`, {
@@ -318,11 +274,7 @@ if (argv.autoCleanup === undefined) {
     });
   }
 }
-// Issue #1716: When the upstream repository is private and the user has direct
-// write access, fork-based workflows should be skipped — even if the existing
-// PR was originally created from a fork. Forks of private repositories often
-// become inaccessible (renamed, deleted, parent re-private'd) and there's no
-// reason to use them when we can push branches and PRs to the upstream repo.
+// Issue #1716: When the upstream repository is private and the user has direct write access, fork-based workflows should be skipped — even if the existing PR was originally created from a fork. Forks of private repositories often become inaccessible (renamed, deleted, parent re-private'd) and there's no reason to use them when we can push branches and PRs to the upstream repo.
 const skipForkForPrivateUpstream = !isRepoPublic && !argv.fork && hasWriteAccess;
 // Determine mode and get issue details
 let issueNumber;
@@ -376,7 +328,6 @@ if (autoContinueResult.isContinueMode) {
               await log('   Will clone fork repository for continue mode', { verbose: true });
             }
           }
-
           // Check if maintainer can push to the fork when --allow-to-push-to-contributors-pull-requests-as-maintainer is enabled
           if (forkOwner && argv.allowToPushToContributorsPullRequestsAsMaintainer && argv.autoFork) {
             await handleMaintainerForkAccess({ owner, repo, prNumber });
@@ -451,7 +402,6 @@ if (isPrUrl) {
           await log('   Will clone fork repository for continue mode', { verbose: true });
         }
       }
-
       // Check if maintainer can push to the fork when --allow-to-push-to-contributors-pull-requests-as-maintainer is enabled
       if (forkOwner && argv.allowToPushToContributorsPullRequestsAsMaintainer && argv.autoFork) {
         await handleMaintainerForkAccess({ owner, repo, prNumber });
@@ -503,8 +453,7 @@ const finalizeDevelopmentLog = createDevelopmentLogFinalizer({
   getParams: () => ({ enabled: isDevelopmentLogEnabled(argv), repositoryPath: tempDir, logFile: getLogFile(), issueNumber, prNumber, tool: argv.tool || 'claude', sessionId, branchName, rawCommand, $, log }), // prettier-ignore
 });
 try {
-  // Set up repository and clone using the new module
-  // If --working-directory points to existing repo, needsClone is false and we skip cloning
+  // Set up repository and clone using the new module If --working-directory points to existing repo, needsClone is false and we skip cloning
   const { forkedRepo } = await setupRepositoryAndClone({
     argv,
     owner,
@@ -519,12 +468,9 @@ try {
     $,
     needsClone,
   });
-
   cleanupContext.diskDiagnostics = { beforeBytes: await recordAfterCloneSize({ tempDir, log }) };
   await recordResourceSnapshot({ phase: RESOURCE_PHASE_AFTER_CLONE, log, diskPath: '/', label: 'after repository clone' });
-
-  // Verify default branch and status using the new module
-  // Pass argv, owner, repo, issueUrl for empty repository auto-initialization (--auto-init-repository)
+  // Verify default branch and status using the new module Pass argv, owner, repo, issueUrl for empty repository auto-initialization (--auto-init-repository)
   const defaultBranch = await verifyDefaultBranchAndStatus({
     tempDir,
     log,
@@ -552,7 +498,6 @@ try {
     prNumber,
   });
   cleanupContext.branchName = branchName;
-
   // Auto-merge default branch to pull request branch if enabled
   let autoMergeFeedbackLines = [];
   if (isContinueMode && argv['auto-merge-default-branch-to-pull-request-branch']) {
@@ -586,16 +531,13 @@ try {
       autoMergeFeedbackLines.push('');
     }
   }
-
   // Initialize PR variables early
   let prUrl = null;
-
   // In continue mode, we already have the PR details
   if (isContinueMode) {
     prUrl = issueUrl; // The input URL is the PR URL
     // prNumber is already set from earlier when we parsed the PR
   }
-
   // Handle auto PR creation using the new module
   const autoPrResult = await handleAutoPrCreation({
     argv,
@@ -615,7 +557,6 @@ try {
     path,
     fs,
   });
-
   let claudeCommitHash = null;
   if (autoPrResult) {
     prUrl = autoPrResult.prUrl;
@@ -627,17 +568,12 @@ try {
     }
   }
   if (prNumber) cleanupContext.prNumber = prNumber;
-
-  // CRITICAL: Validate that we have a PR number when required
-  // This prevents continuing without a PR when one was supposed to be created
+  // CRITICAL: Validate that we have a PR number when required This prevents continuing without a PR when one was supposed to be created
   if ((isContinueMode || argv.autoPullRequestCreation) && !prNumber) {
     await handleNoPrAvailableError({ isContinueMode, tempDir, issueNumber, issueUrl, owner, repo, log, formatAligned });
   }
-
   const enforceRequestedBaseBranch = () => ensurePullRequestBaseBranch({ owner, repo, prNumber, argv, log, formatAligned, $ });
-
   await enforceRequestedBaseBranch();
-
   if (isContinueMode) {
     await log(`\n${formatAligned('🔄', 'Continue mode:', 'ACTIVE')}`);
     await log(formatAligned('', 'Using existing PR:', `#${prNumber}`, 2));
@@ -646,10 +582,7 @@ try {
     await log(`\n${formatAligned('⏭️', 'Auto PR creation:', 'DISABLED')}`);
     await log(formatAligned('', 'Workflow:', 'AI will create the PR', 2));
   }
-
-  // Start work session using the new module
-  // Determine session type based on command line flags
-  // See: https://github.com/link-assistant/hive-mind/issues/1152
+  // Start work session using the new module Determine session type based on command line flags See: https://github.com/link-assistant/hive-mind/issues/1152
   let sessionType = SESSION_TYPES.NEW;
   if (argv.sessionType) {
     // Session type was explicitly set (e.g., by auto-resume/auto-restart spawning a new process)
@@ -667,7 +600,6 @@ try {
     $,
     sessionType,
   });
-
   // Prepare feedback and timestamps using the new module
   const { feedbackLines: preparedFeedbackLines, referenceTime } = await prepareFeedbackAndTimestamps({
     prNumber,
@@ -685,10 +617,8 @@ try {
     tempDir,
     $,
   });
-
   // Initialize feedback lines
   let feedbackLines = null;
-
   // Add auto-merge feedback lines if any
   if (autoMergeFeedbackLines && autoMergeFeedbackLines.length > 0) {
     if (!feedbackLines) {
@@ -696,7 +626,6 @@ try {
     }
     feedbackLines.push(...autoMergeFeedbackLines);
   }
-
   // Merge feedback lines
   if (preparedFeedbackLines && preparedFeedbackLines.length > 0) {
     if (!feedbackLines) {
@@ -704,7 +633,6 @@ try {
     }
     feedbackLines.push(...preparedFeedbackLines);
   }
-
   // Check for uncommitted changes and merge with feedback
   const uncommittedFeedbackLines = await checkUncommittedChanges({
     tempDir,
@@ -718,7 +646,6 @@ try {
     }
     feedbackLines.push(...uncommittedFeedbackLines);
   }
-
   // Check for fork actions
   const forkActionsUrl = await checkForkActions({
     argv,
@@ -728,22 +655,16 @@ try {
     formatAligned,
     $,
   });
-
   // Execute tool command with all prompts and settings
   let toolResult;
-
-  // Issue #1823: Mark the start of the AI working session. While this is active and the
-  // --do-not-shutdown-in-the-middle-of-working-session flag is set, an interrupt (CTRL+C/SIGTERM)
-  // is deferred until the AI tool finishes its turn (see exit-handler.lib.mjs + working-session.lib.mjs).
+  // Issue #1823: Mark the start of the AI working session. While this is active and the --do-not-shutdown-in-the-middle-of-working-session flag is set, an interrupt (CTRL+C/SIGTERM) is deferred until the AI tool finishes its turn (see exit-handler.lib.mjs + working-session.lib.mjs).
   beginWorkingSession();
-
   // If --use-agent-commander is enabled, use agent-commander for all tools
   if (argv.useAgentCommander) {
     // Ensure agent-commander is available
     if (!agentCommanderLib) {
       agentCommanderLib = await import('./agent-commander.lib.mjs');
     }
-
     const isAvailable = await agentCommanderLib.isAgentCommanderAvailable();
     if (!isAvailable) {
       await log('\n[agent-commander] agent-commander is not installed.', { level: 'error' });
@@ -751,9 +672,7 @@ try {
       await log('   Or remove the --use-agent-commander flag to use embedded tool logic.', { level: 'error' });
       await safeExit(1, 'agent-commander not available');
     }
-
     await log(`\n[agent-commander] Using agent-commander for ${argv.tool || 'claude'} execution`);
-
     toolResult = await agentCommanderLib.executeWithAgentCommander({
       issueUrl,
       issueNumber,
@@ -786,7 +705,6 @@ try {
       qwen: { lib: './qwen.lib.mjs', execFn: 'executeQwen', envVar: 'QWEN_PATH', defaultBin: 'qwen', pathKey: 'qwenPath' },
     }[argv.tool];
     const toolLib = await import(toolDispatch.lib);
-
     toolResult = await toolLib[toolDispatch.execFn]({
       issueUrl,
       issueNumber,
@@ -839,17 +757,13 @@ try {
     });
     toolResult = claudeResult;
   }
-
   try {
     await recordAfterAgentSize({ tempDir, beforeBytes: cleanupContext.diskDiagnostics?.beforeBytes ?? null, log });
   } catch (diskError) {
     await log(`⚠️  Disk-size measurement failed: ${cleanErrorMessage(diskError)}`, { level: 'warning', verbose: true });
   }
   await recordResourceSnapshot({ phase: RESOURCE_PHASE_AFTER_AGENT, log, diskPath: '/', label: 'after AI execution' });
-
-  // Issue #1823: Mark the end of the AI working session. If a graceful-shutdown interrupt arrived
-  // during the session (deferred by the working-session guard), honor it now: auto-commit any
-  // uncommitted changes and exit gracefully — only AFTER the AI tool has fully finished its turn.
+  // Issue #1823: Mark the end of the AI working session. If a graceful-shutdown interrupt arrived during the session (deferred by the working-session guard), honor it now: auto-commit any uncommitted changes and exit gracefully — only AFTER the AI tool has fully finished its turn.
   const workingSessionState = endWorkingSession();
   if (workingSessionState.shutdownRequested) {
     const shutdownExitCode = workingSessionState.shutdownSignal === 'SIGINT' ? 130 : 143;
@@ -860,11 +774,9 @@ try {
     } catch (interruptError) {
       await log(`⚠️  Auto-commit on graceful shutdown failed: ${cleanErrorMessage(interruptError)}`, { level: 'warning' });
     }
-    // Graceful shutdown is NOT a failure: skip the pre-exit failure notifier so no spurious
-    // "solver failed" comment is posted (issue #1823: no errors on graceful shutdown).
+    // Graceful shutdown is NOT a failure: skip the pre-exit failure notifier so no spurious "solver failed" comment is posted (issue #1823: no errors on graceful shutdown).
     await safeExit(shutdownExitCode, 'Graceful shutdown after AI working session', { skipPreExit: true });
   }
-
   if (toolResult.preparedOnly) await safeExit(0, 'Command prepared', { skipPreExit: true });
   const { success } = toolResult;
   sessionId = toolResult.sessionId;
@@ -876,7 +788,6 @@ try {
   let resultModelUsage = toolResult.resultModelUsage || null;
   let streamTokenUsage = toolResult.streamTokenUsage || null;
   let subAgentCalls = toolResult.subAgentCalls || null; // Issue #1590
-
   const applyRestartResult = result => {
     if (!result) return;
     sessionId = result.sessionId || sessionId;
@@ -886,14 +797,12 @@ try {
   };
   limitReached = toolResult.limitReached;
   cleanupContext.limitReached = limitReached;
-
   if (sessionId && (argv.resumeOnAutoRestart || argv['resume-on-auto-restart'])) {
     global.previousSessionId = sessionId;
     if (argv.verbose) {
       await log(`Session ID stored for auto-restart resume: ${sessionId}`, { verbose: true });
     }
   }
-
   // Capture limit reset time and timezone globally for downstream handlers (auto-continue, cleanup decisions)
   if (toolResult && toolResult.limitResetTime) {
     global.limitResetTime = toolResult.limitResetTime;
@@ -901,20 +810,16 @@ try {
   if (toolResult && toolResult.limitTimezone) {
     global.limitTimezone = toolResult.limitTimezone;
   }
-
   // Handle limit reached scenario
   if (limitReached) {
-    // Check for both auto-resume (maintains context) and auto-restart (fresh start)
-    // See: https://github.com/link-assistant/hive-mind/issues/1152
+    // Check for both auto-resume (maintains context) and auto-restart (fresh start) See: https://github.com/link-assistant/hive-mind/issues/1152
     const shouldAutoResumeOnReset = argv.autoResumeOnLimitReset;
     const shouldAutoRestartOnReset = argv.autoRestartOnLimitReset;
     const shouldAutoContinueOnReset = shouldAutoResumeOnReset || shouldAutoRestartOnReset;
-
     // If limit was reached but neither auto-resume nor auto-restart is enabled, fail immediately
     if (!shouldAutoContinueOnReset) {
       await log('\n❌ USAGE LIMIT REACHED!');
       await log('   The AI tool has reached its usage limit.');
-
       // Always show manual resume command in console so users can resume after limit resets
       if (sessionId) {
         const resetTime = global.limitResetTime;
@@ -923,8 +828,7 @@ try {
         await log(`📁 Working directory: ${tempDir}`);
         await log(`📌 Session ID: ${sessionId}`);
         if (resetTime) {
-          // Format reset time with relative time and UTC for better user understanding
-          // See: https://github.com/link-assistant/hive-mind/issues/1152
+          // Format reset time with relative time and UTC for better user understanding See: https://github.com/link-assistant/hive-mind/issues/1152
           const formattedResetTime = formatResetTimeWithRelative(resetTime, timezone);
           await log(`⏰ Limit resets at: ${formattedResetTime}`);
         }
@@ -944,7 +848,6 @@ try {
           await log('');
         }
       }
-
       // If --attach-logs is enabled and we have a PR, attach logs with usage limit details
       if (shouldAttachLogs && sessionId && prNumber) {
         await log('\n📄 Attaching logs to Pull Request...');
@@ -972,7 +875,6 @@ try {
             tool: argv.tool || 'claude',
             resultModelUsage, // Issue #1454: accurate multi-model display
           });
-
           if (logUploadSuccess) {
             markFailureNotificationPosted('pr');
             await log('  ✅ Logs uploaded successfully');
@@ -988,15 +890,12 @@ try {
         // Fallback: Post simple failure comment (no CLI commands in GitHub comments, only mention option)
         try {
           const resetTime = global.limitResetTime;
-          // Issue #942: do not embed CLI commands in GitHub comments. Users
-          // interact via the Telegram bot, not the CLI. The full resume
-          // commands (interactive/autonomous/solve) live in the attached logs.
+          // Issue #942: do not embed CLI commands in GitHub comments. Users interact via the Telegram bot, not the CLI. The full resume commands (interactive/autonomous/solve) live in the attached logs.
           const resumeSection = sessionId ? `Session ID: \`${sessionId}\`\n\nUse the \`--auto-resume-on-limit-reset\` or \`--auto-restart-on-limit-reset\` option to automatically resume when the limit resets.` : 'Use the `--auto-resume-on-limit-reset` or `--auto-restart-on-limit-reset` option to automatically resume when the limit resets.';
           // 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_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 posted = await postTrackedComment({ $, owner, repo, targetNumber: prNumber, body: failureComment });
           if (posted.ok) {
             markFailureNotificationPosted('pr');
@@ -1006,11 +905,9 @@ try {
           await log(`   Warning: Could not post failure comment: ${cleanErrorMessage(error)}`, { verbose: true });
         }
       }
-
       await safeExit(1, 'Usage limit reached - use --auto-resume-on-limit-reset or --auto-restart-on-limit-reset to wait for reset');
     } else {
-      // auto-resume-on-limit-reset or auto-restart-on-limit-reset is enabled - attach logs and/or post waiting comment
-      // Determine the mode type for comment formatting
+      // auto-resume-on-limit-reset or auto-restart-on-limit-reset is enabled - attach logs and/or post waiting comment Determine the mode type for comment formatting
       const limitContinueMode = shouldAutoRestartOnReset ? 'restart' : 'resume';
       if (prNumber && global.limitResetTime) {
         // If --attach-logs is enabled, upload logs with usage limit details
@@ -1035,8 +932,7 @@ try {
               toolName: getToolDisplayName(argv.tool),
               resumeCommand,
               sessionId,
-              // Tell attachLogToGitHub that auto-resume is enabled to suppress CLI commands in the comment
-              // See: https://github.com/link-assistant/hive-mind/issues/1152
+              // Tell attachLogToGitHub that auto-resume is enabled to suppress CLI commands in the comment See: https://github.com/link-assistant/hive-mind/issues/1152
               isAutoResumeEnabled: true,
               autoResumeMode: limitContinueMode,
               argv,
@@ -1044,7 +940,6 @@ try {
               tool: argv.tool || 'claude',
               resultModelUsage, // Issue #1454: accurate multi-model display
             });
-
             if (logUploadSuccess) {
               await log('  ✅ Logs uploaded successfully');
             } else {
@@ -1062,7 +957,6 @@ try {
             const validation = await import('./solve.validation.lib.mjs');
             const { calculateWaitTime } = validation;
             const waitMs = calculateWaitTime(global.limitResetTime, global.limitTimezone || null);
-
             const formatWaitTime = ms => {
               const seconds = Math.floor(ms / 1000);
               const minutes = Math.floor(seconds / 60);
@@ -1073,16 +967,12 @@ try {
               const h = hours % 24;
               return `${days}:${String(h).padStart(2, '0')}:${String(m).padStart(2, '0')}:${String(s).padStart(2, '0')}`;
             };
-
-            // For waiting comments, don't show CLI commands since auto-continue will handle it automatically
-            // See: https://github.com/link-assistant/hive-mind/issues/1152
+            // For waiting comments, don't show CLI commands since auto-continue will handle it automatically See: https://github.com/link-assistant/hive-mind/issues/1152
             const continueModeName = limitContinueMode === 'restart' ? 'auto-restart' : 'auto-resume';
             const continueDescription = limitContinueMode === 'restart' ? 'The session will automatically restart (fresh start) when the limit resets.' : 'The session will automatically resume (with context preserved) when the limit resets.';
-            // Format reset time with relative time and UTC for better user understanding
-            // See: https://github.com/link-assistant/hive-mind/issues/1236
+            // 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_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 posted = await postTrackedComment({ $, owner, repo, targetNumber: prNumber, body: waitingComment });
             if (posted.ok) {
               await log(`   Posted waiting comment to PR${posted.commentId ? ` (id=${posted.commentId})` : ''}`);
@@ -1094,14 +984,10 @@ try {
       }
     }
   }
-
   // Skip failure exit if limit reached with auto-resume (continues to showSessionSummary/autoContinueWhenLimitResets)
   const shouldSkipFailureExitForAutoLimitContinue = limitReached && argv.autoResumeOnLimitReset;
   if (!success && !shouldSkipFailureExitForAutoLimitContinue) {
-    // Issue #942: show all three resume options on failure for richer guidance.
-    //   1. Interactive claude  - opens Claude Code interactively (claude only)
-    //   2. Autonomous claude   - one-shot claude --resume w/ --dangerously-skip-permissions -p (claude only)
-    //   3. Solve resume        - re-enters solve.mjs with --resume, preserving tool/model/dir
+    // Issue #942: show all three resume options on failure for richer guidance.   1. Interactive claude  - opens Claude Code interactively (claude only)   2. Autonomous claude   - one-shot claude --resume w/ --dangerously-skip-permissions -p (claude only)   3. Solve resume        - re-enters solve.mjs with --resume, preserving tool/model/dir
     const toolForFailure = argv.tool || 'claude';
     // Issue #1845: surface the core error instead of just "<TOOL> execution failed" (terminal + comment).
     const toolFailureMessage = formatToolExecutionFailure({ tool: toolForFailure, toolResult });
@@ -1118,7 +1004,6 @@ try {
       }
       await log('');
     }
-
     // Preserve work before remote diagnostics; issue #2101 ended during log upload.
     try {
       const { criticalErrorRecovery } = await import('./config.lib.mjs');
@@ -1129,14 +1014,12 @@ try {
     } catch (preserveError) {
       await log(`  ⚠️  Could not auto-commit before failure exit: ${preserveError.message}`, { verbose: true });
     }
-
     // Attach failure logs before exiting (Issues #1212, #1462: fall back to issue if no PR)
     const hasPR = global.createdPR && global.createdPR.number;
     const hasIssue = global.issueNumber;
     const logTargetType = hasPR ? 'pr' : hasIssue ? 'issue' : null;
     const logTargetNumber = hasPR ? global.createdPR.number : hasIssue ? global.issueNumber : null;
     const logTargetLabel = hasPR ? 'Pull Request' : `original issue #${logTargetNumber}`;
-
     if (shouldAttachLogs && logTargetType && logTargetNumber) {
       await log(`\n📄 Attaching failure logs to ${logTargetLabel}...`);
       try {
@@ -1166,7 +1049,6 @@ try {
           tool: argv.tool || 'claude',
           resultModelUsage, // Issue #1454: accurate multi-model display
         });
-
         if (logUploadSuccess) {
           markFailureNotificationPosted(logTargetType);
           await log(`  📎 Failure logs posted to ${logTargetLabel}`);
@@ -1179,10 +1061,8 @@ try {
         await log(`  ⚠️  Error uploading failure logs: ${uploadError.message}`);
       }
     }
-
     await safeExit(1, toolFailureMessage);
   }
-
   // Clean up .playwright-mcp/ to prevent browser artifacts from triggering auto-restart (Issue #1124)
   if (argv.playwrightMcpAutoCleanup !== false) {
     const playwrightMcpDir = path.join(tempDir, '.playwright-mcp');
@@ -1202,30 +1082,19 @@ try {
   } else {
     await log('ℹ️  Playwright MCP auto-cleanup disabled via --no-playwright-mcp-auto-cleanup', { verbose: true });
   }
-
-  // When limit is reached, force auto-commit of any uncommitted changes to preserve work.
-  // Issue #1834 (PR #1835 feedback): "on all critical errors we auto commit uncommitted changes by
-  // default." A failed/errored session is a critical error, so auto-commit (and push) to preserve any
-  // work the agent left on disk. On by default; disable via HIVE_MIND_AUTO_COMMIT_ON_CRITICAL_ERROR=false.
+  // When limit is reached, force auto-commit of any uncommitted changes to preserve work. Issue #1834 (PR #1835 feedback): "on all critical errors we auto commit uncommitted changes by default." A failed/errored session is a critical error, so auto-commit (and push) to preserve any work the agent left on disk. On by default; disable via HIVE_MIND_AUTO_COMMIT_ON_CRITICAL_ERROR=false.
   const { criticalErrorRecovery } = await import('./config.lib.mjs');
   const criticalError = success === false || errorDuringExecution === true;
   const shouldAutoCommit = argv['auto-commit-uncommitted-changes'] || limitReached || (criticalError && criticalErrorRecovery.autoCommitUncommittedChanges);
   const autoRestartEnabled = argv['autoRestartOnUncommittedChanges'] !== false;
   const shouldRestart = await checkForUncommittedChanges(tempDir, owner, repo, branchName, $, log, shouldAutoCommit, autoRestartEnabled);
-
-  // Issue #1516: cleanupClaudeFile() moved to after completion signals (before endWorkSession)
-
-  // Show summary of session and log file
+  // Issue #1516: cleanupClaudeFile() moved to after completion signals (before endWorkSession) Show summary of session and log file
   await showSessionSummary(sessionId, limitReached, argv, issueUrl, tempDir, shouldAttachLogs);
-
-  // Issue #1571: Defense-in-depth guard — skip post-processing if auto-continue is handling it
-  // (prevents "Solution Draft Log" / "Ready to merge" comments before "Auto Resume")
+  // Issue #1571: Defense-in-depth guard — skip post-processing if auto-continue is handling it (prevents "Solution Draft Log" / "Ready to merge" comments before "Auto Resume")
   if (limitReached && (argv.autoResumeOnLimitReset || argv.autoRestartOnLimitReset) && global.limitResetTime) {
     await safeExit(0, 'Auto-continue child process will handle post-processing');
   }
-
   await enforceRequestedBaseBranch();
-
   // Issue #2048: commit+push dev log BEFORE any PR readiness signal so its CI gates readiness (was last, breaking CI post-signal; PR #2046, docs/case-studies/issue-2048). Idempotent: trailing call is a no-op. prettier-ignore
   await finalizeDevelopmentLog();
   // Issue #1263 / #1728 / #2115: shared summary attachment and usage display.
@@ -1241,25 +1110,20 @@ try {
     pricingInfo,
     sessionUsage: { sessionId, tempDir, resultModelUsage, streamTokenUsage, subAgentCalls },
   });
-
   // Search for newly created pull requests and comments
   const verifyResult = await verifyResults(owner, repo, branchName, issueNumber, prNumber, prUrl, referenceTime, argv, shouldAttachLogs, shouldRestart, sessionId, tempDir, anthropicTotalCostUSD, publicPricingEstimate, pricingInfo, errorDuringExecution, sessionType, resultModelUsage, streamTokenUsage, subAgentCalls, workingSessionBudgetStatsData);
   const logsAlreadyUploaded = verifyResult?.logUploadSuccess || false;
-
   // Issue #1162: Auto-restart when PR title/description still has placeholder content
   if (argv.autoRestartOnNonUpdatedPullRequestDescription && (verifyResult?.prTitleHasPlaceholder || verifyResult?.prBodyHasPlaceholder)) {
     const { buildPRNotUpdatedHint } = results;
     const hintLines = buildPRNotUpdatedHint(verifyResult.prTitleHasPlaceholder, verifyResult.prBodyHasPlaceholder);
-
     await log('');
     await log('🔄 AUTO-RESTART: PR title/description not updated by agent');
     hintLines.forEach(async line => await log(`   ${line}`));
     await log('   Restarting tool to give agent another chance to update...');
     await log('');
-
     // Import executeToolIteration for re-execution
     const { executeToolIteration } = await import('./solve.restart-shared.lib.mjs');
-
     // Re-execute tool with hint as feedback lines
     const restartResult = await executeToolIteration({
       issueUrl,
@@ -1278,16 +1142,12 @@ try {
         autoRestartOnNonUpdatedPullRequestDescription: false,
       },
     });
-
     // Update session data from restart
     applyRestartResult(restartResult);
-
     // Clean up CLAUDE.md/.gitkeep again after restart
     await cleanupClaudeFile(tempDir, branchName, null, argv);
-
     // Re-verify results after restart (without auto-restart flag to prevent recursion)
     const reVerifyResult = await verifyResults(owner, repo, branchName, issueNumber, prNumber, prUrl, referenceTime, { ...argv, autoRestartOnNonUpdatedPullRequestDescription: false }, shouldAttachLogs, false, sessionId, tempDir, anthropicTotalCostUSD, publicPricingEstimate, pricingInfo, errorDuringExecution, sessionType, resultModelUsage, streamTokenUsage, subAgentCalls);
-
     if (reVerifyResult?.prTitleHasPlaceholder || reVerifyResult?.prBodyHasPlaceholder) {
       await log('⚠️  PR title/description still not updated after restart');
     }
@@ -1296,7 +1156,6 @@ try {
   applyRestartResult(await runEscalation({ issueUrl, owner, repo, issueNumber, prNumber, branchName, tempDir, workspaceTmpDir, argv, cleanupClaudeFile, resultSummary }));
   applyRestartResult(await runAutoEnsureRequirements({ issueUrl, owner, repo, issueNumber, prNumber, branchName, tempDir, argv, cleanupClaudeFile }));
   applyRestartResult(await runKeepWorkingUntilDone({ issueUrl, owner, repo, issueNumber, prNumber, branchName, tempDir, workspaceTmpDir, argv, cleanupClaudeFile, resultSummary }));
-
   // Start watch mode if enabled OR if we need to handle uncommitted changes
   if (argv.verbose) {
     await log('');
@@ -1309,7 +1168,6 @@ try {
     await log(`   branchName: ${branchName}`, { verbose: true });
     await log(`   isContinueMode: ${isContinueMode}`, { verbose: true });
   }
-
   // If uncommitted changes detected and auto-commit is disabled, enter temporary watch mode
   const temporaryWatchMode = shouldRestart && !argv.watch;
   if (temporaryWatchMode) {
@@ -1320,7 +1178,6 @@ try {
     await log('   Will exit automatically after changes are committed or discarded');
     await log('');
   }
-
   const watchResult = await startWatchMode({
     issueUrl,
     owner,
@@ -1338,7 +1195,6 @@ try {
       temporaryWatch: temporaryWatchMode, // Flag to indicate temporary watch mode
     },
   });
-
   if (watchResult && watchResult.latestSessionId) {
     sessionId = watchResult.latestSessionId;
     anthropicTotalCostUSD = watchResult.latestAnthropicCost;
@@ -1351,19 +1207,14 @@ try {
       }
     }
   }
-
   await enforceRequestedBaseBranch();
-
   // Track whether logs were successfully attached (used by endWorkSession)
   let logsAttached = false;
-
-  // After watch mode completes (either user watch or temporary)
-  // Push any committed changes if this was a temporary watch mode
+  // After watch mode completes (either user watch or temporary) Push any committed changes if this was a temporary watch mode
   if (temporaryWatchMode) {
     await log('');
     await log('📤 Pushing committed changes to GitHub...');
     await log('');
-
     try {
       const pushResult = await $({ cwd: tempDir })`git push origin ${branchName} 2>&1`;
       if (pushResult.code === 0) {
@@ -1383,13 +1234,8 @@ try {
       await log('   Please push manually:', { level: 'error' });
       await log(`   cd ${tempDir} && git push origin ${branchName}`, { level: 'error' });
     }
-
     await verifyPullRequestIssueLinkAfterAutoRestart({ prNumber, issueNumber, owner, repo, argv, cleanErrorMessage });
-
-    // Attach updated logs to PR after auto-restart completes
-    // Issue #1154: Skip if logs were already uploaded by verifyResults() to prevent duplicates
-    // Issue #1290: Always upload if auto-restart ran but last iteration's logs weren't uploaded
-    //   This ensures final logs are uploaded even when the last iteration failed
+    // Attach updated logs to PR after auto-restart completes Issue #1154: Skip if logs were already uploaded by verifyResults() to prevent duplicates Issue #1290: Always upload if auto-restart ran but last iteration's logs weren't uploaded   This ensures final logs are uploaded even when the last iteration failed
     const autoRestartRanButNotUploaded = watchResult?.autoRestartIterationsRan && !watchResult?.lastIterationLogUploaded;
     if (shouldAttachLogs && prNumber && (!logsAlreadyUploaded || autoRestartRanButNotUploaded)) {
       await log('📎 Uploading working session logs to Pull Request...');
@@ -1412,7 +1258,6 @@ try {
           tool: argv.tool || 'claude',
           resultModelUsage, // Issue #1454: accurate multi-model display
         });
-
         if (logUploadSuccess) {
           await log('✅ Working session logs uploaded successfully');
           logsAttached = true;
@@ -1427,10 +1272,7 @@ try {
       logsAttached = true;
     }
   }
-
-  // Start auto-restart-until-mergeable mode if enabled
-  // This runs after the normal watch mode completes (if any)
-  // --auto-merge implies --auto-restart-until-mergeable
+  // Start auto-restart-until-mergeable mode if enabled This runs after the normal watch mode completes (if any) --auto-merge implies --auto-restart-until-mergeable
   if (argv.autoMerge || argv.autoRestartUntilMergeable) {
     const autoMergeResult = await startAutoRestartUntilMergeable({
       issueUrl,
@@ -1443,7 +1285,6 @@ try {
       tempDir,
       argv,
     });
-
     // Update session data with latest from auto-merge mode for accurate pricing
     if (autoMergeResult && autoMergeResult.latestSessionId) {
       sessionId = autoMergeResult.latestSessionId;
@@ -1458,13 +1299,10 @@ try {
       }
     }
   }
-
   // Issue #1952: Final --attach-logs safety net + logsAttached reconciliation. See attach-logs-guarantee.lib.mjs.
   logsAttached = (await attachFinalLogIfMissing({ shouldAttachLogs, prNumber, owner, repo, $, log, sanitizeLogContent, getLogFile, attachLogToGitHub, argv, sessionId, tempDir, anthropicTotalCostUSD, resultModelUsage })) || logsAttached;
-
   // Issue #1516: Cleanup after all signals (was before verifyResults, caused premature commits)
   await cleanupClaudeFile(tempDir, branchName, claudeCommitHash, argv);
-
   await finalizeDevelopmentLog(); // Issue #1596/#2048: idempotent no-op on the success path (already committed before readiness signal); still preserves late/error work.
   await endWorkSession({ isContinueMode, prNumber, argv, log, formatAligned, $, logsAttached });
 } catch (error) {