@link-assistant/hive-mind 1.78.13 → 2.0.1

package/CHANGELOG.md

@@ -1,5 +1,60 @@
 # @link-assistant/hive-mind
 
+## 2.0.1
+
+### Patch Changes
+
+- 70e1542: fix(retry): treat 5-hour "session limit" and "weekly limit" 429s as account usage limits, not transient throttles (#1935)
+
+  A long-running solve session (588 turns, ~$70.62) hit Claude's **5-hour session
+  limit**. The Claude CLI surfaced it as a `result` event with `is_error: true`,
+  `api_error_status: 429`, and:
+
+  ```
+  You've hit your session limit · resets 4pm (UTC)
+  ```
+
+  Instead of being treated as an **account usage limit** (post a comment with the
+  reset time + wait until the exact reset moment), it was put through the transient
+  exponential-backoff retry loop:
+
+  ```
+  ⚠️ Server rate limited (429) detected. Retry 1/10 in 2 min (session preserved)...
+     Error: You've hit your session limit · resets 4pm (UTC)
+  ⚠️ Server rate limited (429) detected. Retry 2/10 in 4 min (session preserved)...
+  ```
+
+  Each retry re-hit the same limit because the quota only frees at the reset time —
+  so the harness burned ~10 futile retries and never told the user when the limit
+  resets.
+
+  Root cause (regression from #1924): `src/claude.lib.mjs` set
+  `isRateLimitError = true` for **every** structured `api_error_status === 429`,
+  without checking whether the message was an account usage limit. Claude reports
+  **both** a transient throttle ("...not your usage limit...") and account
+  session/weekly limits with `api_error_status: 429`, so the unconditional check
+  swept genuine usage limits into the transient-retry path — ahead of the
+  `detectUsageLimit()` reset-time wait, which was therefore never reached.
+
+  Fix: `src/claude.lib.mjs` now only flags a structured 429 as a transient rate
+  limit when the message is **not** a usage limit
+  (`api_error_status === 429 && !isUsageLimitError(lastMessage)`), so session/weekly
+  limits fall through to the usage-limit handler that immediately posts a comment
+  and waits until the exact reset time (auto-resuming there with
+  `--auto-continue-limit`). `src/usage-limit.lib.mjs` additionally recognises the
+  "hit your session limit" / "hit your weekly limit" phrasing as a backstop (the
+  reset-time regex already matched "resets 4pm").
+
+  Added `tests/test-issue-1935-session-limit-429.mjs` (15 assertions) and a full
+  case study with timeline, blame history (PR #1924), root-cause analysis, and the
+  captured logs under `docs/case-studies/issue-1935`.
+
+## 2.0.0
+
+### Major Changes
+
+- fd84e85: Rename the cleanup executable to `hive-cleanup` and harden destructive confirmation parsing against hidden terminal control input.
+
 ## 1.78.13
 
 ### Patch Changes

package/README.hi.md

@@ -735,7 +735,7 @@ solve https://github.com/owner/repo/issues/123 --resume 657e6db1-6eb3-4a8d
 
 ### डिस्क क्लीनअप
 
-`cleanup` पुरानी hive-mind अस्थायी डायरेक्टरी/फ़ाइलों (जैसे प्रति-कार्य क्लोन
+`hive-cleanup` पुरानी hive-mind अस्थायी डायरेक्टरी/फ़ाइलों (जैसे प्रति-कार्य क्लोन
 `/tmp/gh-issue-solver-*`, MCP कॉन्फ़िग फ़ाइलें, लॉग डाउनलोड डायरेक्टरी आदि) को हटाकर
 डिस्क स्थान खाली करता है, जबकि **वर्तमान में चल रहे कार्यों से संबंधित फ़ोल्डर**,
 सुरक्षित सिस्टम पथ, और बिना कमिट या बिना पुश किए बदलावों वाले किसी भी क्लोन को बनाए
@@ -745,40 +745,40 @@ solve https://github.com/owner/repo/issues/123 --resume 657e6db1-6eb3-4a8d
 
 ```bash
 # पूर्वावलोकन: रखे जाने वाले और हटाए जाने वाले फ़ोल्डरों की सूची (कुछ भी नहीं हटाता)
-cleanup --dry-run
+hive-cleanup --dry-run
 
 # पुरानी अस्थायी फ़ाइलें वास्तव में हटाएँ (पहले पुष्टि माँगता है)
-cleanup
+hive-cleanup
 
 # पुष्टि प्रॉम्प्ट के बिना हटाएँ
-cleanup --force
+hive-cleanup --force
 
 # गैर-hive-mind अस्थायी प्रविष्टियों पर भी विचार करें (अधिक आक्रामक)
-cleanup --all --dry-run
+hive-cleanup --all --dry-run
 
 # /tmp/start-command को हटाने की अनुमति दें (डिफ़ॉल्ट रूप से रखा जाता है; इसमें आइसोलेशन लॉग होते हैं)
-cleanup --force-start-command
+hive-cleanup --force-start-command
 
 # Ubuntu / सिस्टम क्लीनअप (apt कैश, journald लॉग, npm कैश)
-cleanup --system --sudo
+hive-cleanup --system --sudo
 
 # लाइव/अटके हुए agent PID को hive/start-command कार्य सत्रों से मिलाएँ
-cleanup --processes
+hive-cleanup --processes
 
 # किसी खास non-agent PID को ट्रेस करें, जैसे browser child या shell
-cleanup --pid 94445
+hive-cleanup --pid 94445
 
 # रोके जा सकने वाले orphaned agents का पूर्वावलोकन करें
-cleanup --kill-orphaned-agents --dry-run
+hive-cleanup --kill-orphaned-agents --dry-run
 
 # पूर्वावलोकन जाँचने के बाद orphaned agent process trees रोकें
-cleanup --kill-orphaned-agents --force
+hive-cleanup --kill-orphaned-agents --force
 
 # सक्रिय-कार्य पहचान अक्षम करें (केवल सुरक्षित पथ रखे जाते हैं)
-cleanup --no-keep-active-tasks-folders --dry-run
+hive-cleanup --no-keep-active-tasks-folders --dry-run
 ```
 
-विकल्पों की पूरी सूची के लिए `cleanup --help` चलाएँ। यह कमांड dry-run के अनुकूल है और
+विकल्पों की पूरी सूची के लिए `hive-cleanup --help` चलाएँ। यह कमांड dry-run के अनुकूल है और
 हर रन के लिए टाइमस्टैम्प वाला `cleanup-*.log` लिखता है। प्रक्रिया डायग्नोस्टिक आउटपुट
 कमांड लाइन प्रिंट करने से पहले सामान्य token आकारों को छिपाता है।
 
@@ -836,14 +836,14 @@ find docs/ -name "*.md" -exec wc -l {} + | awk '$1 > 1000 {print "ERROR: " $2 "
 
 ```bash
 # agent PID, start-command session ID, GitHub task URL, workspace, match reasons और संभावित orphaned agents दिखाएँ।
-cleanup --processes
+hive-cleanup --processes
 
 # उसी report में कोई भी PID शामिल करें।
-cleanup --pid 62220
+hive-cleanup --pid 62220
 
 # केवल terminal task वाले orphaned agents रोकें।
-cleanup --kill-orphaned-agents --dry-run
-cleanup --kill-orphaned-agents --force
+hive-cleanup --kill-orphaned-agents --dry-run
+hive-cleanup --kill-orphaned-agents --force
 ```
 
 Manual fallback: उन स्क्रीन की पहचान करें जो संसाधन खपत करने वाली प्रक्रियाओं के पैरेंट हैं।

package/README.md

@@ -755,7 +755,7 @@ solve https://github.com/owner/repo/issues/123 --resume 657e6db1-6eb3-4a8d
 
 ### Disk Cleanup
 
-`cleanup` frees disk space by removing stale hive-mind temporary
+`hive-cleanup` frees disk space by removing stale hive-mind temporary
 directories/files (per-task clones like `/tmp/gh-issue-solver-*`, MCP config
 files, log download dirs, …) while **keeping folders that belong to
 currently-running tasks**, protected system paths, and any clone with
@@ -766,40 +766,40 @@ branch).
 
 ```bash
 # Preview: list kept folders and folders that would be deleted (deletes nothing)
-cleanup --dry-run
+hive-cleanup --dry-run
 
 # Actually delete stale temp artifacts (asks for confirmation first)
-cleanup
+hive-cleanup
 
 # Delete without the confirmation prompt
-cleanup --force
+hive-cleanup --force
 
 # Also consider non-hive-mind temp entries (more aggressive)
-cleanup --all --dry-run
+hive-cleanup --all --dry-run
 
 # Allow deleting /tmp/start-command (kept by default; holds isolation logs)
-cleanup --force-start-command
+hive-cleanup --force-start-command
 
 # Ubuntu / system cleanup (apt caches, journald logs, npm cache)
-cleanup --system --sudo
+hive-cleanup --system --sudo
 
 # Map live/stuck agent PIDs back to hive/start-command task sessions
-cleanup --processes
+hive-cleanup --processes
 
 # Trace a specific non-agent PID, for example a browser child or shell
-cleanup --pid 94445
+hive-cleanup --pid 94445
 
 # Preview orphaned terminal-session agents that can be stopped
-cleanup --kill-orphaned-agents --dry-run
+hive-cleanup --kill-orphaned-agents --dry-run
 
 # Stop orphaned agent process trees after reviewing the preview
-cleanup --kill-orphaned-agents --force
+hive-cleanup --kill-orphaned-agents --force
 
 # Disable active-task detection (only protected paths are kept)
-cleanup --no-keep-active-tasks-folders --dry-run
+hive-cleanup --no-keep-active-tasks-folders --dry-run
 ```
 
-Run `cleanup --help` for the full list of options. The command is dry-run
+Run `hive-cleanup --help` for the full list of options. The command is dry-run
 friendly and writes a timestamped `cleanup-*.log` for every run. Process
 diagnostic output redacts common token shapes before printing command lines.
 
@@ -859,14 +859,14 @@ that launched it:
 ```bash
 # Show agent PIDs, start-command session IDs, GitHub task URLs, workspaces,
 # match reasons, and possible orphaned terminal-session agents.
-cleanup --processes
+hive-cleanup --processes
 
 # Include an arbitrary PID in the same report.
-cleanup --pid 62220
+hive-cleanup --pid 62220
 
 # Kill only agents whose matched start-command task is already terminal.
-cleanup --kill-orphaned-agents --dry-run
-cleanup --kill-orphaned-agents --force
+hive-cleanup --kill-orphaned-agents --dry-run
+hive-cleanup --kill-orphaned-agents --force
 ```
 
 Manual fallback: identify screens that are parents of processes that are eating

package/README.ru.md

@@ -737,7 +737,7 @@ solve https://github.com/owner/repo/issues/123 --resume 657e6db1-6eb3-4a8d
 
 ### Очистка диска
 
-`cleanup` освобождает место на диске, удаляя устаревшие временные каталоги/файлы
+`hive-cleanup` освобождает место на диске, удаляя устаревшие временные каталоги/файлы
 hive-mind (клоны для каждой задачи вида `/tmp/gh-issue-solver-*`, файлы
 конфигурации MCP, каталоги загрузки логов и т. д.), при этом **сохраняя папки,
 относящиеся к выполняющимся в данный момент задачам**, защищённые системные пути и
@@ -748,40 +748,40 @@ hive-mind (клоны для каждой задачи вида `/tmp/gh-issue-s
 
 ```bash
 # Предпросмотр: список сохраняемых и удаляемых папок (ничего не удаляет)
-cleanup --dry-run
+hive-cleanup --dry-run
 
 # Реально удалить устаревшие временные файлы (сначала запросит подтверждение)
-cleanup
+hive-cleanup
 
 # Удалить без запроса подтверждения
-cleanup --force
+hive-cleanup --force
 
 # Учитывать также не-hive-mind временные записи (более агрессивно)
-cleanup --all --dry-run
+hive-cleanup --all --dry-run
 
 # Разрешить удаление /tmp/start-command (по умолчанию сохраняется; хранит логи изоляции)
-cleanup --force-start-command
+hive-cleanup --force-start-command
 
 # Очистка Ubuntu / системы (кэши apt, логи journald, кэш npm)
-cleanup --system --sudo
+hive-cleanup --system --sudo
 
 # Сопоставить живые/зависшие agent PID с задачами hive/start-command
-cleanup --processes
+hive-cleanup --processes
 
 # Отследить конкретный не-agent PID, например дочерний процесс браузера или shell
-cleanup --pid 94445
+hive-cleanup --pid 94445
 
 # Предпросмотр orphaned agents, которые можно остановить
-cleanup --kill-orphaned-agents --dry-run
+hive-cleanup --kill-orphaned-agents --dry-run
 
 # Остановить деревья orphaned agent процессов после просмотра предпросмотра
-cleanup --kill-orphaned-agents --force
+hive-cleanup --kill-orphaned-agents --force
 
 # Отключить обнаружение активных задач (сохраняются только защищённые пути)
-cleanup --no-keep-active-tasks-folders --dry-run
+hive-cleanup --no-keep-active-tasks-folders --dry-run
 ```
 
-Запустите `cleanup --help`, чтобы увидеть полный список опций. Команда удобна для
+Запустите `hive-cleanup --help`, чтобы увидеть полный список опций. Команда удобна для
 режима dry-run и записывает лог `cleanup-*.log` с меткой времени при каждом запуске.
 Диагностический вывод процессов скрывает распространённые формы token перед печатью
 командных строк.
@@ -841,14 +841,14 @@ find docs/ -name "*.md" -exec wc -l {} + | awk '$1 > 1000 {print "ERROR: " $2 "
 ```bash
 # Показать agent PID, start-command session ID, GitHub task URL, workspace,
 # причины совпадения и возможные orphaned agents.
-cleanup --processes
+hive-cleanup --processes
 
 # Включить произвольный PID в тот же отчёт.
-cleanup --pid 62220
+hive-cleanup --pid 62220
 
 # Остановить только orphaned agents, чья задача уже завершена.
-cleanup --kill-orphaned-agents --dry-run
-cleanup --kill-orphaned-agents --force
+hive-cleanup --kill-orphaned-agents --dry-run
+hive-cleanup --kill-orphaned-agents --force
 ```
 
 Ручной fallback: определите screen-сессии, являющиеся родительскими для процессов,

package/README.zh.md

@@ -730,7 +730,7 @@ solve https://github.com/owner/repo/issues/123 --resume 657e6db1-6eb3-4a8d
 
 ### 磁盘清理
 
-`cleanup` 通过删除过时的 hive-mind 临时目录/文件（如每个任务的克隆
+`hive-cleanup` 通过删除过时的 hive-mind 临时目录/文件（如每个任务的克隆
 `/tmp/gh-issue-solver-*`、MCP 配置文件、日志下载目录等）来释放磁盘空间，同时
 **保留属于当前正在运行任务的文件夹**、受保护的系统路径，以及任何包含未提交或未推送
 更改的克隆。它通过运行中的进程和实时隔离会话检测活动任务，并使用与 `solve` 相同的
@@ -739,40 +739,40 @@ solve https://github.com/owner/repo/issues/123 --resume 657e6db1-6eb3-4a8d
 
 ```bash
 # 预览：列出保留的文件夹和将被删除的文件夹（不删除任何内容）
-cleanup --dry-run
+hive-cleanup --dry-run
 
 # 实际删除过时的临时文件（会先要求确认）
-cleanup
+hive-cleanup
 
 # 删除时不显示确认提示
-cleanup --force
+hive-cleanup --force
 
 # 同时考虑非 hive-mind 临时项（更激进）
-cleanup --all --dry-run
+hive-cleanup --all --dry-run
 
 # 允许删除 /tmp/start-command（默认保留；其中存放隔离日志）
-cleanup --force-start-command
+hive-cleanup --force-start-command
 
 # Ubuntu / 系统清理（apt 缓存、journald 日志、npm 缓存）
-cleanup --system --sudo
+hive-cleanup --system --sudo
 
 # 将实时/卡住的 agent PID 映射回 hive/start-command 任务会话
-cleanup --processes
+hive-cleanup --processes
 
 # 跟踪指定的非 agent PID，例如浏览器子进程或 shell
-cleanup --pid 94445
+hive-cleanup --pid 94445
 
 # 预览可以停止的孤立 agent
-cleanup --kill-orphaned-agents --dry-run
+hive-cleanup --kill-orphaned-agents --dry-run
 
 # 审查预览后停止孤立 agent 进程树
-cleanup --kill-orphaned-agents --force
+hive-cleanup --kill-orphaned-agents --force
 
 # 禁用活动任务检测（仅保留受保护的路径）
-cleanup --no-keep-active-tasks-folders --dry-run
+hive-cleanup --no-keep-active-tasks-folders --dry-run
 ```
 
-运行 `cleanup --help` 查看完整的选项列表。该命令对 dry-run 友好，并为每次运行写入
+运行 `hive-cleanup --help` 查看完整的选项列表。该命令对 dry-run 友好，并为每次运行写入
 带时间戳的 `cleanup-*.log` 日志。进程诊断输出会在打印命令行前遮蔽常见 token
 格式。
 
@@ -830,14 +830,14 @@ hive 任务时，优先使用内置进程诊断命令：
 
 ```bash
 # 显示 agent PID、start-command 会话 ID、GitHub 任务 URL、工作区、匹配原因和可能的孤立 agent。
-cleanup --processes
+hive-cleanup --processes
 
 # 在同一报告中包含任意 PID。
-cleanup --pid 62220
+hive-cleanup --pid 62220
 
 # 只停止已完成任务中的孤立 agent。
-cleanup --kill-orphaned-agents --dry-run
-cleanup --kill-orphaned-agents --force
+hive-cleanup --kill-orphaned-agents --dry-run
+hive-cleanup --kill-orphaned-agents --force
 ```
 
 手动兜底：识别消耗资源的进程所属的 Screen 会话。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-assistant/hive-mind",
-  "version": "1.78.13",
+  "version": "2.0.1",
   "description": "AI-powered issue solver and hive mind for collaborative problem solving",
   "main": "src/hive.mjs",
   "type": "module",
@@ -8,7 +8,7 @@
     "hive": "./src/hive.mjs",
     "solve": "./src/solve.mjs",
     "task": "./src/task.mjs",
-    "cleanup": "./src/cleanup.mjs",
+    "hive-cleanup": "./src/cleanup.mjs",
     "review": "./src/review.mjs",
     "configure-claude": "./src/configure-claude.mjs",
     "start-screen": "./src/start-screen.mjs",

package/src/claude.lib.mjs

@@ -9,7 +9,7 @@ const path = (await use('path')).default;
 import { log, isENOSPC } from './lib.mjs';
 import { reportError } from './sentry.lib.mjs';
 import { timeouts, retryLimits, claudeCode, getClaudeEnv, getThinkingLevelToTokens, getTokensToThinkingLevel, supportsThinkingBudget, DEFAULT_MAX_THINKING_BUDGET, getMaxOutputTokensForModel } from './config.lib.mjs';
-import { detectUsageLimit, formatUsageLimitMessage } from './usage-limit.lib.mjs';
+import { detectUsageLimit, formatUsageLimitMessage, isUsageLimitError } from './usage-limit.lib.mjs';
 import { createInteractiveHandler } from './interactive-mode.lib.mjs';
 import { setupBidirectionalHandler, finalizeBidirectionalHandler, validateBidirectionalModeConfig, attachStreamingInput } from './bidirectional-interactive.lib.mjs';
 import { initProgressMonitoring } from './solve.progress-monitoring.lib.mjs';
@@ -978,11 +978,12 @@ export const executeClaudeCommand = async params => {
                     isRequestTimeout = true;
                     await log('⏱️ Detected request timeout from Claude CLI (will retry with --resume)', { verbose: true });
                   }
-                  // Issue #1924: Server-side temporary rate limiting (HTTP 429) — a transient
-                  // throttle, not an account usage limit ("...not your usage limit..."), so retry
-                  // with --resume. The message text is handled by classifyRetryableError; this also
-                  // catches the structured api_error_status if the wording ever changes.
-                  if (data.api_error_status === 429) {
+                  // Issue #1924: server-side temporary rate limiting (HTTP 429) is a transient
+                  // throttle ("...not your usage limit..."), so retry with --resume. Issue #1935
+                  // (regression from #1924): account usage limits ("session limit" / "weekly limit")
+                  // ALSO arrive with api_error_status === 429 plus an explicit reset time, so the
+                  // isUsageLimitError() guard routes those to the usage-limit handler below instead.
+                  if (data.api_error_status === 429 && !isUsageLimitError(lastMessage)) {
                     isRateLimitError = true;
                     await log(`⚠️ Detected server-side rate limiting (429) from Claude CLI (will retry with --resume). request_id=${data.request_id || 'unknown'}`, { verbose: true });
                   }

package/src/cleanup.lib.mjs

@@ -1,5 +1,5 @@
 /**
- * Core, offline-testable logic for the `cleanup` command (issue #1848).
+ * Core, offline-testable logic for the `hive-cleanup` command (issue #1848).
  *
  * This module deliberately avoids any top-level network access (no `use-m`
  * fetch) and any side effects so it can be unit-tested without a network
@@ -144,8 +144,8 @@ function sameRepo(a, b) {
  * fall back to the `issue-{number}-{hex}` prefix (the random hex is unknown from
  * the URL alone) combined with a repo match.
  *
- * @param {Array<{owner, repo, type, number, branch?: string|null}>} activeTasks
- * @returns {Array<{owner, repo, type, issueNumber: number|null, branch: string|null}>}
+ * @param {Array<{owner, repo, type, number, branch?: string|null, sessionId?: string|null, sessionName?: string|null, status?: string|null, workspace?: string|null}>} activeTasks
+ * @returns {Array<{owner, repo, type, number: number|null, issueNumber: number|null, branch: string|null, sessionId: string|null, sessionName: string|null, status: string|null, workspace: string|null}>}
  */
 export function buildActiveMatchers(activeTasks) {
   const matchers = [];
@@ -155,8 +155,13 @@ export function buildActiveMatchers(activeTasks) {
       owner: task.owner,
       repo: task.repo,
       type: task.type,
+      number: task.number ?? null,
       issueNumber: task.type === 'issue' ? task.number : (task.issueNumber ?? null),
       branch: task.branch || null,
+      sessionId: task.sessionId || null,
+      sessionName: task.sessionName || null,
+      status: task.status || null,
+      workspace: task.workspace || null,
     });
   }
   return matchers;
@@ -291,9 +296,12 @@ export function classifyEntry(entry, ctx) {
 export function classifyEntries(entries, ctx) {
   const keep = [];
   const remove = [];
+  const { matchers = [], gitInfoByPath = new Map() } = ctx || {};
   for (const entry of entries || []) {
     const { action, reason } = classifyEntry(entry, ctx);
-    const record = { name: entry.name, path: entry.path, size: entry.size ?? null, reason };
+    const gitInfo = gitInfoByPath.get(entry.path) || null;
+    const activeTask = reason === 'active-task' ? folderMatchesActiveTask(gitInfo, matchers) : null;
+    const record = { name: entry.name, path: entry.path, size: entry.size ?? null, reason, gitInfo, activeTask };
     if (action === 'remove') remove.push(record);
     else keep.push(record);
   }
@@ -357,3 +365,51 @@ export function describeReason(reason) {
   };
   return map[reason] || reason;
 }
+
+function firstRemote(gitInfo) {
+  return gitInfo?.remotes?.[0] || null;
+}
+
+function compactTaskType(type) {
+  return type === 'pull' ? 'PR' : 'issue';
+}
+
+/**
+ * Format an active task for logs.
+ *
+ * @param {{owner?: string, repo?: string, type?: string, number?: number|null, issueNumber?: number|null, branch?: string|null, sessionId?: string|null, sessionName?: string|null, status?: string|null, workspace?: string|null}} task
+ * @returns {string}
+ */
+export function formatTaskSummary(task) {
+  if (!task) return '';
+  const number = task.number ?? task.issueNumber ?? null;
+  const parts = [`${task.owner}/${task.repo} ${compactTaskType(task.type)} #${number ?? '?'}`];
+  if (task.branch) parts.push(`branch ${task.branch}`);
+  if (task.sessionId || task.sessionName) parts.push(`session ${task.sessionId || task.sessionName}`);
+  if (task.status) parts.push(`status ${task.status}`);
+  if (task.workspace) parts.push(`workspace ${task.workspace}`);
+  return parts.join(', ');
+}
+
+/**
+ * Format per-entry git/task context for one-line cleanup reports.
+ *
+ * @param {{gitInfo?: {branch?: string|null, remotes?: Array<{owner, repo}>|null, dirty?: boolean}|null, activeTask?: Object|null}} item
+ * @returns {string}
+ */
+export function formatEntryContext(item) {
+  const details = [];
+  if (item?.activeTask) details.push(`task ${formatTaskSummary(item.activeTask)}`);
+
+  const gitInfo = item?.gitInfo;
+  if (gitInfo) {
+    const remote = firstRemote(gitInfo);
+    const gitParts = [];
+    if (remote) gitParts.push(`repo ${remote.owner}/${remote.repo}`);
+    if (gitInfo.branch) gitParts.push(`branch ${gitInfo.branch}`);
+    if (gitInfo.dirty) gitParts.push('dirty/unpushed');
+    if (gitParts.length > 0) details.push(gitParts.join(', '));
+  }
+
+  return details.length > 0 ? ` (${details.join('; ')})` : '';
+}

package/src/cleanup.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * `cleanup` — free disk space by removing stale hive-mind temporary
+ * `hive-cleanup` — free disk space by removing stale hive-mind temporary
  * directories/files while preserving folders that belong to currently-running
  * (active) tasks, protected system paths and any work that is not yet pushed.
  *
@@ -33,9 +33,9 @@
 
 import path from 'node:path';
 import { promises as fsp } from 'node:fs';
-import { execSync } from 'node:child_process';
 
-import { classifyEntries, summarize, formatBytes, describeReason, buildActiveMatchers, DEFAULT_PROTECTED_NAMES } from './cleanup.lib.mjs';
+import { isConfirmationYes, readConfirmationLine } from './confirmation.lib.mjs';
+import { classifyEntries, summarize, formatBytes, describeReason, buildActiveMatchers, DEFAULT_PROTECTED_NAMES, formatEntryContext, formatTaskSummary } from './cleanup.lib.mjs';
 import { getTempRoot, listTempEntries, getPathSize, readFolderGitInfo, listProcessHeldPaths, getActiveTasks, removePath, runSystemCleanup, collectProcessDebugReport, signalOrphanedAgentTrees } from './cleanup.os.lib.mjs';
 import { formatProcessDebugReport } from './process-debug.lib.mjs';
 
@@ -86,7 +86,7 @@ if (hasFlag('--version')) {
 }
 
 if (hasFlag('--help', '-h')) {
-  console.log(`Usage: cleanup [options]
+  console.log(`Usage: hive-cleanup [options]
 
 Free disk space by removing stale hive-mind temporary directories/files while
 keeping folders that belong to active tasks and protected system paths.
@@ -244,8 +244,8 @@ async function main() {
     matchers = buildActiveMatchers(activeTasks);
     if (activeTasks.length > 0) {
       await log(`🏃 Active tasks detected: ${activeTasks.length}`);
-      for (const t of activeTasks) {
-        await log(`   • ${t.owner}/${t.repo} ${t.type} #${t.number}${t.branch ? ` (branch ${t.branch})` : ''}`);
+      for (const task of activeTasks) {
+        await log(`   • ${formatTaskSummary(task)}`);
       }
     } else {
       await log('🏃 No active tasks detected from running processes/sessions');
@@ -289,13 +289,13 @@ async function main() {
   await log('\n🟢 KEPT folders/files:');
   if (classified.keep.length === 0) await log('   (none)');
   for (const item of classified.keep.sort((a, b) => (b.size || 0) - (a.size || 0))) {
-    await log(`   ${formatBytes(item.size).padStart(7)}  ${item.path}  — ${describeReason(item.reason)}`);
+    await log(`   ${formatBytes(item.size).padStart(7)}  ${item.path}  — ${describeReason(item.reason)}${formatEntryContext(item)}`);
   }
 
   await log(`\n🗑️  ${options.dryRun ? 'WOULD DELETE' : 'TO DELETE'} folders/files:`);
   if (classified.remove.length === 0) await log('   (none)');
   for (const item of classified.remove.sort((a, b) => (b.size || 0) - (a.size || 0))) {
-    await log(`   ${formatBytes(item.size).padStart(7)}  ${item.path}  — ${describeReason(item.reason)}`);
+    await log(`   ${formatBytes(item.size).padStart(7)}  ${item.path}  — ${describeReason(item.reason)}${formatEntryContext(item)}`);
   }
 
   await log(`\n📊 Summary: keep ${totals.keepCount} (${formatBytes(totals.keepBytes)}), remove ${totals.removeCount} (${formatBytes(totals.removeBytes)})`);
@@ -309,15 +309,14 @@ async function main() {
     if (!options.force) {
       console.log(`\n⚠️  This will permanently delete ${classified.remove.length} entries (${formatBytes(totals.removeBytes)}).`);
       console.log('Type "yes" to confirm, or Ctrl+C to cancel:');
-      process.stdout.write('> ');
       let answer = '';
       try {
-        answer = execSync('read answer && echo $answer', { encoding: 'utf8', stdio: ['inherit', 'pipe', 'pipe'], shell: '/bin/bash' }).trim();
+        answer = await readConfirmationLine({ prompt: '> ' });
       } catch {
         await log('\n❌ Cancelled');
         return;
       }
-      if (answer.toLowerCase() !== 'yes') {
+      if (!isConfirmationYes(answer)) {
         await log('\n❌ Cancelled');
         return;
       }

package/src/cleanup.os.lib.mjs

@@ -1,5 +1,5 @@
 /**
- * OS-interaction layer for the `cleanup` command (issue #1848).
+ * OS-interaction layer for the `hive-cleanup` command (issue #1848).
  *
  * Everything that touches the real filesystem, the process table (/proc),
  * isolation session state (`$ --status` from start-command), git metadata of a
@@ -625,7 +625,13 @@ export async function listActiveTaskRefsFromSessions(sessionIds) {
       const key = `${ref.owner}/${ref.repo}#${ref.number}:${ref.type}`;
       if (!seen.has(key)) {
         seen.add(key);
-        refs.push(ref);
+        refs.push({
+          ...ref,
+          sessionId: status.uuid || id,
+          sessionName: status.sessionName || id,
+          status: status.status || null,
+          workspace: status.workingDirectory || null,
+        });
       }
     }
   }

package/src/confirmation.lib.mjs

@@ -0,0 +1,90 @@
+/**
+ * Shared helpers for destructive CLI confirmations.
+ *
+ * @see https://github.com/link-assistant/hive-mind/issues/1930
+ */
+
+import { createInterface } from 'node:readline/promises';
+import { stdin, stdout } from 'node:process';
+
+const ESC = String.fromCharCode(0x1b);
+const BEL = String.fromCharCode(0x07);
+const C1_CSI = String.fromCharCode(0x9b);
+
+const ANSI_ESCAPE_PATTERN = new RegExp(`${ESC}(?:\\[[0-?]*[ -/]*[@-~]|\\][^${BEL}]*(?:${BEL}|${ESC}\\\\)|[@-Z\\\\-_])`, 'g');
+const C1_CSI_PATTERN = new RegExp(`${C1_CSI}[0-?]*[ -/]*[@-~]`, 'g');
+
+function removeLastWord(chars) {
+  while (chars.length > 0 && /\s/.test(chars.at(-1))) chars.pop();
+  while (chars.length > 0 && !/\s/.test(chars.at(-1))) chars.pop();
+}
+
+/**
+ * Normalize an answer as it appeared after terminal line editing.
+ *
+ * Some terminal/window-manager shortcuts can inject escape sequences into the
+ * input stream even though the user still sees a clean `yes`. We strip those
+ * non-text sequences and replay common erase controls before comparing.
+ *
+ * @param {unknown} value
+ * @returns {string}
+ */
+export function normalizeConfirmationInput(value) {
+  const raw = String(value ?? '')
+    .normalize('NFKC')
+    .replace(ANSI_ESCAPE_PATTERN, '')
+    .replace(C1_CSI_PATTERN, '');
+  const chars = [];
+
+  for (const char of raw) {
+    const code = char.codePointAt(0);
+
+    if (char === '\b' || char === '\u007f') {
+      chars.pop();
+      continue;
+    }
+
+    if (char === '\u0015') {
+      chars.length = 0;
+      continue;
+    }
+
+    if (char === '\u0017') {
+      removeLastWord(chars);
+      continue;
+    }
+
+    if (char === '\r' || char === '\n' || code === 0xfeff) continue;
+    if (code < 32 || (code >= 0x80 && code <= 0x9f)) continue;
+
+    chars.push(char);
+  }
+
+  return chars.join('').trim();
+}
+
+export function isConfirmationYes(value) {
+  return normalizeConfirmationInput(value).toLowerCase() === 'yes';
+}
+
+/**
+ * Read one interactive confirmation line.
+ *
+ * @param {{prompt?: string, input?: import('node:stream').Readable, output?: import('node:stream').Writable}} [options]
+ * @returns {Promise<string>}
+ */
+export async function readConfirmationLine(options = {}) {
+  const input = options.input || stdin;
+  const output = options.output || stdout;
+  const rl = createInterface({
+    input,
+    output,
+    terminal: Boolean(input.isTTY && output.isTTY),
+  });
+
+  try {
+    return await rl.question(options.prompt ?? '> ');
+  } finally {
+    rl.close();
+  }
+}

package/src/hive.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 // Import Sentry instrumentation first (must be before other imports)
 import './instrument.mjs';
-import { ensureUseM } from './use-m-bootstrap.lib.mjs';
+import { ensureUseM, fetchUseMCodeFromCdn } from './use-m-bootstrap.lib.mjs';
 import { wrapDollarWithGhRetry as _wrapDollarWithGhRetry, execGhWithRetry } from './github-rate-limit.lib.mjs'; // rate-limit marker (#1726): gh API calls flow through $ wrapped by caller. execGhWithRetry adds transient-network retry (#1756).
 const earlyArgs = process.argv.slice(2);
 if (earlyArgs.includes('--version')) {
@@ -46,12 +46,7 @@ if (isRunningDirectly) {
     if (typeof globalThis.use === 'undefined') {
       try {
         await ensureUseM({
-          fetchUseMCode: () =>
-            withTimeout(
-              fetch('https://unpkg.com/use-m/use.js').then(r => r.text()),
-              10000,
-              'fetching use-m library'
-            ),
+          fetchUseMCode: () => withTimeout(fetchUseMCodeFromCdn(), 10000, 'fetching use-m library'),
           log: message => console.log(message),
         });
       } catch (error) {

package/src/usage-limit.lib.mjs

@@ -48,6 +48,14 @@ export function isUsageLimitError(message) {
     // Provider-specific phrasings we've seen in the wild
     'session limit reached', // Claude
     'weekly limit reached', // Claude
+    // Issue #1935: Claude surfaces 5-hour / weekly account limits as
+    //   "You've hit your session limit · resets 4pm (UTC)"
+    //   "You've hit your weekly limit · resets Jan 15, 8am (UTC)"
+    // These arrive with api_error_status === 429 but are real usage limits with an
+    // explicit reset time, so detect the "hit your <window> limit" phrasing directly
+    // (independent of whether a parseable reset time is present in the message).
+    'hit your session limit', // Claude 5-hour limit
+    'hit your weekly limit', // Claude weekly limit
     'daily limit reached',
     'monthly limit reached',
     'billing hard limit',

package/src/use-m-bootstrap.lib.mjs

@@ -1,19 +1,35 @@
 #!/usr/bin/env node
 
 export const USE_M_BOOTSTRAP_URL = 'https://unpkg.com/use-m/use.js';
-export const USE_M_FALLBACK_BOOTSTRAP_URL = 'https://unpkg.com/use-m@8.13.8/use.js';
+export const USE_M_BOOTSTRAP_FALLBACK_URL = 'https://unpkg.com/use-m@8.13.8/use.js';
 
-const fetchUseMCodeFromUrl = async url => {
-  const response = await fetch(url);
+const isMissingUseMBundle = code => /^Not found: \/use-m@[^/]+\/use\.js\s*$/.test(code.trim());
+
+const readBootstrapResponse = async (response, url) => {
   const code = await response.text();
-  if (!response.ok || /^Not found:/i.test(code.trim())) {
-    throw new Error(`failed to load use-m bootstrap from ${url}: ${response.status} ${response.statusText}`);
+  if (response.ok !== false && !isMissingUseMBundle(code)) return code;
+  throw new Error(`use-m bootstrap was not available at ${url}: ${code.slice(0, 120)}`);
+};
+
+const fetchUseMCodeFromUrl = async (url, fetcher = fetch) => readBootstrapResponse(await fetcher(url), url);
+
+export const fetchUseMCodeFromCdn = async ({ fetcher = fetch } = {}) => {
+  let primaryError;
+  try {
+    return await fetchUseMCodeFromUrl(USE_M_BOOTSTRAP_URL, fetcher);
+  } catch (error) {
+    primaryError = error;
+  }
+
+  try {
+    return await fetchUseMCodeFromUrl(USE_M_BOOTSTRAP_FALLBACK_URL, fetcher);
+  } catch (fallbackError) {
+    throw new Error(`Failed to load use-m bootstrap from primary and fallback URLs: ${primaryError.message}; ${fallbackError.message}`);
   }
-  return code;
 };
 
-const defaultFetchUseMCode = async () => fetchUseMCodeFromUrl(USE_M_BOOTSTRAP_URL);
-const fallbackFetchUseMCode = async () => fetchUseMCodeFromUrl(USE_M_FALLBACK_BOOTSTRAP_URL);
+const defaultFetchUseMCode = () => fetchUseMCodeFromUrl(USE_M_BOOTSTRAP_URL);
+const fallbackFetchUseMCode = () => fetchUseMCodeFromUrl(USE_M_BOOTSTRAP_FALLBACK_URL);
 
 /**
  * Load the shared use-m bootstrap.
@@ -28,7 +44,7 @@ export const ensureUseM = async (options = {}) => {
     try {
       globalThis.use = (await eval(await fetchUseMCode())).use;
     } catch (error) {
-      if (typeof log === 'function') log(`   use-m latest bootstrap failed (${error.message}); trying ${USE_M_FALLBACK_BOOTSTRAP_URL}`);
+      if (typeof log === 'function') log(`   use-m latest bootstrap failed (${error.message}); trying ${USE_M_BOOTSTRAP_FALLBACK_URL}`);
       globalThis.use = (await eval(await fallbackFetchUseMCode())).use;
     }
   }