@link-assistant/hive-mind 2.0.26 → 2.0.28

package/src/locales/en.lino

@@ -355,7 +355,7 @@ en
       queue
         only
           in
-            groups "❌ The /solve_queue command only works in group chats. Please add this bot to a group and make it an admin."
+            groups "❌ The /queue command only works in group chats. Please add this bot to a group and make it an admin."
       disabled "❌ The solve command is disabled on this bot instance."
       rejected """
         ❌ Solve command rejected.
@@ -413,7 +413,7 @@ en
           URL: {{url}}
           Status: {{status}}
 
-          💡 Use /solve_queue to check the queue status.
+          💡 Use /queue to check the queue status.
         """
       session
         running """
@@ -422,7 +422,7 @@ en
           URL: {{url}}
           Session: `{{session}}`
 
-          💡 Wait for the current session to complete, or use /solve\_stop to cancel it.
+          💡 Wait for the current session to complete, or use /stop to cancel it.
         """
       issues
         list
@@ -515,7 +515,7 @@ en
           detail "Tool aliases imply `--tool <tool>`: `/codex <github-url>` equals `/solve <github-url> --tool codex`"
         reply "Or reply to a message with a GitHub link: `/solve`"
         disabled "*/solve* (aliases: */do*, */continue*, */claude*, */codex*, */opencode*, */agent*, */gemini*, */qwen*) - ❌ Disabled"
-        queue "`/solve_queue` (alias: `/queue`) - Show solve queue status"
+        queue "`/queue` - Show solve queue status"
       locked
         options "🔒 Locked options: `{{options}}`"
       task
@@ -553,7 +553,7 @@ en
       isolation
         mode "🔒 *Isolation Mode:* `{{isolationBackend}}` (experimental)"
       group
-        note "⚠️ *Note:* /solve, /do, /continue, /claude, /codex, /opencode, /agent, /gemini, /qwen, /task, /split, /hive, /solve\\_queue, /limits, /version, /accept\\_invites, /merge, /stop and /start commands only work in group chats. /terminal\\_watch, /watch, /subscribe and /unsubscribe work in private and group chats."
+        note "⚠️ *Note:* /solve, /do, /continue, /claude, /codex, /opencode, /agent, /gemini, /qwen, /task, /split, /hive, /queue, /limits, /version, /accept\\_invites, /merge, /stop and /start commands only work in group chats. /terminal\\_watch, /watch, /subscribe and /unsubscribe work in private and group chats."
       common
         options "🔧 *Common Options:*"
       model

package/src/locales/hi.lino

@@ -355,7 +355,7 @@ hi
       queue
         only
           in
-            groups "❌ /solve_queue कमांड केवल समूह चैट में काम करती है। कृपया बॉट को समूह में जोड़ें और व्यवस्थापक बनाएँ।"
+            groups "❌ /queue कमांड केवल समूह चैट में काम करती है। कृपया बॉट को समूह में जोड़ें और व्यवस्थापक बनाएँ।"
       disabled "❌ इस बॉट इंस्टेंस पर solve कमांड अक्षम है।"
       rejected """
         ❌ Solve कमांड अस्वीकृत।
@@ -413,7 +413,7 @@ hi
           URL: {{url}}
           स्थिति: {{status}}
 
-          💡 कतार स्थिति देखने के लिए /solve_queue का उपयोग करें।
+          💡 कतार स्थिति देखने के लिए /queue का उपयोग करें।
         """
       session
         running """
@@ -422,7 +422,7 @@ hi
           URL: {{url}}
           सत्र: `{{session}}`
 
-          💡 वर्तमान सत्र के पूरा होने की प्रतीक्षा करें, या रद्द करने के लिए /solve\_stop का उपयोग करें।
+          💡 वर्तमान सत्र के पूरा होने की प्रतीक्षा करें, या रद्द करने के लिए /stop का उपयोग करें।
         """
       issues
         list
@@ -515,7 +515,7 @@ hi
           detail "Tool aliases `--tool <tool>` लगाते हैं: `/codex <github-url>` का अर्थ `/solve <github-url> --tool codex` है"
         reply "या GitHub लिंक वाले संदेश का उत्तर दें: `/solve`"
         disabled "*/solve* (aliases: */do*, */continue*, */claude*, */codex*, */opencode*, */agent*, */gemini*, */qwen*) - ❌ अक्षम"
