@link-assistant/hive-mind 2.7.3 → 2.8.0

package/src/github-merge.lib.mjs

@@ -20,6 +20,7 @@ import { parseGitHubUrl } from './github.lib.mjs';
 import { githubLimits } from './config.lib.mjs';
 import { ghWithRateLimitRetry } from './github-rate-limit.lib.mjs';
 import { getTerminalGitHubEntityErrorMessage, isTerminalGitHubEntityError } from './github-terminal-state.lib.mjs';
+import { cancellableSleep } from './interruptible-sleep.lib.mjs';
 
 // Issue #1722: gh api `--paginate --slurp` responses for repos with many
 // historical workflow runs can easily exceed Node's default 1 MB exec buffer
@@ -49,6 +50,11 @@ export { syncReadyTags, getLinkedPRsFromTimeline, READY_LABEL };
 import { closeLinkedIssueIfNotAutoClosed } from './github-merge-issue-close.lib.mjs';
 export { closeLinkedIssueIfNotAutoClosed };
 
+// Issue #2072: the long CI polling loops live in their own module (file size limit).
+// Re-exported here so existing importers keep working.
+import { waitForCI, waitForBranchCI } from './github-merge-ci-wait.lib.mjs';
+export { waitForCI, waitForBranchCI };
+
 /**
  * Check if 'ready' label exists in repository
  * @param {string} owner - Repository owner
@@ -446,15 +452,19 @@ export async function checkPRCIStatus(owner, repo, prNumber, verbose = false) {
  * @param {string} repo - Repository name
  * @param {number} prNumber - Pull request number
  * @param {boolean} verbose - Whether to log verbose output
- * @returns {Promise<{mergeable: boolean, mergeableState?: string|null, mergeStateStatus?: string|null, reason: string|null, terminal?: boolean}>}
+ * @param {Object} [options] - Extra options
+ * @param {Function} [options.isCancelled] - Issue #2072: polled during the retry delay so a cancel aborts the wait
+ * @returns {Promise<{mergeable: boolean, mergeableState?: string|null, mergeStateStatus?: string|null, reason: string|null, terminal?: boolean, cancelled?: boolean}>}
  */
