@link-assistant/hive-mind 2.1.3 → 2.1.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @link-assistant/hive-mind
 
+## 2.1.5
+
+### Patch Changes
+
+- 26b07f2: Extend Telegram `/merge` to accept repository, issue, and pull request targets, including reply-based GitHub link extraction, and wait for unfinished PRs to become mergeable before merging.
+
+## 2.1.4
+
+### Patch Changes
+
+- acc3ea1: Simplify the `/limits` output with subscription headings and hide unused Codex limits and credits.
+
 ## 2.1.3
 
 ### Patch Changes

package/README.hi.md

@@ -511,6 +511,26 @@ Examples:
 /hive https://github.com/microsoft --all-issues --concurrency 3
 ```
 
+#### `/merge` - तैयार Pull Requests merge करें
+
+```
+/merge <repository-url|issue-url|pull-request-url> [--auto-resolve]
+
+Examples:
+/merge https://github.com/owner/repo
+/merge https://github.com/owner/repo/issues/123
+/merge https://github.com/owner/repo/pull/456
+```
+
+Repository targets `ready` label वाले PRs को क्रम से process करते हैं। Issue और
+pull request targets केवल linked या selected PR process करते हैं। आप किसी ऐसे
+message पर `/merge` से reply भी कर सकते हैं जिसमें एक GitHub repository, issue,
+या pull request link हो, जैसे कोई पुराना `/codex ...issues/123` command.
+
+अगर target PR अभी finished नहीं है, तो `/merge` merge करने से पहले उसके
+mergeable होने तक wait करता है। Merge-conflict skips अभी भी `--auto-resolve` के
+साथ काम करते हैं।
+
 #### `/limits` - उपयोग सीमाएँ दिखाएँ
 
 ```
@@ -521,7 +541,9 @@ Shows:
 - RAM usage (used vs total)
 - Disk space usage
 - GitHub API rate limits
-- Claude usage limits (session and weekly)
+- Claude and ChatGPT subscription usage windows
+- Non-zero Codex weekly limits and credits
+- Solve queue status
 ```
 
 #### `/terminal_watch` - Live Session Log

package/README.md

@@ -532,6 +532,25 @@ Examples:
 /hive https://github.com/microsoft --all-issues --concurrency 3
 ```
 
+#### `/merge` - Merge Ready Pull Requests
+
+```
+/merge <repository-url|issue-url|pull-request-url> [--auto-resolve]
+
+Examples:
+/merge https://github.com/owner/repo
+/merge https://github.com/owner/repo/issues/123
+/merge https://github.com/owner/repo/pull/456
+```
+
+Repository targets process PRs with the `ready` label sequentially. Issue and
+pull request targets process only the linked or selected PR. You can also reply
+with `/merge` to a message containing one GitHub repository, issue, or pull
+request link, such as a previous `/codex ...issues/123` command.
+
+If a target PR is not finished yet, `/merge` waits for it to become mergeable
+before merging. Merge-conflict skips still work with `--auto-resolve`.
+
 #### `/limits` - Show Usage Limits
 
 ```
@@ -542,7 +561,9 @@ Shows:
 - RAM usage (used vs total)
 - Disk space usage
 - GitHub API rate limits
-- Claude usage limits (session and weekly)
+- Claude and ChatGPT subscription usage windows
+- Non-zero Codex weekly limits and credits
+- Solve queue status
 ```
 
 #### `/terminal_watch` - Live Session Log

package/README.ru.md