-        queue "`/solve_queue` (उपनाम: `/queue`) - solve queue status दिखाएँ"
+        queue "`/queue` - solve queue status दिखाएँ"
       locked
         options "🔒 लॉक किए गए विकल्प: `{{options}}`"
       task
@@ -553,7 +553,7 @@ hi
       isolation
         mode "🔒 *Isolation Mode:* `{{isolationBackend}}` (experimental)"
       group
-        note "⚠️ *नोट:* /solve, /do, /continue, /claude, /codex, /opencode, /agent, /gemini, /qwen, /task, /split, /hive, /solve\\_queue, /limits, /version, /accept\\_invites, /merge, /stop और /start commands केवल group chats में काम करती हैं। /terminal\\_watch, /watch, /subscribe और /unsubscribe private और group chats में काम करती हैं।"
+        note "⚠️ *नोट:* /solve, /do, /continue, /claude, /codex, /opencode, /agent, /gemini, /qwen, /task, /split, /hive, /queue, /limits, /version, /accept\\_invites, /merge, /stop और /start commands केवल group chats में काम करती हैं। /terminal\\_watch, /watch, /subscribe और /unsubscribe private और group chats में काम करती हैं।"
       common
         options "🔧 *Common Options:*"
       model

package/src/locales/ru.lino

@@ -355,7 +355,7 @@ ru
       queue
         only
           in
-            groups "❌ Команда /solve_queue работает только в групповых чатах. Добавьте бота в группу и сделайте его администратором."
+            groups "❌ Команда /queue работает только в групповых чатах. Добавьте бота в группу и сделайте его администратором."
       disabled "❌ Команда solve отключена в этом экземпляре бота."
       rejected """
         ❌ Команда solve отклонена.
@@ -413,7 +413,7 @@ ru
           URL: {{url}}
           Статус: {{status}}
 
-          💡 Используйте /solve_queue для проверки очереди.
+          💡 Используйте /queue для проверки очереди.
         """
       session
         running """
@@ -422,7 +422,7 @@ ru
           URL: {{url}}
           Сеанс: `{{session}}`
 
-          💡 Дождитесь завершения текущего сеанса или используйте /solve\_stop для отмены.
+          💡 Дождитесь завершения текущего сеанса или используйте /stop для отмены.
         """
       issues
         list
@@ -515,7 +515,7 @@ ru
           detail "Алиасы инструментов добавляют `--tool <tool>`: `/codex <github-url>` равно `/solve <github-url> --tool codex`"
         reply "Или ответьте на сообщение со ссылкой GitHub: `/solve`"
         disabled "*/solve* (алиасы: */do*, */continue*, */claude*, */codex*, */opencode*, */agent*, */gemini*, */qwen*) - ❌ Отключено"
-        queue "`/solve_queue` (псевдоним: `/queue`) - Показать состояние очереди solve"
+        queue "`/queue` - Показать состояние очереди solve"
       locked
         options "🔒 Заблокированные опции: `{{options}}`"
       task
@@ -553,7 +553,7 @@ ru
       isolation
         mode "🔒 *Режим изоляции:* `{{isolationBackend}}` (экспериментально)"
       group
-        note "⚠️ *Замечание:* команды /solve, /do, /continue, /claude, /codex, /opencode, /agent, /gemini, /qwen, /task, /split, /hive, /solve\\_queue, /limits, /version, /accept\\_invites, /merge, /stop и /start работают только в групповых чатах. /terminal\\_watch, /watch, /subscribe и /unsubscribe работают в личных и групповых чатах."
+        note "⚠️ *Замечание:* команды /solve, /do, /continue, /claude, /codex, /opencode, /agent, /gemini, /qwen, /task, /split, /hive, /queue, /limits, /version, /accept\\_invites, /merge, /stop и /start работают только в групповых чатах. /terminal\\_watch, /watch, /subscribe и /unsubscribe работают в личных и групповых чатах."
       common
         options "🔧 *Общие опции:*"
       model

