@link-assistant/hive-mind 2.0.27 → 2.0.29

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @link-assistant/hive-mind
 
+## 2.0.29
+
+### Patch Changes
+
+- 0cafc64: Add solve resource diagnostics and Docker disk-usage fallback markers so Telegram completion messages can show full container filesystem usage even when the task container cannot be inspected after exit.
+
+## 2.0.28
+
+### Patch Changes
+
+- 5b4f3df: Recommend and accept `/queue` instead of the legacy solve-prefixed queue commands, and recommend `/stop` for cancelling running sessions.
+
 ## 2.0.27
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-assistant/hive-mind",
-  "version": "2.0.27",
+  "version": "2.0.29",
   "description": "AI-powered issue solver and hive mind for collaborative problem solving",
   "main": "src/hive.mjs",
   "type": "module",

package/src/bot-lifecycle.lib.mjs

@@ -12,6 +12,8 @@
  * @see https://github.com/link-assistant/hive-mind/issues/1927
  */
 
+import { RESOURCE_PHASE_BOT_HEARTBEAT, captureResourceSnapshot, summarizeResourceSnapshot } from './solve.resource-diagnostics.lib.mjs';
+
 const DEFAULT_HEARTBEAT_INTERVAL_MS = 60 * 1000;
 
 /**
@@ -26,14 +28,28 @@ const DEFAULT_HEARTBEAT_INTERVAL_MS = 60 * 1000;
  *
  * @returns {{ start: () => void, stop: () => void, beat: () => void, get timer(): any }}
  */