@@ -512,6 +512,26 @@ Examples:
 /hive https://github.com/microsoft --all-issues --concurrency 3
 ```
 
+#### `/merge` — Слияние готовых Pull Request
+
+```
+/merge <repository-url|issue-url|pull-request-url> [--auto-resolve]
+
+Examples:
+/merge https://github.com/owner/repo
+/merge https://github.com/owner/repo/issues/123
+/merge https://github.com/owner/repo/pull/456
+```
+
+Цель-репозиторий обрабатывает PR с меткой `ready` последовательно. Цели issue и
+pull request обрабатывают только связанный или выбранный PR. Также можно ответить
+командой `/merge` на сообщение с одной ссылкой на GitHub repository, issue или
+pull request, например на предыдущую команду `/codex ...issues/123`.
+
+Если целевой PR ещё не завершён, `/merge` ждёт, пока он станет mergeable, и затем
+выполняет слияние. Пропуск конфликтов слияния по-прежнему работает с
+`--auto-resolve`.
+
 #### `/limits` — Показать лимиты использования
 
 ```
@@ -522,7 +542,9 @@ Shows:
 - RAM usage (used vs total)
 - Disk space usage
 - GitHub API rate limits
-- Claude usage limits (session and weekly)
+- Claude and ChatGPT subscription usage windows
+- Non-zero Codex weekly limits and credits
+- Solve queue status
 ```
 
 #### `/terminal_watch` — Live Session Log

package/README.zh.md

@@ -508,6 +508,25 @@ Examples:
 /hive https://github.com/microsoft --all-issues --concurrency 3
 ```
 
+#### `/merge` - 合并就绪的 Pull Request
+
+```
+/merge <repository-url|issue-url|pull-request-url> [--auto-resolve]
+
+Examples:
+/merge https://github.com/owner/repo
+/merge https://github.com/owner/repo/issues/123
+/merge https://github.com/owner/repo/pull/456
+```
+
+仓库目标会按顺序处理带有 `ready` 标签的 PR。Issue 和 Pull Request
+目标只处理关联或指定的 PR。你也可以回复一条包含单个 GitHub
+仓库、Issue 或 Pull Request 链接的消息并发送 `/merge`，例如之前的
+`/codex ...issues/123` 命令。
+
+如果目标 PR 尚未完成，`/merge` 会等待它变为可合并后再合并。合并冲突跳过仍可配合
+`--auto-resolve` 使用。
+
 #### `/limits` - 显示用量限制
 
 ```
@@ -518,7 +537,9 @@ Shows:
 - RAM usage (used vs total)
 - Disk space usage
 - GitHub API rate limits
-- Claude usage limits (session and weekly)
+- Claude and ChatGPT subscription usage windows
+- Non-zero Codex weekly limits and credits
+- Solve queue status
 ```
 
 #### `/terminal_watch` - Live Session Log

package/package.json

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

package/src/github-merge-targets.lib.mjs