package/src/locales/zh.lino

@@ -355,7 +355,7 @@ zh
       queue
         only
           in
-            groups "❌ /solve_queue 命令仅在群聊中有效。请将本机器人加入群组并设为管理员。"
+            groups "❌ /queue 命令仅在群聊中有效。请将本机器人加入群组并设为管理员。"
       disabled "❌ 此机器人实例已禁用 solve 命令。"
       rejected """
         ❌ Solve 命令被拒绝。
@@ -413,7 +413,7 @@ zh
           URL：{{url}}
           状态：{{status}}
 
-          💡 使用 /solve_queue 查看队列状态。
+          💡 使用 /queue 查看队列状态。
         """
       session
         running """
@@ -422,7 +422,7 @@ zh
           URL：{{url}}
           会话：`{{session}}`
 
-          💡 等待当前会话完成，或使用 /solve\_stop 取消。
+          💡 等待当前会话完成，或使用 /stop 取消。
         """
       issues
         list
@@ -515,7 +515,7 @@ zh
           detail "工具别名会添加 `--tool <tool>`：`/codex <github-url>` 等同于 `/solve <github-url> --tool codex`"
         reply "也可以回复包含 GitHub 链接的消息：`/solve`"
         disabled "*/solve*（别名：*/do*、*/continue*、*/claude*、*/codex*、*/opencode*、*/agent*、*/gemini*、*/qwen*）- ❌ 已禁用"
-        queue "`/solve_queue`（别名：`/queue`）- 显示 solve 队列状态"
+        queue "`/queue` - 显示 solve 队列状态"
       locked
         options "🔒 锁定选项：`{{options}}`"
       task
@@ -553,7 +553,7 @@ zh
       isolation
         mode "🔒 *隔离模式：* `{{isolationBackend}}`（实验性）"
       group
-        note "⚠️ *注意：* /solve、/do、/continue、/claude、/codex、/opencode、/agent、/gemini、/qwen、/task、/split、/hive、/solve\\_queue、/limits、/version、/accept\\_invites、/merge、/stop 和 /start 仅在群聊中有效。/terminal\\_watch、/watch、/subscribe 和 /unsubscribe 在私聊和群聊中有效。"
+        note "⚠️ *注意：* /solve、/do、/continue、/claude、/codex、/opencode、/agent、/gemini、/qwen、/task、/split、/hive、/queue、/limits、/version、/accept\\_invites、/merge、/stop 和 /start 仅在群聊中有效。/terminal\\_watch、/watch、/subscribe 和 /unsubscribe 在私聊和群聊中有效。"
       common
         options "🔧 *常用选项：*"
       model

package/src/opencode.prompts.lib.mjs

@@ -7,6 +7,7 @@ import { getArchitectureCareSubPrompt } from './architecture-care.prompts.lib.mj
 import { getExperimentsExamplesSubPrompt } from './experiments-examples.prompts.lib.mjs';
 import { getThinkingPromptInstruction } from './thinking-prompt.lib.mjs';
 import { buildWorkLanguageDirective } from './work-language.prompts.lib.mjs';
