@link-assistant/hive-mind 2.1.1 → 2.1.3

package/src/solve.config.lib.mjs

@@ -242,13 +242,13 @@ export const SOLVE_OPTION_DEFINITIONS = {
     description: 'Auto-restart until PR becomes mergeable (no iteration limit). Restarts on new comments from non-bot users, CI failures, merge conflicts, or other issues. Does NOT auto-merge.',
     default: true,
   },
-  // Issue #1708: Stage 1 introduces this flag inert — it parses, appears in
-  // --help, and is read by validateAutoInputUntilMergeable below, but does not
-  // change the runtime loop yet. Stages 2-6 will wire it into watchUntilMergeable
-  // and the bidirectional NDJSON pipe (see docs/case-studies/issue-1708/).
+  // Issue #1708/#2007: streaming-first feedback into the running tool session.
+  // Claude and Agent are wired through bidirectional stream-json stdin pipes;
+  // other tools retain restart/resume fallback behavior until a verified
+  // mid-session input protocol is wired into their solve runners.
   'auto-input-until-mergeable': {
     type: 'boolean',
-    description: '[EXPERIMENTAL] Extend a single AI tool session as long as possible by streaming new input (uncommitted changes, CI/CD failures, PR/issue comments, issue title/body updates) directly into the running session, instead of restarting it. Implies --accept-incomming-comments-as-input and --queue-comments-to-input by default (comments are deferred until the AI finishes the current step and is waiting for input). Existing auto-restart/auto-resume loops remain enabled as a fallback, but the goal is to keep them dormant. The full streaming-aware watchUntilMergeable replacement and per-tool wiring is staged in subsequent PRs (see docs/case-studies/issue-1708/). Falls back gracefully on non-Claude tools and on streaming errors. Disabled by default.',
+    description: '[EXPERIMENTAL] Keep feeding new issue/PR events (uncommitted changes, CI/CD failures, PR/issue comments, issue title/description edits) into the running AI session, in all ways possible. For --tool claude and --tool agent this streams the events directly into the live process via stream-json stdin (implies --accept-incomming-comments-as-input and --queue-comments-to-input by default, deferring comments until the AI finishes the current step). For codex, opencode, gemini, qwen, and unknown tools, it uses the universal restart/resume fallback: wait for the current turn to finish in the JSON output, stop the process, then resume/restart the AI session with the new events via --auto-restart-until-mergeable. Codex live streaming should be wired in a future runner through Codex app-server turn/steer. Disabled by default.',
     default: false,
   },
   'wait-for-all-actions-in-repository-before-mergeable': {
@@ -436,7 +436,7 @@ export const SOLVE_OPTION_DEFINITIONS = {
   // Issue #817: Bidirectional interactive options
   'accept-incomming-comments-as-input': {
     type: 'boolean',
-    description: '[EXPERIMENTAL] Accept new PR/issue comments as input for Claude during execution (excludes outgoing comments generated by solve itself). Does not require --interactive-mode; disabled by default. Only supported for --tool claude.',
+    description: '[EXPERIMENTAL] Accept new PR/issue comments as input for the running stream-json tool during execution (excludes outgoing comments generated by solve itself). Does not require --interactive-mode; disabled by default. Only supported for --tool claude and --tool agent.',
     default: false,
   },
   'exclude-all-own-incomming-comments-from-input': {
@@ -446,13 +446,13 @@ export const SOLVE_OPTION_DEFINITIONS = {
   },
   'bidirectional-interactive-mode': {
     type: 'boolean',
-    description: '[EXPERIMENTAL] Convenience flag that enables --interactive-mode, --accept-incomming-comments-as-input and --exclude-all-own-incomming-comments-from-input together. Only supported for --tool claude.',
+    description: '[EXPERIMENTAL] Convenience flag that enables --interactive-mode, --accept-incomming-comments-as-input and --exclude-all-own-incomming-comments-from-input together. Only supported for --tool claude and --tool agent.',
     default: false,
   },
   // Issue #1708: Comment delivery mode for --accept-incomming-comments-as-input.
   // --stream-comments-to-input: forward comments immediately as they arrive
   //   (the default for --accept-incomming-comments-as-input on its own; matches
-  //   the existing #817 behavior of pushing comments to Claude as soon as
+  //   the existing #817 behavior of pushing comments to the stream-json tool as soon as
   //   pollIncomingComments sees them).
   // --queue-comments-to-input: hold comments until the AI signals it is idle
   //   (waiting for input), then flush the queue. Used by
@@ -461,12 +461,12 @@ export const SOLVE_OPTION_DEFINITIONS = {
   // The two flags are mutually exclusive; if both are set, queue mode wins.
   'stream-comments-to-input': {
     type: 'boolean',
-    description: '[EXPERIMENTAL] When --accept-incomming-comments-as-input is enabled, forward each new PR/issue comment to the AI immediately as it arrives (real-time streaming). This is the default behavior for --accept-incomming-comments-as-input on its own. Mutually exclusive with --queue-comments-to-input; queue mode wins if both are set. Only supported for --tool claude.',
+    description: '[EXPERIMENTAL] When --accept-incomming-comments-as-input is enabled, forward each new PR/issue comment to the AI immediately as it arrives (real-time streaming). This is the default behavior for --accept-incomming-comments-as-input on its own. Mutually exclusive with --queue-comments-to-input; queue mode wins if both are set. Only supported for --tool claude and --tool agent.',
     default: false,
   },
   'queue-comments-to-input': {
     type: 'boolean',
-    description: '[EXPERIMENTAL] When --accept-incomming-comments-as-input is enabled, queue new PR/issue comments and only flush them once the AI signals it is idle (waiting for input). This is the default mode implied by --auto-input-until-mergeable so the AI completes the current step before being interrupted with new instructions. Mutually exclusive with --stream-comments-to-input; queue mode wins if both are set. Only supported for --tool claude.',
+    description: '[EXPERIMENTAL] When --accept-incomming-comments-as-input is enabled, queue new PR/issue comments and only flush them once the AI signals it is idle (waiting for input). This is the default mode implied by --auto-input-until-mergeable so the AI completes the current step before being interrupted with new instructions. Mutually exclusive with --stream-comments-to-input; queue mode wins if both are set. Only supported for --tool claude and --tool agent.',
     default: false,
   },
   'prompt-explore-sub-agent': {

package/src/solve.fork-sync.lib.mjs

@@ -26,7 +26,80 @@ import { safeExit } from './exit-handler.lib.mjs';
 // Issue #1893: helpers that decide whether the fork's default branch may be
 // pushed and that distinguish a permission-denied rejection from a genuine
 // fork divergence.
-const { isPermissionDeniedPushError, shouldPushDefaultBranchToFork } = await import('./solve.branch-divergence.lib.mjs');
+const { buildForkDivergenceBlockedReason, buildForkDivergenceFailureActionSection, getForkDefaultBranchDivergenceSnapshot, isPermissionDeniedPushError, shouldPushDefaultBranchToFork } = await import('./solve.branch-divergence.lib.mjs');
+
+const firstNonEmptyLine = value =>
+  String(value || '')
+    .split('\n')
+    .map(line => line.trim())
+    .find(Boolean) || '';
+
+const resolveSolveCommand = argv => {
+  const issueUrl = argv.url || argv['issue-url'] || argv._?.[0] || '<issue-url>';
+  return `solve ${issueUrl}`;
+};
+
+const extractGitHubUrlNumber = argv => {
+  const url = String(argv.url || argv['issue-url'] || argv._?.[0] || '');
+  const match = url.match(/github\.com\/[^/]+\/[^/]+\/(issues|pull)\/(\d+)/i);
+  return match ? { type: match[1] === 'pull' ? 'pulls' : 'issues', number: match[2] } : null;
+};
+
+const resolveTaskRequester = async ({ $, owner, repo, argv }) => {
+  const target = extractGitHubUrlNumber(argv);
+  if (!target) return null;
+  const result = await $({ silent: true })`gh api repos/${owner}/${repo}/${target.type}/${target.number} --jq .user.login 2>&1`;
+  return result.code === 0 ? firstNonEmptyLine(result.stdout) : null;
+};
+
+const logForkDivergenceDetails = async ({ snapshot, currentUser, taskRequester, solveCommand, includeAction = true }) => {
+  await log('');
+  await log('  🔍 What happened:');
+  await log(`     Git rejected updating ${snapshot.forkedRepo}:${snapshot.branchName} after Hive Mind synced the local branch to ${snapshot.upstreamRepo}:${snapshot.branchName}.`);
+  await log('');
+  await log('  📦 Current state:');
+  await log(`     Fork: ${snapshot.forkedRepo}`);
+  await log(`     Upstream: ${snapshot.upstreamRepo}`);
+  await log(`     Branch: ${snapshot.branchName}`);
+  if (currentUser) await log(`     Authenticated user: ${currentUser}`);
+  if (taskRequester) await log(`     Task requester: ${taskRequester}`);
+  if (snapshot.compareUrl) await log(`     Compare: ${snapshot.compareUrl}`);
+
+  if (snapshot.fetchError || snapshot.inspectError) {
+    await log('');
+    await log('  ⚠️  Safety check incomplete:');
+    await log(`     ${snapshot.fetchError || snapshot.inspectError}`);
+    await log('     Hive Mind cannot prove whether force-with-lease would overwrite fork-only commits.');
+  } else {
+    await log(`     Fork-only commits: ${snapshot.forkUniqueCount ?? 'unknown'}`);
+    await log(`     Upstream-only commits missing from fork: ${snapshot.upstreamUniqueCount ?? 'unknown'}`);
+    if ((snapshot.forkUniqueCount ?? 0) > 0) {
+      await log('');
+      await log('  ⚠️  Commits that would be lost from the fork default branch:');
+      for (const commit of snapshot.uniqueCommits) {
+        await log(`     - ${commit.shortSha || commit.sha} ${commit.author || 'unknown author'} ${commit.subject || 'no subject'}`);
+      }
+      if (snapshot.uniqueCommits.length < snapshot.forkUniqueCount) {
+        await log(`     - ... ${snapshot.forkUniqueCount - snapshot.uniqueCommits.length} more commit(s) not shown`);
+      }
+    } else {
+      await log('');
+      await log('  ✅ Safety check:');
+      await log(`     No commits unique to ${snapshot.forkRef} were found.`);
+    }
+  }
+
+  const actionSection = buildForkDivergenceFailureActionSection({ snapshot, currentUser, taskRequester, solveCommand });
+  if (includeAction) {
+    await log('');
+    await log('  🔧 GitHub comment guidance:');
+    for (const line of actionSection.split('\n')) {
+      await log(`     ${line}`);
+    }
+  }
+  await log('');
+  return actionSection;
+};
 
 // Set up upstream remote and sync fork
 export const setupUpstreamAndSync = async (tempDir, forkedRepo, upstreamRemote, owner, repo, argv) => {
@@ -170,16 +243,23 @@ export const setupUpstreamAndSync = async (tempDir, forkedRepo, upstreamRemote,
                   // Fork has diverged from upstream
                   await log('');
                   await log(`${formatAligned('⚠️', 'FORK DIVERGENCE DETECTED', '')}`, { level: 'warn' });
-                  await log('');
-                  await log('  🔍 What happened:');
-                  await log(`     Your fork's ${upstreamDefaultBranch} branch has different commits than upstream`);
-                  await log('     This typically occurs when upstream had a force push (e.g., git reset --hard)');
-                  await log('');
-                  await log('  📦 Current state:');
-                  await log(`     • Fork: ${forkedRepo}`);
-                  await log(`     • Upstream: ${owner}/${repo}`);
-                  await log(`     • Branch: ${upstreamDefaultBranch}`);
-                  await log('');
+                  const taskRequester = await resolveTaskRequester({ $, owner, repo, argv });
+                  const solveCommand = resolveSolveCommand(argv);
+                  const divergenceSnapshot = await getForkDefaultBranchDivergenceSnapshot({
+                    $,
+                    tempDir,
+                    branchName: upstreamDefaultBranch,
+                    forkedRepo,
+                    upstreamRepo: `${owner}/${repo}`,
+                  });
+                  const failureActionSection = await logForkDivergenceDetails({
+                    snapshot: divergenceSnapshot,
+                    currentUser,
+                    taskRequester,
+                    solveCommand,
+                    includeAction: !argv.allowForkDivergenceResolutionUsingForcePushWithLease,
+                  });
+                  const blockedReason = buildForkDivergenceBlockedReason({ snapshot: divergenceSnapshot });
 
                   // Check if user has enabled automatic force push
                   if (argv.allowForkDivergenceResolutionUsingForcePushWithLease) {
@@ -225,36 +305,12 @@ export const setupUpstreamAndSync = async (tempDir, forkedRepo, upstreamRemote,
                       await log('     3. Manually sync fork with upstream:');
                       await log('        git fetch upstream');
                       await log(`        git reset --hard upstream/${upstreamDefaultBranch}`);
-                      await log(`        git push --force origin ${upstreamDefaultBranch}`);
+                      await log(`        git push --force-with-lease origin ${upstreamDefaultBranch}`);
                       await log('');
-                      await safeExit(1, 'Repository setup failed - fork sync failed');
+                      await safeExit(1, 'Repository setup failed - fork sync failed', { failureActionSection });
                     }
                   } else {
-                    // Flag is not enabled - provide guidance
-                    await log('  💡 Your options:');
-                    await log('');
-                    await log('     Option 1: Delete your fork and recreate it (SIMPLEST)');
-                    await log(`              gh repo delete ${forkedRepo}`);
-                    await log('              Then run the solve command again - the fork will be recreated automatically');
-                    await log('              ⚠️  Only use this if your fork has no unique commits you need to preserve');
-                    await log('');
-                    await log('     Option 2: Enable automatic force-push (DANGEROUS)');
-                    await log('              Add --allow-fork-divergence-resolution-using-force-push-with-lease flag to your command');
-                    await log('              This will automatically sync your fork with upstream using force-with-lease');
-                    await log('              ⚠️  Overwrites fork history - any unique commits will be LOST');
-                    await log('');
-                    await log('     Option 3: Manually resolve the divergence');
-                    await log('              1. Decide if you need any commits unique to your fork');
-                    await log('              2. If yes, cherry-pick them after syncing');
-                    await log('              3. If no, manually force-push:');
-                    await log('                 git fetch upstream');
-                    await log(`                 git reset --hard upstream/${upstreamDefaultBranch}`);
-                    await log(`                 git push --force origin ${upstreamDefaultBranch}`);
-                    await log('');
-                    await log('  🔧 To proceed with auto-resolution, restart with:');
-                    await log(`     solve ${argv.url || argv['issue-url'] || argv._[0] || '<issue-url>'} --allow-fork-divergence-resolution-using-force-push-with-lease`);
-                    await log('');
-                    await safeExit(1, 'Repository setup halted - fork divergence requires user decision');
+                    await safeExit(1, blockedReason, { failureActionSection });
                   }
                 } else {
                   // Some other push error (not divergence-related)

package/src/solve.mjs

@@ -163,7 +163,7 @@ const cleanupWrapper = async () => {
   }
 };
 const interruptWrapper = createInterruptWrapper({ cleanupContext, checkForUncommittedChanges, shouldAttachLogs, attachLogToGitHub, getLogFile, sanitizeLogContent, $, log });
-initializeExitHandler(getAbsoluteLogPath, log, cleanupWrapper, interruptWrapper, ({ code, reason }) => notifyIssueAboutPrePullRequestFailure({ code, reason, argv, globalState: global, $, log, getLogFile, shouldAttachLogs, attachLogToGitHub, sanitizeLogContent, rawCommand }));
+initializeExitHandler(getAbsoluteLogPath, log, cleanupWrapper, interruptWrapper, ({ code, reason, failureActionSection }) => notifyIssueAboutPrePullRequestFailure({ code, reason, failureActionSection, argv, globalState: global, $, log, getLogFile, shouldAttachLogs, attachLogToGitHub, sanitizeLogContent, rawCommand }));
 installGlobalExitHandlers();
 // 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

package/src/solve.pre-pr-failure-notifier.lib.mjs

@@ -1,7 +1,8 @@
 import { getTrackedToolCommentIds, postTrackedComment, SOLUTION_DRAFT_FAILED_MARKER } from './tool-comments.lib.mjs';
 import { extractForkReplacementBlockedDetails, isForkReplacementBlockedReason } from './solve.repository-recovery-message.lib.mjs';
+import { FORK_DIVERGENCE_RESOLUTION_OPTION, buildForkDivergenceFailureActionSection } from './solve.branch-divergence.lib.mjs';
 
-export const FORK_DIVERGENCE_RESOLUTION_OPTION = '--allow-fork-divergence-resolution-using-force-push-with-lease';
+export { FORK_DIVERGENCE_RESOLUTION_OPTION };
 
 const truncate = (value, maxLength = 2000) => {
   const text = value === null || value === undefined ? '' : String(value);
@@ -40,20 +41,17 @@ export function buildPrePullRequestFailureActionSection(reason = '') {
 - It could not prove whether the existing repository has unique commits, so it did not delete it automatically.
 
 ### What you can do
-- If you control \`${repository}\`, back up any needed work, then delete, rename, archive, or repair it in GitHub and rerun the solver.
-- If you do not control \`${repository}\`, ask the repository owner or a Hive Mind administrator to clean it up and rerun the solver.
-- Use \`--allow-force-non-fork-repository-deletion\` only after confirming that deleting \`${repository}\` is acceptable and any unique commits can be lost.
-
-Administrator-only CLI details, if any, are printed in the solver terminal log rather than in this GitHub comment.`;
+- Repository owner path: back up any needed work, then delete, rename, archive, or repair \`${repository}\` in GitHub and rerun the solver.
+- External-owner path: ask the repository owner or a Hive Mind administrator to clean it up and rerun the solver.
+- Use \`--allow-force-non-fork-repository-deletion\` only after confirming that deleting \`${repository}\` is acceptable and any unique commits can be lost.`;
   }
 
   if (isForkDivergenceFailure(reason)) {
-    return `### What you can do
-- If the fork's default branch can be overwritten safely, rerun with \`${FORK_DIVERGENCE_RESOLUTION_OPTION}\` to allow a guarded force-with-lease sync.
-- If the fork has commits you need to preserve, resolve the divergence manually, then rerun the solver.
-- If this requires elevated Hive Mind access, ask a Hive Mind administrator to handle the affected fork or repository.
-
-Administrator-only CLI details, if any, are printed in the solver terminal log rather than in this GitHub comment.`;
+    return buildForkDivergenceFailureActionSection({
+      snapshot: {
+        fetchError: 'No fork divergence inspection data was attached to this failure reason.',
+      },
+    });
   }
 
   if (isPushRejectionFailure(reason)) {
@@ -62,26 +60,20 @@ Administrator-only CLI details, if any, are printed in the solver terminal log r
     return `### What you can do
 - Inspect the remote branch${branchUrl ? `: ${branchUrl}` : ' named in the failure'}.
 - Compare the base and head histories${compareUrl ? `: ${compareUrl}` : ' using the compare link named in the failure'}.
-- If the branch belongs to you, merge the remote branch state or choose a new branch name, then rerun the solver.
-- Do not force-push unless you have manually confirmed that overwriting the remote branch is safe.
-
-Administrator-only CLI details, if any, are printed in the solver terminal log rather than in this GitHub comment.`;
+- Branch owner path: merge the remote branch state or choose a new branch name, then rerun the solver.
+- Manual force-push remains blocked until a human confirms that overwriting the remote branch is safe.`;
   }
 
   if (isForkOrRecoveryFailure) {
     return `### What you can do
-- If the affected fork or repository belongs to you, remove, rename, archive, initialize, or otherwise repair it in GitHub, then rerun the solver.
-- If the action requires elevated Hive Mind access, ask a Hive Mind administrator to handle the affected fork or repository and rerun the solver.
-- Repository deletion can require a separate GitHub account or token with repository deletion permission; Hive Mind does not rely on that permission by default.
-
-Administrator-only CLI details, if any, are printed in the solver terminal log rather than in this issue comment.`;
+- Repository owner path: remove, rename, archive, initialize, or otherwise repair the affected fork or repository in GitHub, then rerun the solver.
+- External-owner path: ask a Hive Mind administrator to handle manual recreation or fix of the repository and rerun the solver.
+- Repository deletion can require a separate GitHub account or token with repository deletion permission; Hive Mind does not rely on that permission by default.`;
   }
 
   return `### What you can do
 - Resolve the repository, account, permissions, or environment problem described above, then rerun the solver.
-- If this requires elevated Hive Mind access, ask a Hive Mind administrator to handle the specific failure described above.
-
-Administrator-only CLI details, if any, are printed in the solver terminal log rather than in this issue comment.`;
+- Repository owner or Hive Mind administrator path: handle manual recreation or fix of the repository when the required action is outside the requester access.`;
 }
 
 export function shouldNotifyIssueAboutPrePullRequestFailure({ code, globalState }) {
@@ -128,11 +120,11 @@ export function resolvePreExitFailureNotificationTarget({ code, globalState }) {
   };
 }
 
-export function buildPrePullRequestFailureComment({ reason, owner, repo, issueNumber, argv = {}, logAttachmentAttempted = false }) {
+export function buildPrePullRequestFailureComment({ reason, owner, repo, issueNumber, argv = {}, logAttachmentAttempted = false, failureActionSection = null }) {
   const tool = argv.tool || 'claude';
   const modelLine = argv.model ? `\n- **Requested model**: \`${argv.model}\`` : '';
   const logLine = logAttachmentAttempted ? 'Log attachment was attempted but failed. Check the solver terminal log for the complete failure output.' : 'Logs were not attached because `--attach-logs` was not enabled.';
-  const actionSection = buildPrePullRequestFailureActionSection(reason);
+  const actionSection = failureActionSection || buildPrePullRequestFailureActionSection(reason);
 
   return `## 🚨 ${SOLUTION_DRAFT_FAILED_MARKER}
 
@@ -154,12 +146,12 @@ ${logLine}
 `;
 }
 
-export function buildExistingPullRequestFailureComment({ reason, owner, repo, prNumber, issueNumber = null, argv = {}, logAttachmentAttempted = false }) {
+export function buildExistingPullRequestFailureComment({ reason, owner, repo, prNumber, issueNumber = null, argv = {}, logAttachmentAttempted = false, failureActionSection = null }) {
   const tool = argv.tool || 'claude';
   const modelLine = argv.model ? `\n- **Requested model**: \`${argv.model}\`` : '';
   const issueLine = issueNumber ? `\n- **Linked issue**: #${issueNumber}` : '';
   const logLine = logAttachmentAttempted ? 'Log attachment was attempted but failed. Check the solver terminal log for the complete failure output.' : 'Logs were not attached because `--attach-logs` was not enabled.';
-  const actionSection = buildPrePullRequestFailureActionSection(reason);
+  const actionSection = failureActionSection || buildPrePullRequestFailureActionSection(reason);
 
   return `## 🚨 ${SOLUTION_DRAFT_FAILED_MARKER}
 
@@ -191,7 +183,7 @@ const markNotificationPosted = ({ globalState, targetType }) => {
 };
 
 export async function notifyIssueAboutPrePullRequestFailure(options) {
-  const { code, reason, argv = {}, globalState = globalThis, $, log = async () => {}, getLogFile, shouldAttachLogs = false, attachLogToGitHub, sanitizeLogContent, rawCommand = null, postComment = postTrackedComment } = options;
+  const { code, reason, failureActionSection = null, argv = {}, globalState = globalThis, $, log = async () => {}, getLogFile, shouldAttachLogs = false, attachLogToGitHub, sanitizeLogContent, rawCommand = null, postComment = postTrackedComment } = options;
 
   const target = resolvePreExitFailureNotificationTarget({ code, globalState });
   if (!target) {
@@ -200,6 +192,7 @@ export async function notifyIssueAboutPrePullRequestFailure(options) {
 
   const { owner, repo, issueNumber, prNumber, targetType, targetNumber } = target;
   const targetLabel = targetType === 'pr' ? `pull request #${targetNumber}` : `issue #${targetNumber}`;
+  const actionSection = failureActionSection || buildPrePullRequestFailureActionSection(reason);
   globalState.preExitFailureNotificationInProgress = true;
   if (targetType === 'pr') {
     globalState.pullRequestFailureNotificationInProgress = true;
@@ -223,7 +216,7 @@ export async function notifyIssueAboutPrePullRequestFailure(options) {
           sanitizeLogContent,
           verbose: argv.verbose,
           errorMessage: `${errorPrefix}\n\nReason: ${reason || 'Unknown error'}`,
-          failureActionSection: buildPrePullRequestFailureActionSection(reason),
+          failureActionSection: actionSection,
           argv,
           requestedModel: argv.originalModel || argv.model,
           tool: argv.tool || 'claude',
@@ -250,6 +243,7 @@ export async function notifyIssueAboutPrePullRequestFailure(options) {
             argv,
             rawCommand,
             logAttachmentAttempted: shouldAttachLogs,
+            failureActionSection: actionSection,
           })
         : buildPrePullRequestFailureComment({
             reason,
@@ -259,6 +253,7 @@ export async function notifyIssueAboutPrePullRequestFailure(options) {
             argv,
             rawCommand,
             logAttachmentAttempted: shouldAttachLogs,
+            failureActionSection: actionSection,
           });
     const posted = await postComment({ $, owner, repo, targetNumber, body });
     if (posted.ok) {

package/src/solve.validation.lib.mjs

@@ -341,7 +341,9 @@ export const performSystemChecks = async (minDiskSpace = 10240, skipToolConnecti
     } else if (argv.tool === 'agent') {
       // Validate Agent connection
       const agentLib = await import('./agent.lib.mjs');
-      isToolConnected = await agentLib.validateAgentConnection(model);
+      isToolConnected = await agentLib.validateAgentConnection(model, {
+        requireLiveInput: !!(argv.autoInputUntilMergeable || argv.acceptIncommingCommentsAsInput),
+      });
       if (!isToolConnected) {
         await log('❌ Cannot proceed without Agent connection', { level: 'error' });
         return false;