@@ -0,0 +1,205 @@
+#!/usr/bin/env node
+/**
+ * GitHub merge target helpers for `/merge`.
+ *
+ * Repository-wide merge queues still use github-merge.lib.mjs. This module
+ * handles the narrower targets introduced in issue #2013: a single PR URL, an
+ * issue URL with linked PRs, or a GitHub URL found in a replied message.
+ *
+ * @see https://github.com/link-assistant/hive-mind/issues/2013
+ */
+
+import { promisify } from 'node:util';
+import { exec as execCallback } from 'node:child_process';
+
+import { githubLimits } from './config.lib.mjs';
+import { parseGitHubUrl } from './github.lib.mjs';
+import { ghWithRateLimitRetry } from './github-rate-limit.lib.mjs';
+import { getLinkedPRsFromTimeline } from './github-merge-ready-sync.lib.mjs';
+
+const execRaw = promisify(execCallback);
+const exec = (cmd, opts = {}) =>
+  ghWithRateLimitRetry(() => execRaw(cmd, { maxBuffer: githubLimits.bufferMaxSize, ...opts }), {
+    label: `gh exec (${cmd.split(/\s+/).slice(0, 3).join(' ')})`,
+  });
+
+const SUPPORTED_REPOSITORY_TYPES = new Set(['repo', 'issues_list', 'pulls_list']);
+const SUPPORTED_TARGET_TYPES = new Set([...SUPPORTED_REPOSITORY_TYPES, 'issue', 'pull']);
+
+function buildIssueUrl(owner, repo, issueNumber) {
+  return `https://github.com/${owner}/${repo}/issues/${issueNumber}`;
+}
+
+function buildPullUrl(owner, repo, prNumber) {
+  return `https://github.com/${owner}/${repo}/pull/${prNumber}`;
+}
+
+/**
+ * Parse a `/merge` target URL.
+ *
+ * @param {string} url
+ * @returns {{valid: boolean, mode?: 'repository'|'issue'|'pull', owner: string|null, repo: string|null, issueNumber?: number, prNumber?: number, url?: string, error: string|null}}
+ */
+export function parseMergeTargetUrl(url) {
+  const parsed = parseGitHubUrl(url);
+
+  if (!parsed.valid) {
+    return { valid: false, owner: null, repo: null, error: parsed.error };
+  }
+
+  if (SUPPORTED_REPOSITORY_TYPES.has(parsed.type)) {
+    return {
+      valid: true,
+      mode: 'repository',
+      owner: parsed.owner,
+      repo: parsed.repo,
+      url: `https://github.com/${parsed.owner}/${parsed.repo}`,
+      error: null,
+    };
+  }
+
+  if (parsed.type === 'issue') {
+    return {
+      valid: true,
+      mode: 'issue',
+      owner: parsed.owner,
+      repo: parsed.repo,
+      issueNumber: parsed.number,
+      url: buildIssueUrl(parsed.owner, parsed.repo, parsed.number),
+      error: null,
+    };
+  }
+
+  if (parsed.type === 'pull') {
+    return {
+      valid: true,
+      mode: 'pull',
+      owner: parsed.owner,
+      repo: parsed.repo,
+      prNumber: parsed.number,
+      url: buildPullUrl(parsed.owner, parsed.repo, parsed.number),
+      error: null,
+    };
+  }
+
+  if (parsed.type === 'user' || parsed.type === 'organization') {
+    return {
+      valid: false,
+      owner: parsed.owner,
+      repo: null,
+      error: 'URL points to a user/organization. Please provide a repository, issue, or pull request URL.',
+    };
+  }
+
+  return {
+    valid: false,
+    owner: parsed.owner || null,
+    repo: parsed.repo || null,
+    error: `URL type '${parsed.type}' is not supported for /merge. Please provide a repository, issue, or pull request URL.`,
+  };
+}
+
+function trimCandidateUrl(candidate) {
+  return String(candidate || '')
+    .trim()
+    .replace(/^[<([{'"]+/, '')
+    .replace(/[>)\]}'".,;:!?]+$/, '');
+}
+
+/**
+ * Extract a single `/merge` target URL from arbitrary text, such as a replied
+ * `/codex https://github.com/owner/repo/issues/123 --think max` message.
+ *
+ * @param {string} text
+ * @returns {{valid: boolean, url: string|null, target: Object|null, error: string|null}}
+ */
+export function extractMergeTargetUrlFromText(text) {
+  if (!text || typeof text !== 'string') {
+    return { valid: false, url: null, target: null, error: 'No text to inspect for GitHub links' };
+  }
+
+  const pattern = /(?:https?:\/\/)?github\.com\/[^\s<>)\]]+|[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+\/(?:issues|pull)\/\d+/g;
+  const matches = text.match(pattern) || [];
+  const targetsByUrl = new Map();
+
+  for (const match of matches) {
+    const candidate = trimCandidateUrl(match);
+    const target = parseMergeTargetUrl(candidate);
+    if (target.valid && SUPPORTED_TARGET_TYPES.has(target.mode === 'repository' ? 'repo' : target.mode)) {
+      targetsByUrl.set(target.url, target);
+    }
+  }
+
+  const targets = [...targetsByUrl.values()];
+  if (targets.length === 0) {
+    return { valid: false, url: null, target: null, error: 'No GitHub repository, issue, or pull request link found' };
+  }
+  if (targets.length > 1) {
+    return { valid: false, url: null, target: null, error: `Expected one GitHub merge target, found ${targets.length}` };
+  }
+
+  const [target] = targets;
+  return { valid: true, url: target.url, target, error: null };
+}
+
+/**
+ * Fetch a PR in the shape expected by MergeQueueItem.
+ *
+ * @param {string} owner
+ * @param {string} repo
+ * @param {number} prNumber
+ * @param {Object|null} issue
+ * @param {boolean} verbose
+ * @returns {Promise<{pr: Object, issue: Object|null, sortDate: Date}>}
+ */
+export async function fetchMergeTargetPullRequest(owner, repo, prNumber, issue = null, verbose = false) {
+  const { stdout } = await exec(`gh pr view ${prNumber} --repo ${owner}/${repo} --json number,title,url,createdAt,headRefName,author,mergeable,mergeStateStatus,isDraft,state`);
+  const pr = JSON.parse(stdout.trim());
+  if (verbose) {
+    console.log(`[VERBOSE] /merge: Loaded target PR #${pr.number} from ${owner}/${repo}`);
+  }
+  return {
+    pr,
+    issue,
+    sortDate: new Date(pr.createdAt),
+  };
+}
+
+/**
+ * Resolve a non-repository merge target into queue item data.
+ *
+ * @param {{mode: string, owner: string, repo: string, issueNumber?: number, prNumber?: number, url?: string}} target
+ * @param {boolean} verbose
+ * @returns {Promise<Array<{pr: Object, issue: Object|null, sortDate: Date}>|null>}
+ */
+export async function resolveMergeTargetItems(target, verbose = false) {
+  if (!target || target.mode === 'repository') {
+    return null;
+  }
+
+  if (target.mode === 'pull') {
+    return [await fetchMergeTargetPullRequest(target.owner, target.repo, target.prNumber, null, verbose)];
+  }
+
+  if (target.mode === 'issue') {
+    const issue = {
+      number: target.issueNumber,
+      url: target.url || buildIssueUrl(target.owner, target.repo, target.issueNumber),
+    };
+    const linkedPRs = await getLinkedPRsFromTimeline(target.owner, target.repo, target.issueNumber, verbose);
+    const items = [];
+    for (const linkedPR of linkedPRs) {
+      items.push(await fetchMergeTargetPullRequest(target.owner, target.repo, linkedPR.number, issue, verbose));
+    }
+    return items.sort((a, b) => a.sortDate - b.sortDate);
+  }
+
+  throw new Error(`Unsupported merge target mode: ${target.mode}`);
+}
+
+export default {
+  parseMergeTargetUrl,
+  extractMergeTargetUrlFromText,
+  fetchMergeTargetPullRequest,
+  resolveMergeTargetItems,
+};

package/src/limits-i18n.lib.mjs

@@ -9,12 +9,15 @@ const ENGLISH_LIMITS = {
   balance: 'balance',
   claude_5_hour_session: 'Claude 5 hour session',
   claude_limits: 'Claude limits',
+  claude_subscription_title: 'Claude{{plan}} subscription',
+  chatgpt_subscription_title: 'ChatGPT{{plan}} subscription',
   codex_5_hour_session: 'Codex 5 hour session',
   codex_credits: 'Codex credits',
   codex_limits: 'Codex limits',
   cpu: 'CPU',
   cpu_cores_used: 'CPU cores used',
   current_time: 'Current time',
+  current_week: 'Current week',
   current_week_all_models: 'Current week (all models)',
   current_week_sonnet_only: 'Current week (Sonnet only)',
   disabled_by_admin: '`--show-limits` is disabled by the bot administrator.',
@@ -25,6 +28,7 @@ const ENGLISH_LIMITS = {
   duration_second_short: 's',
   end: 'End',
   five_hour_session: '5h session',
+  five_hour_limit_session: '5 hour session',
   five_min_load_avg: '5m load avg',
   github_api: 'GitHub API',
   limits_at_end: 'Limits at end',
@@ -76,6 +80,10 @@ const ENGLISH_LIMITS = {
   start: 'Start',
   subscription_ends: 'Subscription ends {{time}}',
   subscription_ends_in: 'Subscription ends in {{duration}} ({{time}})',
+  subscription_detail_ends: 'ends {{time}}',
+  subscription_detail_ends_in: 'ends in {{duration}}; {{time}}',
+  subscription_detail_trial_ends: 'trial ends {{time}}',
+  subscription_detail_trial_ends_in: 'trial ends in {{duration}}; {{time}}',
   subscription_status: 'Subscription: {{status}}',
   trial_ends: 'Trial ends {{time}}',
   trial_ends_in: 'Trial ends in {{duration}} ({{time}})',

package/src/limits-subscription.lib.mjs

@@ -10,7 +10,7 @@
  */
 
 import { CACHE_TTL, DEFAULT_CODEX_AUTH_PATH, DEFAULT_CREDENTIALS_PATH, decodeJwtPayload, getLimitCache, readCodexAuth, readCredentials } from './limits.lib.mjs';
-import { formatLocalizedRelativeTime, formatLocalizedResetTime, formatSubscriptionEnds, formatSubscriptionStatus, formatTrialEnds, resolveLimitLocale } from './limits-i18n.lib.mjs';
+import { formatLocalizedRelativeTime, formatLocalizedResetTime, formatSubscriptionEnds, formatSubscriptionStatus, formatTrialEnds, lt, resolveLimitLocale } from './limits-i18n.lib.mjs';
 
 const PROFILE_API_ENDPOINT = 'https://api.anthropic.com/api/oauth/profile';
 
@@ -32,6 +32,45 @@ export function formatSubscriptionLines(subscription, options = {}) {
   return line ? `${line}\n` : '';
 }
 
+function humanizePlanType(planType, provider) {
+  if (!planType) return '';
+  const providerPrefix = provider === 'claude' ? /^claude[\s_-]*/i : /^(chatgpt|codex|openai)[\s_-]*/i;
+  const normalized = String(planType).trim().replace(providerPrefix, '').replace(/[_-]+/g, ' ').replace(/\s+/g, ' ').trim();
+  if (!normalized) return '';
+  return normalized
+    .split(' ')
+    .map(part => part.charAt(0).toUpperCase() + part.slice(1).toLowerCase())
+    .join(' ');
+}
+
+function formatSubscriptionDetail(subscription, options = {}) {
+  if (!subscription) return '';
+  const locale = resolveLimitLocale(options);
+  const buildDetail = (iso, inKey, atKey) => {
+    const resetTime = formatLocalizedResetTime(iso, true, { locale });
+    if (!resetTime) return '';
+    const duration = formatLocalizedRelativeTime(iso, { locale });
+    return duration ? lt(inKey, { duration, time: resetTime }, { locale }) : lt(atKey, { time: resetTime }, { locale });
+  };
+
+  if (subscription.endsAt) return buildDetail(subscription.endsAt, 'subscription_detail_ends_in', 'subscription_detail_ends');
+  if (subscription.trialEndsAt) return buildDetail(subscription.trialEndsAt, 'subscription_detail_trial_ends_in', 'subscription_detail_trial_ends');
+  return subscription.status ? String(subscription.status).trim() : '';
+}
+
+export function formatSubscriptionHeading(provider, subscription, options = {}) {
+  const locale = resolveLimitLocale(options);
+  const normalizedProvider = provider === 'claude' ? 'claude' : 'chatgpt';
+  const planType = subscription?.planType || options?.planType || null;
+  if (!subscription && !planType) return '';
+
+  const plan = humanizePlanType(planType, normalizedProvider);
+  const titleKey = normalizedProvider === 'claude' ? 'claude_subscription_title' : 'chatgpt_subscription_title';
+  const title = lt(titleKey, { plan: plan ? ` ${plan}` : '' }, { locale });
+  const detail = formatSubscriptionDetail(subscription, { locale });
+  return detail ? `${title} (${detail})` : title;
+}
+
 /**
  * Get Claude subscription metadata.
  *