+import { buildRequestedBaseBranchDirective } from './solve-option-contract.prompts.lib.mjs';
 
 /**
  * Build the user prompt for OpenCode
@@ -50,6 +51,11 @@ export const buildUserPrompt = params => {
     }
   }
 
+  const requestedBaseBranchDirective = buildRequestedBaseBranchDirective(argv);
+  if (requestedBaseBranchDirective) {
+    promptLines.push(requestedBaseBranchDirective);
+  }
+
   // Add blank line
   promptLines.push('');
 
@@ -119,7 +125,6 @@ CI investigation with workspace tmp directory.
   }
 
   return `You are an AI issue solver using OpenCode.
-
 General guidelines.
    - When you execute commands and the output becomes large, save the logs to files for easier review.
    - When running commands, avoid setting a timeout yourself. Let them run as long as needed.

package/src/queue-config.lib.mjs

@@ -282,7 +282,7 @@ export const QUEUE_CONFIG = {
 
   // Display
   // Maximum number of items shown per section (pending/processing/completed/failed)
-  // in the /solve_queue (/queue) detailed status before collapsing into a
+  // in the /queue detailed status before collapsing into a
   // "... and N more" line. Keeps the Telegram message under the 4096-char cap.
   // See: https://github.com/link-assistant/hive-mind/issues/1837
   MAX_DISPLAY_ITEMS_PER_QUEUE: parseIntWithDefault('HIVE_MIND_MAX_DISPLAY_ITEMS_PER_QUEUE', 5),

package/src/qwen.prompts.lib.mjs

@@ -7,6 +7,7 @@ import { getArchitectureCareSubPrompt } from './architecture-care.prompts.lib.mj
 import { getExperimentsExamplesSubPrompt } from './experiments-examples.prompts.lib.mjs';
 import { getThinkingPromptInstruction } from './thinking-prompt.lib.mjs';
 import { buildWorkLanguageDirective } from './work-language.prompts.lib.mjs';
+import { buildRequestedBaseBranchDirective } from './solve-option-contract.prompts.lib.mjs';
 
 /**
  * Build the user prompt for Qwen Code
@@ -44,6 +45,11 @@ export const buildUserPrompt = params => {
     }
   }
 
+  const requestedBaseBranchDirective = buildRequestedBaseBranchDirective(argv);
+  if (requestedBaseBranchDirective) {
+    promptLines.push(requestedBaseBranchDirective);
+  }
+
   promptLines.push('');
 
   if (isContinueMode && feedbackLines && feedbackLines.length > 0) {
@@ -105,7 +111,6 @@ CI investigation with workspace tmp directory.
   }
 
   return `You are an AI issue solver using Qwen Code.
-
 General guidelines.
    - When you execute commands and the output becomes large, save the logs to files for easier review.
    - When running commands, avoid setting a timeout yourself. Let them run as long as needed.

package/src/session-monitor.lib.mjs

@@ -1274,7 +1274,7 @@ export async function getRunningTrackedIsolationSessions(verbose = false, option
 
 /**
  * Return the currently-executing tracked sessions with the details needed to
- * render them as a clickable list in `/solve_queue` (`/queue`): the issue/PR
+ * render them as a clickable list in `/queue`: the issue/PR
  * `url`, the `tool`, the start time, and (for isolation sessions) the backend
  * status. Both isolation and non-isolation screen sessions are included so the
  * list matches what is actually executing — the queue's own in-memory

package/src/solve-option-contract.prompts.lib.mjs

@@ -0,0 +1,19 @@
+/**
+ * Prompt snippets for user-requested solve options.
+ */
+
+function normalizeBranchName(value) {
+  return String(value || '').trim();
+}
+
+export function buildRequestedBaseBranchDirective(argv = {}) {
+  const baseBranch = normalizeBranchName(argv?.baseBranch);
+  if (!baseBranch) {
+    return '';
+  }
+
+  return `Requested by user --base-branch: ${baseBranch}
+The user expects the pull request base branch to remain ${baseBranch}.`;
+}
+
+export const buildLockedSolveOptionsDirective = buildRequestedBaseBranchDirective;

package/src/solve.auto-merge.lib.mjs

@@ -81,6 +81,7 @@ const { maybeAttachWorkingSessionSummary, ensurePullRequestIssueLink } = results
 // Issue #1574: Interruptible sleep so CTRL+C is never blocked by a lingering timer
 const { interruptibleSleep } = await import('./interruptible-sleep.lib.mjs');
 const { formatAutoIterationLimit, hasReachedAutoIterationLimit, normalizeAutoIterationLimit, shouldSyncBeforeRestart } = await import('./auto-iteration-limits.lib.mjs');
+const { ensurePullRequestBaseBranch } = await import('./solve.pr-base-guard.lib.mjs');
 
 // Issue #1895: explicitly close linked issues after merging a PR into a
 // non-default branch, where GitHub does not auto-close them.
@@ -1352,6 +1353,18 @@ export const startAutoRestartUntilMergeable = async params => {
     return null;
   }
 