-export async function checkPRMergeable(owner, repo, prNumber, verbose = false) {
+export async function checkPRMergeable(owner, repo, prNumber, verbose = false, options = {}) {
+  const { isCancelled = null } = options;
   // Issue #1339: GitHub computes mergeability asynchronously. When mergeStateStatus is
   // 'UNKNOWN', it means GitHub hasn't calculated the merge state yet. Retry a few times.
   const MAX_UNKNOWN_RETRIES = 3;
   const UNKNOWN_RETRY_DELAY_MS = 5000;
 
   for (let attempt = 0; attempt < MAX_UNKNOWN_RETRIES; attempt++) {
+    if (isCancelled?.()) return { mergeable: false, reason: 'Operation was cancelled', cancelled: true };
     try {
       const { stdout } = await exec(`gh pr view ${prNumber} --repo ${owner}/${repo} --json mergeable,mergeStateStatus`);
       const pr = JSON.parse(stdout.trim());
@@ -466,7 +476,7 @@ export async function checkPRMergeable(owner, repo, prNumber, verbose = false) {
           if (verbose) {
             console.log(`[VERBOSE] /merge: PR #${prNumber} mergeability is UNKNOWN (attempt ${attempt + 1}/${MAX_UNKNOWN_RETRIES}), retrying in ${UNKNOWN_RETRY_DELAY_MS / 1000}s...`);
           }
-          await new Promise(resolve => setTimeout(resolve, UNKNOWN_RETRY_DELAY_MS));
+          await cancellableSleep(UNKNOWN_RETRY_DELAY_MS, isCancelled);
           continue;
         }
         // All retries exhausted, still UNKNOWN - treat as not mergeable
@@ -604,95 +614,6 @@ export async function mergePullRequest(owner, repo, prNumber, options = {}, verb
   }
 }
 
-/**
- * Wait for CI/CD to complete with polling
- * @param {string} owner - Repository owner
- * @param {string} repo - Repository name
- * @param {number} prNumber - Pull request number
- * @param {Object} options - Wait options
- * @param {number} options.timeout - Maximum wait time in ms (default: 30 minutes)
- * @param {number} options.pollInterval - Polling interval in ms (default: 30 seconds)
- * @param {Function} options.onStatusUpdate - Callback for status updates
- * @param {boolean} verbose - Whether to log verbose output
- * @returns {Promise<{success: boolean, status: string, error: string|null}>}
- */
-export async function waitForCI(owner, repo, prNumber, options = {}, verbose = false) {
-  const {
-    timeout = 30 * 60 * 1000,
-    pollInterval = 30 * 1000,
-    onStatusUpdate = null,
-    // Issue #1269: Add timeout for callback to prevent infinite blocking
-    callbackTimeout = 60 * 1000, // 1 minute max for callback
-    isCancelled = null, // Issue #1407: Support early exit when cancellation is requested
-  } = options;
-
-  const startTime = Date.now();
-
-  while (Date.now() - startTime < timeout) {
-    // Issue #1407: Check for cancellation before each poll to allow early exit
-    if (isCancelled?.()) return { success: false, status: 'cancelled', error: 'Operation was cancelled' };
-
-    let ciStatus;
-    try {
-      ciStatus = await checkPRCIStatus(owner, repo, prNumber, verbose);
-    } catch (error) {
-      // Issue #1269: Log and continue on CI check errors instead of crashing
-      console.error(`[ERROR] /merge: Error checking CI status for PR #${prNumber}: ${error.message}`);
-      verbose && console.error(`[VERBOSE] /merge: CI check error details:`, error);
-      // Wait and retry
-      await new Promise(resolve => setTimeout(resolve, pollInterval));
-      continue;
-    }
-
-    if (onStatusUpdate) {
-      // Issue #1269: Wrap callback with timeout to prevent infinite blocking; #1346: capture and clear timeout handle to prevent dangling timer
-      try {
-        let callbackTimeoutId;
-        await Promise.race([
-          onStatusUpdate(ciStatus),
-          new Promise((_, reject) => {
-            callbackTimeoutId = setTimeout(() => reject(new Error(`Callback timeout after ${callbackTimeout}ms`)), callbackTimeout);
-          }),
-        ]).finally(() => clearTimeout(callbackTimeoutId));
-      } catch (callbackError) {
-        // Issue #1269: Log callback errors but continue processing
-        console.error(`[ERROR] /merge: Status update callback failed for PR #${prNumber}: ${callbackError.message}`);
-        verbose && console.error(`[VERBOSE] /merge: Callback error details:`, callbackError);
-        // Continue processing even if callback fails - don't let UI issues block merging
-      }
-    }
-
-    if (ciStatus.status === 'success') {
-      return { success: true, status: 'success', error: null };
-    }
-
-    if (ciStatus.status === 'failure') {
-      return { success: false, status: 'failure', error: 'CI checks failed' };
-    }
-
-    if (ciStatus.status === 'terminal_github_entity_error') {
-      return {
-        success: false,
-        status: 'terminal_github_entity_error',
-        error: ciStatus.error || 'GitHub repository, pull request, issue, or branch is no longer accessible',
-      };
-    }
-
-    if (ciStatus.status === 'pending') {
-      if (verbose) {
-        console.log(`[VERBOSE] /merge: Waiting for CI... (${Math.round((Date.now() - startTime) / 1000)}s elapsed)`);
-      }
-      await new Promise(resolve => setTimeout(resolve, pollInterval));
-      continue;
-    }
-
-    // Unknown status - wait and retry
-    await new Promise(resolve => setTimeout(resolve, pollInterval));
-  }
-
-  return { success: false, status: 'timeout', error: 'CI check timeout exceeded' };
-}
-
 /**
  * Parse and validate a repository URL for the merge command
  * @param {string} url - Repository URL
@@ -782,109 +703,6 @@ export async function getActiveBranchRuns(owner, repo, branch = 'main', verbose
   };
 }
 
-/**
- * Wait for all active workflow runs on a branch to complete
- * Issue #1307: Ensures all CI runs on target branch are complete before merging
- * @param {string} owner - Repository owner
- * @param {string} repo - Repository name
- * @param {string} branch - Branch name (default: main)
- * @param {Object} options - Wait options
- * @param {number} options.timeout - Maximum wait time in ms (default: 45 minutes)
- * @param {number} options.pollInterval - Polling interval in ms (default: 30 seconds)
- * @param {Function} options.onStatusUpdate - Callback for status updates
- * @param {boolean} verbose - Whether to log verbose output
- * @returns {Promise<{success: boolean, waitedForRuns: boolean, completedRuns: number, error: string|null}>}
- */
-export async function waitForBranchCI(owner, repo, branch = 'main', options = {}, verbose = false) {
-  const { timeout = 45 * 60 * 1000, pollInterval = 30 * 1000, onStatusUpdate = null, isCancelled = null } = options;
-
-  const startTime = Date.now();
-  let totalWaitedRuns = 0;
-
-  if (verbose) {
-    console.log(`[VERBOSE] /merge: Checking for active CI runs on ${owner}/${repo} branch ${branch}...`);
-  }
-
-  while (Date.now() - startTime < timeout) {
-    if (isCancelled?.()) return { success: false, waitedForRuns: totalWaitedRuns > 0, completedRuns: totalWaitedRuns, error: 'Operation was cancelled' };
-    let activeRuns;
-    try {
-      activeRuns = await getActiveBranchRuns(owner, repo, branch, verbose);
-    } catch (error) {
-      // Log and continue on errors
-      console.error(`[ERROR] /merge: Error checking branch CI: ${error.message}`);
-      await new Promise(resolve => setTimeout(resolve, pollInterval));
-      continue;
-    }
-
-    if (onStatusUpdate) {
-      try {
-        await onStatusUpdate({
-          hasActiveRuns: activeRuns.hasActiveRuns,
-          count: activeRuns.count,
-          runs: activeRuns.runs,
-          elapsedMs: Date.now() - startTime,
-        });
-      } catch (callbackError) {
-        // Log callback errors but continue
-        console.error(`[ERROR] /merge: Status update callback failed: ${callbackError.message}`);
-      }
-    }
-
-    if (!activeRuns.hasActiveRuns) {
-      if (verbose) {
-        console.log(`[VERBOSE] /merge: No active CI runs on ${branch} branch. Ready to proceed.`);
-      }
-      return {
-        success: true,
-        waitedForRuns: totalWaitedRuns > 0,
-        completedRuns: totalWaitedRuns,
-        error: null,
-      };
-    }
-
-    totalWaitedRuns = Math.max(totalWaitedRuns, activeRuns.count);
-
-    if (verbose) {
-      const elapsedSec = Math.round((Date.now() - startTime) / 1000);
-      console.log(`[VERBOSE] /merge: Waiting for ${activeRuns.count} active runs on ${branch}... (${elapsedSec}s elapsed)`);
-    }
-
-    await new Promise(resolve => setTimeout(resolve, pollInterval));
-  }
-
-  // Timeout reached
-  // Issue #1722: if the final check throws, do NOT silently report "ready".
-  // Treat it the same as still-active (force a timeout failure), so /merge
-  // waits/retries instead of merging on top of a still-running CI run.
-  let finalCheck;
-  try {
-    finalCheck = await getActiveBranchRuns(owner, repo, branch, verbose);
-  } catch (error) {
-    return {
-      success: false,
-      waitedForRuns: true,
-      completedRuns: totalWaitedRuns,
-      error: `Timeout reached and final CI check failed on ${branch}: ${error.message}`,
-    };
-  }
-  if (finalCheck.hasActiveRuns) {
-    return {
-      success: false,
-      waitedForRuns: true,
-      completedRuns: totalWaitedRuns - finalCheck.count,
-      error: `Timeout waiting for ${finalCheck.count} CI runs on ${branch} branch`,
-    };
-  }
-
-  return {
-    success: true,
-    waitedForRuns: totalWaitedRuns > 0,
-    completedRuns: totalWaitedRuns,
-    error: null,
-  };
-}
-
 /**
  * Get the default branch for a repository
  * @param {string} owner - Repository owner

package/src/interruptible-sleep.lib.mjs

@@ -49,4 +49,37 @@ export function interruptibleSleep(ms) {
   });
 }
 
-export default { interruptibleSleep };
+/**
+ * Sleep for `ms` milliseconds, resolving early if SIGINT/SIGTERM arrives or if
+ * `isCancelled()` starts returning true.
+ *
+ * Issue #2072: polling loops used to `await new Promise(r => setTimeout(r, pollInterval))`
+ * and only re-check cancellation on the next iteration. With a 30s poll interval that
+ * made `/merge` keep running for up to a full interval after the Cancel button was
+ * pressed. Sleeping in short steps lets cancellation take effect within `stepMs`.
+ *
+ * @param {number} ms - Duration in milliseconds
+ * @param {Function|null} isCancelled - Predicate polled during the sleep
+ * @param {Object} [options]
+ * @param {number} [options.stepMs=100] - Granularity at which `isCancelled` is polled
+ * @returns {Promise<{interrupted: boolean, cancelled: boolean}>}
+ */
+export async function cancellableSleep(ms, isCancelled = null, options = {}) {
+  const { stepMs = 100 } = options;
+
+  if (!isCancelled) {
+    const { interrupted } = await interruptibleSleep(ms);
+    return { interrupted, cancelled: false };
+  }
+
+  const deadline = Date.now() + ms;
+  while (Date.now() < deadline) {
+    if (isCancelled()) return { interrupted: false, cancelled: true };
+    const { interrupted } = await interruptibleSleep(Math.min(stepMs, deadline - Date.now()));
+    if (interrupted) return { interrupted: true, cancelled: isCancelled() };
+  }
+
+  return { interrupted: false, cancelled: isCancelled() };
+}
+
+export default { interruptibleSleep, cancellableSleep };

package/src/locales/en.lino

@@ -564,6 +564,11 @@ en
         enabled "*/split* - Split a GitHub issue into smaller issues"
         usage "Usage: `/split <github-issue-url> [options]` or `/task --split <github-issue-url>`"
         example "Example: `/split https://github.com/owner/repo/issues/123 --split-count 2`"
+      fix
+        enabled "*/fix* - Create a CI/CD remediation issue for a repository and solve it"
+        usage "Usage: `/fix <github-repository-url> [options]`"
+        example "Example: `/fix https://github.com/owner/repo --model sonnet`"
+        disabled "*/fix* - ❌ Disabled"
       hive
         enabled "*/hive* - Run hive command"
         usage "Usage: `/hive <github-url> [options]`"
@@ -590,7 +595,7 @@ en
       isolation
         mode "🔒 *Isolation Mode:* `{{isolationBackend}}` (experimental)"
       group
-        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."
+        note "⚠️ *Note:* /solve, /do, /continue, /claude, /codex, /opencode, /agent, /gemini, /qwen, /task, /split, /fix, /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

@@ -564,6 +564,11 @@ hi
         enabled "*/split* - GitHub issue को छोटे issues में बाँटें"
         usage "उपयोग: `/split <github-issue-url> [options]` या `/task --split <github-issue-url>`"
         example "उदाहरण: `/split https://github.com/owner/repo/issues/123 --split-count 2`"
+      fix
+        enabled "*/fix* - repository के लिए CI/CD सुधार issue बनाएँ और उसे हल करें"
+        usage "उपयोग: `/fix <github-repository-url> [options]`"
+        example "उदाहरण: `/fix https://github.com/owner/repo --model sonnet`"
+        disabled "*/fix* - ❌ अक्षम"
       hive
         enabled "*/hive* - hive command चलाएँ"
         usage "उपयोग: `/hive <github-url> [options]`"
@@ -590,7 +595,7 @@ hi
       isolation
         mode "🔒 *Isolation Mode:* `{{isolationBackend}}` (experimental)"
       group
-        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 में काम करती हैं।"
+        note "⚠️ *नोट:* /solve, /do, /continue, /claude, /codex, /opencode, /agent, /gemini, /qwen, /task, /split, /fix, /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

@@ -564,6 +564,11 @@ ru
         enabled "*/split* - Разделить задачу GitHub на меньшие задачи"
         usage "Использование: `/split <github-issue-url> [options]` или `/task --split <github-issue-url>`"
         example "Пример: `/split https://github.com/owner/repo/issues/123 --split-count 2`"
+      fix
+        enabled "*/fix* - Создать задачу об исправлении CI/CD для репозитория и решить её"
+        usage "Использование: `/fix <github-repository-url> [options]`"
+        example "Пример: `/fix https://github.com/owner/repo --model sonnet`"
+        disabled "*/fix* - ❌ Отключено"
       hive
         enabled "*/hive* - Выполнить команду hive"
         usage "Использование: `/hive <github-url> [options]`"
@@ -590,7 +595,7 @@ ru
       isolation
         mode "🔒 *Режим изоляции:* `{{isolationBackend}}` (экспериментально)"
       group
-        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 работают в личных и групповых чатах."
+        note "⚠️ *Замечание:* команды /solve, /do, /continue, /claude, /codex, /opencode, /agent, /gemini, /qwen, /task, /split, /fix, /hive, /queue, /limits, /version, /accept\\_invites, /merge, /stop и /start работают только в групповых чатах. /terminal\\_watch, /watch, /subscribe и /unsubscribe работают в личных и групповых чатах."
       common
         options "🔧 *Общие опции:*"
       model

package/src/locales/zh.lino

@@ -564,6 +564,11 @@ zh
         enabled "*/split* - 将 GitHub issue 拆分为更小的 issue"
         usage "用法：`/split <github-issue-url> [options]` 或 `/task --split <github-issue-url>`"
         example "示例：`/split https://github.com/owner/repo/issues/123 --split-count 2`"
+      fix
+        enabled "*/fix* - 为仓库创建 CI/CD 修复 issue 并解决它"
+        usage "用法：`/fix <github-repository-url> [options]`"
+        example "示例：`/fix https://github.com/owner/repo --model sonnet`"
+        disabled "*/fix* - ❌ 已禁用"
       hive
         enabled "*/hive* - 运行 hive 命令"
         usage "用法：`/hive <github-url> [options]`"
@@ -590,7 +595,7 @@ zh
       isolation
         mode "🔒 *隔离模式：* `{{isolationBackend}}`（实验性）"
       group
-        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 在私聊和群聊中有效。"
+        note "⚠️ *注意：* /solve、/do、/continue、/claude、/codex、/opencode、/agent、/gemini、/qwen、/task、/split、/fix、/hive、/queue、/limits、/version、/accept\\_invites、/merge、/stop 和 /start 仅在群聊中有效。/terminal\\_watch、/watch、/subscribe 和 /unsubscribe 在私聊和群聊中有效。"
       common
         options "🔧 *常用选项：*"
       model

package/src/task.issue-creation.lib.mjs

@@ -196,18 +196,44 @@ export function parseCreatedTaskIssueOutput(output) {
   throw new Error(`Could not parse created issue URL from gh output: ${String(output || '').trim()}`);
 }
 
-export async function createTaskIssue({ repository, title, body, run = runCommand }) {
+export function buildCreateIssueArgs({ repository, title, bodyFile, issueType = null, labels = [] }) {
+  const args = ['issue', 'create', '--repo', repository.fullName, '--title', title, '--body-file', bodyFile];
+  if (issueType) args.push('--type', issueType);
+  for (const label of labels) args.push('--label', label);
+  return args;
+}
+
+/**
+ * Create an issue via `gh issue create`.
+ *
+ * `issueType` and `labels` are optional and best-effort: issue types are
+ * configured per organization and labels per repository, so a target repo may
+ * not have them. Rather than failing the whole command, a rejected create is
+ * retried once without them (issue #1733).
+ */
+export async function createTaskIssue({ repository, title, body, issueType = null, labels = [], run = runCommand, log = null }) {
   const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'hive-mind-task-issue-'));
   const bodyFile = path.join(tempDir, 'body.md');
 
   try {
     await fs.writeFile(bodyFile, body);
-    const result = await run('gh', ['issue', 'create', '--repo', repository.fullName, '--title', title, '--body-file', bodyFile]);
-    if (result.code !== 0) {
-      const output = `${result.stderr || ''}${result.stdout || ''}`.trim();
+
+    const result = await run('gh', buildCreateIssueArgs({ repository, title, bodyFile, issueType, labels }));
+    if (result.code === 0) return parseCreatedTaskIssueOutput(result.stdout);
+
+    const output = `${result.stderr || ''}${result.stdout || ''}`.trim();
+    const usedOptionalMetadata = Boolean(issueType) || labels.length > 0;
+    if (!usedOptionalMetadata) {
       throw new Error(output || `gh issue create exited with code ${result.code}`);
     }
-    return parseCreatedTaskIssueOutput(result.stdout);
+
+    await log?.(`⚠️  Could not create issue with type/labels (${output || `exit code ${result.code}`}); retrying without them`);
+    const retry = await run('gh', buildCreateIssueArgs({ repository, title, bodyFile }));
+    if (retry.code !== 0) {
+      const retryOutput = `${retry.stderr || ''}${retry.stdout || ''}`.trim();
+      throw new Error(retryOutput || `gh issue create exited with code ${retry.code}`);
+    }
+    return parseCreatedTaskIssueOutput(retry.stdout);
   } finally {
     await fs.rm(tempDir, { recursive: true, force: true }).catch(() => {});
   }

package/src/telegram-bot.mjs

@@ -23,94 +23,14 @@ dotenvx.config({ quiet: true, ignore: ['MISSING_ENV_FILE'] });
 await loadLenvConfig({ override: true, quiet: true });
 
 const yargs = getLinoYargsFactory();
+const { createYargsConfig: createTelegramYargsConfig } = await import('./telegram.config.lib.mjs');
 const { createYargsConfig: createSolveYargsConfig, detectMalformedFlags } = await import('./solve.config.lib.mjs');
 const { createYargsConfig: createHiveYargsConfig } = await import('./hive.config.lib.mjs');
 const { enhanceUnknownArgumentError } = await import('./option-suggestions.lib.mjs');
 const { validateBranchInArgs } = await import('./solve.branch.lib.mjs');
 const { extractIsolationFromArgs, isValidPerCommandIsolation } = await import('./telegram-isolation.lib.mjs');
 
-const config = yargs(hideBin(process.argv))
-  .usage('Usage: hive-telegram-bot [options]')
-  .option('configuration', {
-    type: 'string',
-    description: 'LINO configuration string for environment variables',
-    alias: 'c',
-    default: getenv('TELEGRAM_CONFIGURATION', ''),
-  })
-  .option('token', {
-    type: 'string',
-    description: 'Telegram bot token from @BotFather',
-    alias: 't',
-    default: getenv('TELEGRAM_BOT_TOKEN', ''),
-  })
-  .option('allowedChats', {
-    type: 'string',
-    description: 'Allowed chat IDs in lino notation, e.g., "(\n  123456789\n  987654321\n)"',
-    alias: 'allowed-chats',
-    default: getenv('TELEGRAM_ALLOWED_CHATS', ''),
-  })
-  .option('allowedTopics', {
-    type: 'string',
-    description: 'Allowed topic IDs in Links Notation format "chatId topicId" pairs',
-    alias: 'allowed-topics',
-    default: getenv('TELEGRAM_ALLOWED_TOPICS', ''),
-  })
-  .option('solveOverrides', {
-    type: 'string',
-    description: 'Override options for /solve command in lino notation, e.g., "(\n  --auto-continue\n  --attach-logs\n)"',
-    alias: 'solve-overrides',
-    default: getenv('TELEGRAM_SOLVE_OVERRIDES', ''),
-  })
-  .option('hiveOverrides', {
-    type: 'string',
-    description: 'Override options for /hive command in lino notation, e.g., "(\n  --verbose\n  --all-issues\n)"',
-    alias: 'hive-overrides',
-    default: getenv('TELEGRAM_HIVE_OVERRIDES', ''),
-  })
-  .option('solve', {
-    type: 'boolean',
-    description: 'Enable /solve command (use --no-solve to disable)',
-    default: getenv('TELEGRAM_SOLVE', 'true') !== 'false',
-  })
-  .option('hive', {
-    type: 'boolean',
-    description: 'Enable /hive command (use --no-hive to disable)',
-    default: getenv('TELEGRAM_HIVE', 'true') !== 'false',
-  })
-  .option('task', {
-    type: 'boolean',
-    description: 'Enable /task and /split commands (use --no-task to disable)',
-    default: getenv('TELEGRAM_TASK', 'true') !== 'false',
-  })
-  .option('auth', {
-    type: 'boolean',
-    description: 'Enable experimental private /auth command for allowlisted chat owners (use --no-auth to disable)',
-    default: getenv('TELEGRAM_AUTH', 'true') !== 'false',
-  })
-  .option('dryRun', {
-    type: 'boolean',
-    description: 'Validate configuration and options without starting the bot',
-    alias: 'dry-run',
-    default: false,
-  })
-  .option('verbose', {
-    type: 'boolean',
-    description: 'Enable verbose logging for debugging',
-    alias: 'v',
-    default: getenv('TELEGRAM_BOT_VERBOSE', 'false') === 'true',
-  })
-  .option('autoStartScreenWatchMessage', { type: 'boolean', description: 'Experimental: auto-start separate /terminal_watch messages for public /solve sessions', alias: 'auto-start-screen-watch-message', default: getenv('TELEGRAM_AUTO_START_SCREEN_WATCH_MESSAGE', getenv('TELEGRAM_AUTO_WATCH_MESSAGE', 'false')) === 'true' })
-  // Issue #594: bot-owner toggle for --show-limits virtual option in /solve and /hive.
-  .option('showLimits', { type: 'boolean', description: 'Experimental: allow /solve and /hive callers to use --show-limits to embed Claude/Codex usage at start, end, and delta in the completion message', alias: 'show-limits', default: getenv('TELEGRAM_SHOW_LIMITS', 'true') !== 'false' })
-  .option('isolation', { type: 'string', description: "Isolation backend (screen/tmux/docker). Defaults to 'docker' so Telegram-bot work sessions run in Docker isolation; pass --isolation '' (or set TELEGRAM_ISOLATION='') to disable.", default: getenv('TELEGRAM_ISOLATION', 'docker') })
-  .help('h')
-  .alias('h', 'help')
-  .parserConfiguration({
-    'boolean-negation': true,
-    'strip-dashed': true, // Remove dashed keys from argv to simplify validation
-  })
-  .strict() // Enable strict mode to reject unknown options (consistent with solve.mjs and hive.mjs)
-  .parse();
+const config = createTelegramYargsConfig(yargs(hideBin(process.argv))).parse();
 
 // Configuration priority: CLI option > --configuration LINO > .lenv > .env
 if (config.configuration) {
@@ -150,6 +70,7 @@ const hiveOverrides = resolvedHiveOverrides
 const solveEnabled = config.solve;
 const hiveEnabled = config.hive;
 const taskEnabled = config.task;
+const fixEnabled = config.fix;
 const authEnabled = config.auth;
 // Isolation mode (experimental): uses `$` from start-command with specified backend
 const ISOLATION_BACKEND = (config.isolation || getenv('TELEGRAM_ISOLATION', '')).trim().toLowerCase();
@@ -299,7 +220,7 @@ if (config.dryRun) {
   if (allowedTopics && allowedTopics.length > 0) {
     console.log('  Allowed topics:', lino.formatLinks(allowedTopics));
   }
-  console.log('  Commands enabled:', { solve: solveEnabled, hive: hiveEnabled, task: taskEnabled, auth: authEnabled });
+  console.log('  Commands enabled:', { solve: solveEnabled, hive: hiveEnabled, task: taskEnabled, fix: fixEnabled, auth: authEnabled });
   if (solveOverrides.length > 0) {
     console.log('  Solve overrides:', lino.format(solveOverrides));
   }
@@ -570,6 +491,7 @@ bot.command('help', async ctx => {
     stopReason: stopInfo?.reason || DEFAULT_STOP_REASON,
     solveEnabled,
     taskEnabled,
+    fixEnabled,
     hiveEnabled,
     solveOverrides,
     hiveOverrides,
@@ -672,6 +594,8 @@ const { registerSubscribeCommands } = await import('./telegram-subscribers.lib.m
 registerSubscribeCommands(bot, sharedCommandOpts);
 const { registerTaskCommands } = await import('./telegram-task-command.lib.mjs');
 const { handleTaskCommand, TASK_COMMAND_NAMES } = registerTaskCommands(bot, { ...sharedCommandOpts, taskEnabled, safeReply, executeAndUpdateMessage, resolveLocale: resolveLocaleFromTelegramCtx });
+const { registerFixCommand } = await import('./telegram-fix-command.lib.mjs');
+const { handleFixCommand, FIX_COMMAND_NAMES } = registerFixCommand(bot, { ...sharedCommandOpts, fixEnabled, safeReply, executeAndUpdateMessage, resolveLocale: resolveLocaleFromTelegramCtx });
 const { registerAuthCommand } = await import('./telegram-auth-command.lib.mjs');
 const { handleAuthCommand } = registerAuthCommand(bot, { ...sharedCommandOpts, allowedChats, authEnabled, safeReply });
 
@@ -1235,7 +1159,8 @@ bot.on('message', async (ctx, next) => {
   // /subscribe + /unsubscribe (#1688) are intentionally not in the text fallback — Telegraf's bot.command() is sufficient.
   const solveHandlers = Object.fromEntries(SOLVE_COMMAND_NAMES.map(command => [command, handleSolveCommand]));
   const taskHandlers = Object.fromEntries(TASK_COMMAND_NAMES.map(command => [command, handleTaskCommand]));
-  const handlers = { ...solveHandlers, ...taskHandlers, auth: handleAuthCommand, hive: handleHiveCommand, queue: handleSolveQueueCommand };
+  const fixHandlers = Object.fromEntries(FIX_COMMAND_NAMES.map(command => [command, handleFixCommand]));
+  const handlers = { ...solveHandlers, ...taskHandlers, ...fixHandlers, auth: handleAuthCommand, hive: handleHiveCommand, queue: handleSolveQueueCommand };
 
   const handler = handlers[extracted.command];
   if (!handler) return next();
@@ -1344,7 +1269,7 @@ if (allowedChats && allowedChats.length > 0) {
 if (allowedTopics && allowedTopics.length > 0) {
   console.log('Allowed topics (lino):', lino.formatLinks(allowedTopics));
 }
-console.log('Commands enabled:', { solve: solveEnabled, hive: hiveEnabled, task: taskEnabled, auth: authEnabled });
+console.log('Commands enabled:', { solve: solveEnabled, hive: hiveEnabled, task: taskEnabled, fix: fixEnabled, auth: authEnabled });
 if (solveOverrides.length > 0) console.log('Solve overrides (lino):', lino.format(solveOverrides));
 if (hiveOverrides.length > 0) console.log('Hive overrides (lino):', lino.format(hiveOverrides));
 if (VERBOSE) {