-export function createHeartbeat({ logger, getActiveSessionCount, intervalMs = DEFAULT_HEARTBEAT_INTERVAL_MS, processImpl = process, setIntervalImpl = setInterval, clearIntervalImpl = clearInterval } = {}) {
+export function createHeartbeat({ logger, getActiveSessionCount, intervalMs = DEFAULT_HEARTBEAT_INTERVAL_MS, processImpl = process, setIntervalImpl = setInterval, clearIntervalImpl = clearInterval, captureResources = captureResourceSnapshot, resourceDiskPath = '/' } = {}) {
   let timer = null;
 
   const beat = () => {
     try {
+      let resources = null;
+      try {
+        if (typeof captureResources === 'function') {
+          resources = summarizeResourceSnapshot(
+            captureResources({
+              phase: RESOURCE_PHASE_BOT_HEARTBEAT,
+              diskPath: resourceDiskPath,
+            })
+          );
+        }
+      } catch {
+        resources = null;
+      }
       logger.heartbeat({
         activeSessions: typeof getActiveSessionCount === 'function' ? getActiveSessionCount(false) : undefined,
         uptimeSec: Math.floor(processImpl.uptime()),
+        resources,
       });
     } catch {
       /* heartbeat must never crash the bot */

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/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/session-monitor.lib.mjs

@@ -343,10 +343,11 @@ async function resolvePullRequestUrlFromSessionLog(logPath, ctx, { verbose = fal
  * build the Telegram extraSection. Returns an empty string if there is no
  * repository or docker filesystem data to show.
  */
-async function buildDiskDiagnosticsExtraSection(logPath, { verbose = false, readFile = fs.readFile, isolationBackend = null, containerFilesystemStartBytes = null, containerFilesystemAfterBytes = null } = {}) {
+export async function buildDiskDiagnosticsExtraSection(logPath, { verbose = false, readFile = fs.readFile, isolationBackend = null, containerFilesystemStartBytes = null, containerFilesystemAfterBytes = null } = {}) {
   if (!logPath && !Number.isFinite(containerFilesystemStartBytes) && !Number.isFinite(containerFilesystemAfterBytes)) return '';
   try {
     const diskLib = await import('./solve.disk-diagnostics.lib.mjs');
+    const resourceLib = await import('./solve.resource-diagnostics.lib.mjs');
     let logText = '';
     if (logPath) {
       try {
@@ -358,11 +359,17 @@ async function buildDiskDiagnosticsExtraSection(logPath, { verbose = false, read
       }
     }
     const parsed = diskLib.parseDiskMarkers(logText);
-    if (!parsed.afterClone && !parsed.afterAgent && !Number.isFinite(containerFilesystemStartBytes) && !Number.isFinite(containerFilesystemAfterBytes)) return '';
+    const parsedResources = resourceLib.parseResourceMarkers(logText);
+    const bestResourceMarker = resourceLib.selectBestDiskResourceMarker(parsedResources);
+    const solveStartResourceMarker = parsedResources.byPhase?.[resourceLib.RESOURCE_PHASE_SOLVE_START] || null;
+    const useResourceFallback = String(isolationBackend || '').toLowerCase() === 'docker' && !Number.isFinite(containerFilesystemAfterBytes) && Number.isFinite(bestResourceMarker?.disk?.usedBytes);
+    const effectiveContainerFilesystemAfterBytes = useResourceFallback ? bestResourceMarker.disk.usedBytes : containerFilesystemAfterBytes;
+    const effectiveContainerFilesystemStartBytes = useResourceFallback && Number.isFinite(solveStartResourceMarker?.disk?.usedBytes) ? solveStartResourceMarker.disk.usedBytes : containerFilesystemStartBytes;
+    if (!parsed.afterClone && !parsed.afterAgent && !Number.isFinite(effectiveContainerFilesystemStartBytes) && !Number.isFinite(effectiveContainerFilesystemAfterBytes)) return '';
     return diskLib.formatDiskDiagnosticsBlock(parsed, {
       isolationBackend,
-      containerFilesystemStartBytes,
-      containerFilesystemAfterBytes,
+      containerFilesystemStartBytes: effectiveContainerFilesystemStartBytes,
+      containerFilesystemAfterBytes: effectiveContainerFilesystemAfterBytes,
     });
   } catch (error) {
     if (verbose) {
@@ -1274,7 +1281,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.mjs

@@ -49,7 +49,8 @@ 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 { initializeExitHandler, installGlobalExitHandlers, safeExit: baseSafeExit, logActiveHandles } = exitHandler;
+const { RESOURCE_PHASE_AFTER_AGENT, RESOURCE_PHASE_AFTER_CLONE, RESOURCE_PHASE_SOLVE_EXIT, RESOURCE_PHASE_SOLVE_START, recordResourceSnapshot } = await import('./solve.resource-diagnostics.lib.mjs');
 const { createInterruptWrapper } = await import('./solve.interrupt.lib.mjs');
 // Issue #1823: working-session guard for --do-not-shutdown-in-the-middle-of-working-session.
 const { configureWorkingSession, beginWorkingSession, endWorkingSession } = await import('./working-session.lib.mjs');
@@ -69,9 +70,7 @@ const { prepareFeedbackAndTimestamps, checkUncommittedChanges, checkForkActions
 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');
-// Initialize log file early (before argument parsing) to capture all output
 const logFile = await initializeLogFile(null);
-// Log version and raw command IMMEDIATELY after log file initialization
 const versionInfo = await getVersionInfo();
 await log('');
 await log(`🚀 solve v${versionInfo}`);
@@ -80,6 +79,15 @@ await log('🔧 Raw command executed:');
 await log(`   ${rawCommand}`);
 await log('');
 
+let finalResourceSnapshotRecorded = false;
+const safeExit = async (code = 0, reason = 'Process completed', options = {}) => {
+  if (!finalResourceSnapshotRecorded) {
+    finalResourceSnapshotRecorded = true;
+    await recordResourceSnapshot({ phase: RESOURCE_PHASE_SOLVE_EXIT, log, diskPath: '/', label: `solve exit ${code}` });
+  }
+  return await baseSafeExit(code, reason, options);
+};
+
 let argv;
 try {
   argv = await parseArguments(yargs, hideBin);
@@ -98,6 +106,7 @@ configureGitHubRateLimitLogging({
   enabled: argv.githubRateLimitsLogging === true,
   log,
 });
+await recordResourceSnapshot({ phase: RESOURCE_PHASE_SOLVE_START, log, diskPath: '/', label: 'solve start' });
 
 // Early logs go to cwd; custom log dir takes effect after argv is parsed
 // Conditionally import tool-specific functions after argv is parsed
@@ -507,6 +516,7 @@ try {
   });
 
   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)
@@ -830,6 +840,7 @@ try {
   } 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

package/src/solve.resource-diagnostics.lib.mjs

@@ -0,0 +1,322 @@
+import fs from 'node:fs';
+import os from 'node:os';
+
+export const RESOURCE_MARKER_PREFIX = '📈 [RESOURCES]';
+
+export const RESOURCE_PHASE_SOLVE_START = 'solve_start';
+export const RESOURCE_PHASE_AFTER_CLONE = 'after_clone';
+export const RESOURCE_PHASE_AFTER_AGENT = 'after_agent';
+export const RESOURCE_PHASE_SOLVE_EXIT = 'solve_exit';
+export const RESOURCE_PHASE_RESTART_BEFORE = 'restart_before';
+export const RESOURCE_PHASE_RESTART_AFTER = 'restart_after';
+export const RESOURCE_PHASE_BOT_HEARTBEAT = 'bot_heartbeat';
+
+const RESOURCE_PHASES_BY_PREFERENCE = [RESOURCE_PHASE_SOLVE_EXIT, RESOURCE_PHASE_AFTER_AGENT, RESOURCE_PHASE_RESTART_AFTER, RESOURCE_PHASE_AFTER_CLONE, RESOURCE_PHASE_SOLVE_START, RESOURCE_PHASE_RESTART_BEFORE];
+
+function finiteNumber(value) {
+  return Number.isFinite(value) ? value : null;
+}
+
+function clampPercent(value) {
+  if (!Number.isFinite(value)) return null;
+  return Math.max(0, Math.min(100, value));
+}
+
+function readLinuxMemAvailableBytes(readFileSync = fs.readFileSync, platform = process.platform) {
+  if (platform !== 'linux') return null;
+  try {
+    const text = readFileSync('/proc/meminfo', 'utf8');
+    const match = text.match(/^MemAvailable:\s+(\d+)\s+kB$/m);
+    if (!match) return null;
+    return Number.parseInt(match[1], 10) * 1024;
+  } catch {
+    return null;
+  }
+}
+
+export function captureResourceSnapshot(options = {}) {
+  const { phase = 'snapshot', diskPath = '/', now = () => new Date(), osImpl = os, fsImpl = fs, processImpl = process } = options;
+
+  const timestamp = (() => {
+    try {
+      return now().toISOString();
+    } catch {
+      return new Date().toISOString();
+    }
+  })();
+
+  const load = (() => {
+    try {
+      const values = osImpl.loadavg();
+      return {
+        load1: finiteNumber(values[0]),
+        load5: finiteNumber(values[1]),
+        load15: finiteNumber(values[2]),
+      };
+    } catch {
+      return { load1: null, load5: null, load15: null };
+    }
+  })();
+
+  const cpuCount = (() => {
+    try {
+      const cpus = osImpl.cpus();
+      return Array.isArray(cpus) ? cpus.length : null;
+    } catch {
+      return null;
+    }
+  })();
+
+  const totalMemoryBytes = (() => {
+    try {
+      return finiteNumber(osImpl.totalmem());
+    } catch {
+      return null;
+    }
+  })();
+
+  const freeMemoryBytes = (() => {
+    try {
+      return finiteNumber(osImpl.freemem());
+    } catch {
+      return null;
+    }
+  })();
+
+  const availableMemoryBytes = readLinuxMemAvailableBytes(fsImpl.readFileSync?.bind(fsImpl), processImpl.platform || process.platform) ?? freeMemoryBytes;
+  const usedMemoryBytes = totalMemoryBytes !== null && availableMemoryBytes !== null ? Math.max(0, totalMemoryBytes - availableMemoryBytes) : null;
+
+  const processMemory = (() => {
+    try {
+      const usage = processImpl.memoryUsage();
+      return {
+        rssBytes: finiteNumber(usage.rss),
+        heapUsedBytes: finiteNumber(usage.heapUsed),
+      };
+    } catch {
+      return { rssBytes: null, heapUsedBytes: null };
+    }
+  })();
+
+  const disk = (() => {
+    const path = String(diskPath || '/');
+    try {
+      if (typeof fsImpl.statfsSync !== 'function') {
+        return { path, totalBytes: null, freeBytes: null, availableBytes: null, usedBytes: null, usedPercent: null, error: 'statfs unavailable' };
+      }
+      const stat = fsImpl.statfsSync(path);
+      const blockSize = Number(stat.bsize || stat.frsize || 0);
+      const blocks = Number(stat.blocks);
+      const bfree = Number(stat.bfree);
+      const bavail = Number(stat.bavail);
+      const totalBytes = Number.isFinite(blockSize) && Number.isFinite(blocks) ? blockSize * blocks : null;
+      const freeBytes = Number.isFinite(blockSize) && Number.isFinite(bfree) ? blockSize * bfree : null;
+      const availableBytes = Number.isFinite(blockSize) && Number.isFinite(bavail) ? blockSize * bavail : freeBytes;
+      const usedBytes = totalBytes !== null && freeBytes !== null ? Math.max(0, totalBytes - freeBytes) : null;
+      const usedPercent = totalBytes && usedBytes !== null ? clampPercent((usedBytes / totalBytes) * 100) : null;
+      return { path, totalBytes, freeBytes, availableBytes, usedBytes, usedPercent, error: null };
+    } catch (error) {
+      return {
+        path,
+        totalBytes: null,
+        freeBytes: null,
+        availableBytes: null,
+        usedBytes: null,
+        usedPercent: null,
+        error: error?.message || String(error),
+      };
+    }
+  })();
+
+  return {
+    phase: String(phase || 'snapshot'),
+    timestamp,
+    cpu: { ...load, cpuCount },
+    memory: {
+      totalBytes: totalMemoryBytes,
+      freeBytes: freeMemoryBytes,
+      availableBytes: availableMemoryBytes,
+      usedBytes: usedMemoryBytes,
+      processRssBytes: processMemory.rssBytes,
+      processHeapUsedBytes: processMemory.heapUsedBytes,
+    },
+    disk,
+  };
+}
+
+export function formatBytes(bytes) {
+  if (!Number.isFinite(bytes)) return '? B';
+  const abs = Math.abs(bytes);
+  if (abs >= 1024 ** 3) return `${(bytes / 1024 ** 3).toFixed(1)} GB`;
+  if (abs >= 1024 ** 2) return `${Math.round(bytes / 1024 ** 2)} MB`;
+  if (abs >= 1024) return `${Math.round(bytes / 1024)} KB`;
+  return `${Math.round(bytes)} B`;
+}
+
+function formatNumber(value, decimals = 2) {
+  return Number.isFinite(value) ? value.toFixed(decimals) : '?';
+}
+
+function encodeValue(value) {
+  if (value === null || value === undefined) return 'null';
+  return encodeURIComponent(String(value));
+}
+
+function numberField(name, value) {
+  return Number.isFinite(value) ? `${name}=${value}` : `${name}=null`;
+}
+
+export function buildResourceMarker(snapshot) {
+  const s = snapshot || {};
+  const cpu = s.cpu || {};
+  const memory = s.memory || {};
+  const disk = s.disk || {};
+  return [
+    RESOURCE_MARKER_PREFIX,
+    `phase=${encodeValue(s.phase || 'snapshot')}`,
+    `ts=${encodeValue(s.timestamp || new Date().toISOString())}`,
+    numberField('load1', cpu.load1),
+    numberField('load5', cpu.load5),
+    numberField('load15', cpu.load15),
+    numberField('cpuCount', cpu.cpuCount),
+    numberField('memTotalBytes', memory.totalBytes),
+    numberField('memAvailableBytes', memory.availableBytes),
+    numberField('memUsedBytes', memory.usedBytes),
+    numberField('processRssBytes', memory.processRssBytes),
+    `diskPath=${encodeValue(disk.path || '/')}`,
+    numberField('diskTotalBytes', disk.totalBytes),
+    numberField('diskAvailableBytes', disk.availableBytes),
+    numberField('diskUsedBytes', disk.usedBytes),
+    numberField('diskUsedPercent', disk.usedPercent),
+    disk.error ? `error=${encodeValue(disk.error)}` : null,
+    `mem=${encodeValue(`${formatBytes(memory.availableBytes)} available / ${formatBytes(memory.totalBytes)} total`)}`,
+    `disk=${encodeValue(`${formatBytes(disk.availableBytes)} available / ${formatBytes(disk.totalBytes)} total`)}`,
+  ]
+    .filter(Boolean)
+    .join(' ');
+}
+
+function parseNumber(value) {
+  if (value === 'null' || value === undefined) return null;
+  const n = Number(value);
+  return Number.isFinite(n) ? n : null;
+}
+
+function parseMarkerLine(line) {
+  const idx = line.indexOf(RESOURCE_MARKER_PREFIX);
+  if (idx < 0) return null;
+  const payload = line.slice(idx + RESOURCE_MARKER_PREFIX.length).trim();
+  const parts = payload.split(/\s+/).filter(Boolean);
+  const fields = {};
+  for (const part of parts) {
+    const eq = part.indexOf('=');
+    if (eq <= 0) continue;
+    fields[part.slice(0, eq)] = part.slice(eq + 1);
+  }
+  const phase = decodeURIComponent(fields.phase || 'snapshot');
+  return {
+    phase,
+    timestamp: decodeURIComponent(fields.ts || ''),
+    cpu: {
+      load1: parseNumber(fields.load1),
+      load5: parseNumber(fields.load5),
+      load15: parseNumber(fields.load15),
+      cpuCount: parseNumber(fields.cpuCount),
+    },
+    memory: {
+      totalBytes: parseNumber(fields.memTotalBytes),
+      availableBytes: parseNumber(fields.memAvailableBytes),
+      usedBytes: parseNumber(fields.memUsedBytes),
+      processRssBytes: parseNumber(fields.processRssBytes),
+    },
+    disk: {
+      path: decodeURIComponent(fields.diskPath || '/'),
+      totalBytes: parseNumber(fields.diskTotalBytes),
+      availableBytes: parseNumber(fields.diskAvailableBytes),
+      usedBytes: parseNumber(fields.diskUsedBytes),
+      usedPercent: parseNumber(fields.diskUsedPercent),
+      error: fields.error ? decodeURIComponent(fields.error) : null,
+    },
+  };
+}
+
+export function parseResourceMarkers(logText) {
+  if (typeof logText !== 'string' || !logText) return { markers: [], byPhase: {} };
+  const markers = [];
+  const byPhase = {};
+  for (const line of logText.split(/\r?\n/)) {
+    const marker = parseMarkerLine(line);
+    if (!marker) continue;
+    markers.push(marker);
+    byPhase[marker.phase] = marker;
+  }
+  return { markers, byPhase };
+}
+
+export function selectBestDiskResourceMarker(parsed) {
+  const byPhase = parsed?.byPhase || {};
+  for (const phase of RESOURCE_PHASES_BY_PREFERENCE) {
+    const marker = byPhase[phase];
+    if (Number.isFinite(marker?.disk?.usedBytes)) return marker;
+  }
+  const markers = Array.isArray(parsed?.markers) ? parsed.markers : [];
+  for (let i = markers.length - 1; i >= 0; i--) {
+    if (Number.isFinite(markers[i]?.disk?.usedBytes)) return markers[i];
+  }
+  return null;
+}
+
+export function formatResourceSnapshotForLog(snapshot, label = null) {
+  const s = snapshot || {};
+  const phaseLabel = label || String(s.phase || 'snapshot').replace(/_/g, ' ');
+  const cpu = s.cpu || {};
+  const memory = s.memory || {};
+  const disk = s.disk || {};
+  const lines = [`📈 Resource usage (${phaseLabel}):`, `   CPU load: ${formatNumber(cpu.load1)} ${formatNumber(cpu.load5)} ${formatNumber(cpu.load15)}${Number.isFinite(cpu.cpuCount) ? ` (${cpu.cpuCount} CPUs)` : ''}`, `   Memory: ${formatBytes(memory.availableBytes)} available / ${formatBytes(memory.totalBytes)} total (${formatBytes(memory.usedBytes)} used)`, `   Process RSS: ${formatBytes(memory.processRssBytes)}${Number.isFinite(memory.processHeapUsedBytes) ? `, heap ${formatBytes(memory.processHeapUsedBytes)}` : ''}`, `   Disk (${disk.path || '/'}): ${formatBytes(disk.availableBytes)} available / ${formatBytes(disk.totalBytes)} total${Number.isFinite(disk.usedPercent) ? ` (${disk.usedPercent.toFixed(1)}% used)` : ''}`];
+  if (disk.error) lines.push(`   Disk probe error: ${disk.error}`);
+  lines.push(buildResourceMarker(snapshot));
+  return lines.join('\n');
+}
+
+export async function recordResourceSnapshot({ phase, log, diskPath = '/', label = null, capture = captureResourceSnapshot } = {}) {
+  if (typeof log !== 'function') return null;
+  try {
+    const snapshot = capture({ phase, diskPath });
+    await log(formatResourceSnapshotForLog(snapshot, label));
+    return snapshot;
+  } catch (error) {
+    await log(`⚠️  Resource usage measurement failed (${phase || 'snapshot'}): ${error?.message || error}`, { level: 'warning', verbose: true });
+    return null;
+  }
+}
+
+export function summarizeResourceSnapshot(snapshot) {
+  if (!snapshot) return null;
+  const cpu = snapshot.cpu || {};
+  const memory = snapshot.memory || {};
+  const disk = snapshot.disk || {};
+  return {
+    phase: snapshot.phase || null,
+    timestamp: snapshot.timestamp || null,
+    cpu: {
+      load1: cpu.load1,
+      load5: cpu.load5,
+      load15: cpu.load15,
+      cpuCount: cpu.cpuCount,
+    },
+    memory: {
+      totalBytes: memory.totalBytes,
+      availableBytes: memory.availableBytes,
+      usedBytes: memory.usedBytes,
+      processRssBytes: memory.processRssBytes,
+    },
+    disk: {
+      path: disk.path,
+      totalBytes: disk.totalBytes,
+      availableBytes: disk.availableBytes,
+      usedBytes: disk.usedBytes,
+      usedPercent: disk.usedPercent,
+      error: disk.error || null,
+    },
+  };
+}

package/src/solve.restart-shared.lib.mjs

@@ -32,6 +32,7 @@ const fs = (await use('fs')).promises;
 const lib = await import('./lib.mjs');
 const { log, formatAligned, extractToolErrorCore } = lib;
 const { ensurePullRequestBaseBranch } = await import('./solve.pr-base-guard.lib.mjs');
+const { RESOURCE_PHASE_RESTART_AFTER, RESOURCE_PHASE_RESTART_BEFORE, recordResourceSnapshot } = await import('./solve.resource-diagnostics.lib.mjs');
 
 // Import Sentry integration
 const sentryLib = await import('./sentry.lib.mjs');
@@ -177,6 +178,13 @@ export const getUncommittedChangesDetails = async tempDir => {
 export const executeToolIteration = async params => {
   const { issueUrl, owner, repo, issueNumber, prNumber, branchName, tempDir, workspaceTmpDir, mergeStateStatus, feedbackLines, argv } = params;
 
+  await recordResourceSnapshot({
+    phase: RESOURCE_PHASE_RESTART_BEFORE,
+    log,
+    diskPath: '/',
+    label: 'before AI restart iteration',
+  });
+
   // Import necessary modules for tool execution
   const memoryCheck = await import('./memory-check.mjs');
   const { getResourceSnapshot } = memoryCheck;
@@ -462,6 +470,12 @@ export const executeToolIteration = async params => {
   }
 
   await ensurePullRequestBaseBranch({ owner, repo, prNumber, argv, log, formatAligned, $ });
+  await recordResourceSnapshot({
+    phase: RESOURCE_PHASE_RESTART_AFTER,
+    log,
+    diskPath: '/',
+    label: 'after AI restart iteration',
+  });
   return toolResult;
 };
 

package/src/telegram-bot.mjs

@@ -1234,8 +1234,7 @@ 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]));
-  // /queue is the short alias for /solve_queue (issue #1837)
-  const handlers = { ...solveHandlers, ...taskHandlers, auth: handleAuthCommand, hive: handleHiveCommand, solve_queue: handleSolveQueueCommand, solvequeue: handleSolveQueueCommand, queue: handleSolveQueueCommand };
+  const handlers = { ...solveHandlers, ...taskHandlers, auth: handleAuthCommand, hive: handleHiveCommand, queue: handleSolveQueueCommand };
 
   const handler = handlers[extracted.command];
   if (!handler) return next();

package/src/telegram-solve-queue-command.lib.mjs

@@ -1,7 +1,7 @@
 /**
- * Telegram /solve_queue command implementation
+ * Telegram /queue command implementation
  *
- * This module provides the /solve_queue command functionality for the Telegram bot,
+ * This module provides the /queue command functionality for the Telegram bot,
  * allowing users to view the current solve queue status.
  *
  * Features:
@@ -15,7 +15,7 @@
 
 import { t } from './i18n.lib.mjs';
 
-const GROUP_ONLY_MESSAGE = '❌ The /solve_queue command only works in group chats. Please add this bot to a group and make it an admin.';
+const GROUP_ONLY_MESSAGE = '❌ The /queue command only works in group chats. Please add this bot to a group and make it an admin.';
 
 function commandText(key, params = {}, locale = null, fallback = key) {
   const translated = t(key, params, locale ? { locale } : {});
@@ -23,7 +23,7 @@ function commandText(key, params = {}, locale = null, fallback = key) {
 }
 
 /**
- * Registers the /solve_queue command handler with the bot
+ * Registers the /queue command handler with the bot
  * @param {Object} bot - The Telegraf bot instance
  * @param {Object} options - Options object
  * @param {boolean} options.VERBOSE - Whether to enable verbose logging
@@ -41,11 +41,11 @@ export function registerSolveQueueCommand(bot, options) {
   const { VERBOSE = false, isOldMessage, isForwardedOrReply, isGroupChat, isChatAuthorized, isTopicAuthorized, buildAuthErrorMessage, addBreadcrumb, getSolveQueue, safeReply, resolveLocale } = options;
 
   async function handleSolveQueueCommand(ctx) {
-    VERBOSE && console.log('[VERBOSE] /solve_queue command received');
+    VERBOSE && console.log('[VERBOSE] /queue command received');
 
     await addBreadcrumb({
       category: 'telegram.command',
-      message: '/solve_queue command received',
+      message: '/queue command received',
       level: 'info',
       data: { chatId: ctx.chat?.id, chatType: ctx.chat?.type, userId: ctx.from?.id, username: ctx.from?.username },
     });
@@ -54,18 +54,18 @@ export function registerSolveQueueCommand(bot, options) {
 
     // Ignore messages sent before bot started
     if (isOldMessage(ctx)) {
-      VERBOSE && console.log('[VERBOSE] /solve_queue ignored: old message');
+      VERBOSE && console.log('[VERBOSE] /queue ignored: old message');
       return;
     }
 
     // Ignore forwarded or reply messages
     if (isForwardedOrReply(ctx)) {
-      VERBOSE && console.log('[VERBOSE] /solve_queue ignored: forwarded or reply');
+      VERBOSE && console.log('[VERBOSE] /queue ignored: forwarded or reply');
       return;
     }
 
     if (!isGroupChat(ctx)) {
-      VERBOSE && console.log('[VERBOSE] /solve_queue ignored: not a group chat');
+      VERBOSE && console.log('[VERBOSE] /queue ignored: not a group chat');
       await replyWithFallback(commandText('telegram.solve_queue_only_in_groups', {}, locale, GROUP_ONLY_MESSAGE), {
         reply_to_message_id: ctx.message.message_id,
         fallbackLocale: locale,
@@ -75,13 +75,13 @@ export function registerSolveQueueCommand(bot, options) {
 
     const authorize = isTopicAuthorized || (ctx => isChatAuthorized(ctx.chat.id));
     if (!authorize(ctx)) {
-      VERBOSE && console.log('[VERBOSE] /solve_queue ignored: not authorized');
+      VERBOSE && console.log('[VERBOSE] /queue ignored: not authorized');
       const errMsg = buildAuthErrorMessage ? buildAuthErrorMessage(ctx) : `❌ This chat (ID: ${ctx.chat.id}) is not authorized.`;
       await replyWithFallback(errMsg, { reply_to_message_id: ctx.message.message_id, fallbackLocale: locale });
       return;
     }
 
-    VERBOSE && console.log('[VERBOSE] /solve_queue passed all checks, generating status...');
+    VERBOSE && console.log('[VERBOSE] /queue passed all checks, generating status...');
 
     const solveQueue = getSolveQueue({ verbose: VERBOSE });
 
@@ -97,12 +97,7 @@ export function registerSolveQueueCommand(bot, options) {
     });
   }
 
-  // Match /solve_queue, /solve-queue, /solvequeue, or the short /queue alias (case-insensitive)
-  // Note: Telegram Bot API only supports underscores in command names, not hyphens.
-  // The entity-based matching handles /solve_queue, /solvequeue, and /queue.
-  // /solve-queue is handled by the text-based fallback in telegram-bot.mjs (issue #1232).
-  // The /queue alias was added in issue #1837 to make checking the queue faster to type.
-  bot.command(/^(?:solve[_-]?queue|queue)$/i, handleSolveQueueCommand);
+  bot.command(/^queue$/i, handleSolveQueueCommand);
 
   return { handleSolveQueueCommand };
 }

package/src/telegram-solve-queue.helpers.lib.mjs

@@ -8,7 +8,7 @@ const execAsync = promisify(exec);
 
 /**
  * Build a clickable, human-readable link to a queued issue/PR for the
- * /solve_queue (/queue) detailed status (issue #1837).
+ * /queue detailed status (issue #1837).
  *
  * For GitHub issue/PR URLs we render a compact `[owner/repo#number](url)`
  * Markdown link so the list is scannable and clickable. When the label would
@@ -269,7 +269,7 @@ export async function getRunningSessionItems(verbose = false) {
     return await impl(verbose);
   } catch (error) {
     if (verbose) {
-      console.error('[VERBOSE] /solve_queue error getting running session items:', error.message);
+      console.error('[VERBOSE] /queue error getting running session items:', error.message);
     }
     return [];
   }
@@ -300,9 +300,9 @@ export async function getRunningProcesses(processName, verbose = false) {
       .filter(p => p.pid);
 
     if (verbose) {
-      console.log(`[VERBOSE] /solve_queue found ${processes.length} running ${processName} processes`);
+      console.log(`[VERBOSE] /queue found ${processes.length} running ${processName} processes`);
       if (processes.length > 0) {
-        console.log(`[VERBOSE] /solve_queue processes: ${JSON.stringify(processes)}`);
+        console.log(`[VERBOSE] /queue processes: ${JSON.stringify(processes)}`);
       }
     }
 
@@ -312,7 +312,7 @@ export async function getRunningProcesses(processName, verbose = false) {
     };
   } catch (error) {
     if (verbose) {
-      console.error(`[VERBOSE] /solve_queue error counting ${processName} processes:`, error.message);
+      console.error(`[VERBOSE] /queue error counting ${processName} processes:`, error.message);
     }
     return { count: 0, processes: [] };
   }

package/src/telegram-solve-queue.lib.mjs

@@ -250,7 +250,7 @@ export class SolveQueue {
    */
   log(message) {
     if (this.verbose) {
-      console.log(`[VERBOSE] /solve_queue: ${message}`);
+      console.log(`[VERBOSE] /queue: ${message}`);
     }
   }
 
@@ -1469,7 +1469,7 @@ export async function getRunningIsolatedSessions(verbose = false) {
     return await getRunningTrackedIsolationSessions(verbose);
   } catch (error) {
     if (verbose) {
-      console.error(`[VERBOSE] /solve_queue error getting isolated sessions:`, error.message);
+      console.error(`[VERBOSE] /queue error getting isolated sessions:`, error.message);
     }
     return { count: 0, sessions: [], byTool: {} };
   }