+  await ensurePullRequestBaseBranch({
+    owner,
+    repo,
+    prNumber,
+    argv,
+    log,
+    formatAligned,
+    $,
+    onMismatch: isAutoMerge ? 'throw' : 'restore',
+    operation: isAutoMerge ? 'auto-merge' : 'auto-restart-until-mergeable',
+  });
+
   // Issue #1226: Check if running in fork mode — auto-merge cannot work without write access
   if (argv.fork && isAutoMerge) {
     await log('');

package/src/solve.auto-pr.lib.mjs

@@ -890,7 +890,7 @@ _Details will be added as the solution draft is developed..._
 
         if (argv.verbose) {
           await log(`   PR Title: [WIP] ${issueTitle}`, { verbose: true });
-          await log(`   Base branch: ${defaultBranch}`, { verbose: true });
+          await log(`   Base branch: ${targetBranch}`, { verbose: true });
           await log(`   Head branch: ${branchName}`, { verbose: true });
           if (currentUser) {
             await log(`   Assignee: ${currentUser}`, { verbose: true });

package/src/solve.finalize.lib.mjs

@@ -0,0 +1,21 @@
+export async function finalizeSolveProcess({ tempDir, argv, limitReached, path, getLogFile, log, closeSentry, logActiveHandles, cleanupTempDirectory, safeExit }) {
+  await cleanupTempDirectory(tempDir, argv, limitReached);
+
+  // Show final log file reference so users always know where to find the complete log
+  if (getLogFile()) {
+    const finalLogPath = path.resolve(getLogFile());
+    await log(`\n📁 Complete log file: ${finalLogPath}`);
+  }
+
+  // Issue #1346: Flush Sentry events before exit.
+  // closeSentry() uses a hard Promise.race deadline so it cannot block indefinitely.
+  await closeSentry();
+
+  // Issue #1431: Log active handles before draining.
+  // Always logged to file and console so future hangs are immediately visible in logs.
+  // drainHandles() inside safeExit() will unref/close these before process.exit().
+  await logActiveHandles(msg => log(msg));
+
+  // Issue #1431: safeExit() unrefs handles so the event loop exits naturally, then calls process.exit(0)
+  await safeExit(0, 'Process completed');
+}

package/src/solve.mjs

@@ -47,6 +47,7 @@ const { startAutoRestartUntilMergeable } = await import('./solve.auto-merge.lib.
 const { runAutoEnsureRequirements } = await import('./solve.auto-ensure.lib.mjs');
 const { runKeepWorkingUntilDone } = await import('./solve.keep-working.lib.mjs');
 const { runEscalation } = await import('./solve.escalate.lib.mjs');
+const { finalizeSolveProcess } = await import('./solve.finalize.lib.mjs');
 const exitHandler = await import('./exit-handler.lib.mjs');
 const { initializeExitHandler, installGlobalExitHandlers, safeExit, logActiveHandles } = exitHandler;
 const { createInterruptWrapper } = await import('./solve.interrupt.lib.mjs');
@@ -54,6 +55,7 @@ const { createInterruptWrapper } = await import('./solve.interrupt.lib.mjs');
 const { configureWorkingSession, beginWorkingSession, endWorkingSession } = await import('./working-session.lib.mjs');
 const getResourceSnapshot = memoryCheck.getResourceSnapshot;
 const { handleAutoPrCreation } = await import('./solve.auto-pr.lib.mjs');
+const { ensurePullRequestBaseBranch } = await import('./solve.pr-base-guard.lib.mjs');
 const { setupRepositoryAndClone, verifyDefaultBranchAndStatus } = await import('./solve.repo-setup.lib.mjs');
 const { recordAfterCloneSize, recordAfterAgentSize } = await import('./solve.disk-diagnostics.lib.mjs');
 const { createOrCheckoutBranch } = await import('./solve.branch.lib.mjs');
@@ -617,6 +619,10 @@ try {
     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));
@@ -1203,6 +1209,8 @@ try {
     await safeExit(0, 'Auto-continue child process will handle post-processing');
   }
 
+  await enforceRequestedBaseBranch();
+
   // Issue #1263 / #1728: Working session summary attachment.
   // Routed through the shared maybeAttachWorkingSessionSummary helper so that
   // top-level solve, auto-restart-until-mergeable, and watch-mode iterations
@@ -1329,6 +1337,8 @@ try {
     }
   }
 
+  await enforceRequestedBaseBranch();
+
   // Track whether logs were successfully attached (used by endWorkSession)
   let logsAttached = false;
 
@@ -1475,23 +1485,5 @@ try {
     $,
   });
 } finally {
-  await cleanupTempDirectory(tempDir, argv, limitReached);
-
-  // Show final log file reference so users always know where to find the complete log
-  if (getLogFile()) {
-    const finalLogPath = path.resolve(getLogFile());
-    await log(`\n📁 Complete log file: ${finalLogPath}`);
-  }
-
-  // Issue #1346: Flush Sentry events before exit.
-  // closeSentry() uses a hard Promise.race deadline so it cannot block indefinitely.
-  await closeSentry();
-
-  // Issue #1431: Log active handles before draining.
-  // Always logged to file and console so future hangs are immediately visible in logs.
-  // drainHandles() inside safeExit() will unref/close these before process.exit().
-  await logActiveHandles(msg => log(msg));
-
-  // Issue #1431: safeExit() unrefs handles so the event loop exits naturally, then calls process.exit(0)
-  await safeExit(0, 'Process completed');
+  await finalizeSolveProcess({ tempDir, argv, limitReached, path, getLogFile, log, closeSentry, logActiveHandles, cleanupTempDirectory, safeExit });
 }

package/src/solve.pr-base-command-intervention.lib.mjs

@@ -0,0 +1,62 @@
+import { buildPullRequestBaseBranchInterventionMessage, detectForbiddenPullRequestBaseChangeCommand, extractToolCommandTextsFromStreamEvent } from './solve.pr-base-guard.lib.mjs';
+
+export function createPullRequestBaseBranchCommandIntervention({ expectedBaseBranch, prNumber, log = async () => {}, toolLabel = 'AI tool', sendInput = null, stopSession = null } = {}) {
+  const observedCommands = new Set();
+  let intervention = null;
+  let sent = false;
+
+  const handleCommand = async command => {
+    if (!expectedBaseBranch || intervention || sent || !command || observedCommands.has(command)) return;
+    observedCommands.add(command);
+
+    const violation = detectForbiddenPullRequestBaseChangeCommand(command, {
+      expectedBaseBranch,
+      prNumber,
+    });
+    if (!violation) return;
+
+    const message = buildPullRequestBaseBranchInterventionMessage(violation);
+    await log(`\n⚠️ Forbidden PR base retarget command observed from ${toolLabel}: ${command}`, { level: 'warning' });
+
+    if (sendInput) {
+      try {
+        sent = await sendInput(message);
+      } catch (sendError) {
+        await log(`   Could not send requested base-branch correction to ${toolLabel} input: ${sendError.message}`, { level: 'warning' });
+      }
+      if (sent) {
+        await log(`   Sent requested base-branch correction to ${toolLabel} input.`, { level: 'warning' });
+        return;
+      }
+    }
+
+    intervention = { violation, message };
+    await log(`   ${message}`, { level: 'warning' });
+    if (stopSession) {
+      try {
+        const stopped = await stopSession();
+        if (stopped) {
+          await log(`   Stopped ${toolLabel} session to resume with requested base-branch correction.`, { level: 'warning' });
+        }
+      } catch (stopError) {
+        await log(`   Could not stop ${toolLabel} process for immediate correction: ${stopError.message}`, { level: 'warning' });
+      }
+    }
+  };
+
+  const handleCommands = async commands => {
+    for (const command of commands) {
+      await handleCommand(command);
+      if (intervention || sent) return;
+    }
+  };
+
+  return {
+    handleCommand,
+    handleCommands,
+    handleCommandExecutions: async commandExecutions => handleCommands((commandExecutions || []).map(commandExecution => commandExecution?.command).filter(Boolean)),
+    handleStreamEvent: async event => handleCommands(extractToolCommandTextsFromStreamEvent(event)),
+    getIntervention: () => intervention,
+    wasSent: () => sent,
+  };
+}