@link-assistant/hive-mind 2.1.3 → 2.1.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @link-assistant/hive-mind
 
+## 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

@@ -521,7 +521,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

@@ -542,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.ru.md

@@ -522,7 +522,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

@@ -518,7 +518,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.4",
   "description": "AI-powered issue solver and hive mind for collaborative problem solving",
   "main": "src/hive.mjs",
   "type": "module",

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.
  *

package/src/limits.lib.mjs

@@ -14,7 +14,7 @@ import utc from 'dayjs/plugin/utc.js';
 
 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).
 import { formatLimitResetsAt, formatLimitResetsIn, formatLocalizedCurrentTime, formatLocalizedRelativeTime, formatLocalizedResetTime, localizeCompactDuration, lt, resolveLimitLocale } from './limits-i18n.lib.mjs';
-import { formatSubscriptionLines, getCachedClaudeSubscription, getCachedCodexSubscription, getClaudeSubscriptionInfo, getCodexSubscriptionInfo } from './limits-subscription.lib.mjs';
+import { formatSubscriptionHeading, formatSubscriptionLines, getCachedClaudeSubscription, getCachedCodexSubscription, getClaudeSubscriptionInfo, getCodexSubscriptionInfo } from './limits-subscription.lib.mjs';
 export { getCachedClaudeSubscription, getCachedCodexSubscription, getClaudeSubscriptionInfo, getCodexSubscriptionInfo };
 // Initialize dayjs plugins
 dayjs.extend(utc);
@@ -280,6 +280,61 @@ function getLocalizedRelativeReset(window, options = {}, fallbackRelative = null
   return formatRelativeTime(window?.resetsAt, options) || localizeCompactDuration(fallbackRelative, options);
 }
 
+function formatCodeBlock(content) {
+  const text = Array.isArray(content) ? content.join('\n') : String(content ?? '');
+  return '```\n' + (text.endsWith('\n') ? text : `${text}\n`) + '```';
+}
+
+function formatPlainTitledCodeSection(section) {
+  const text = String(section ?? '').trimEnd();
+  if (!text) return '';
+  if (text.includes('```')) return text;
+
+  const lines = text.split('\n');
+  const title = lines.shift();
+  const body = lines.join('\n');
+  if (!body) return formatCodeBlock(title);
+  return `${title}\n\n${formatCodeBlock(body)}`;
+}
+
+function formatLimitWindowSection(label, window, periodHours, threshold, options = {}) {
+  const locale = resolveLimitLocale(options);
+  let section = `${label}\n`;
+  if (hasLimitPercentage(window)) {
+    const timePassed = calculateTimePassedPercentage(window.resetsAt, periodHours);
+    if (timePassed !== null) {
+      section += `${getProgressBar(timePassed)} ${timePassed}% ${lt('passed', {}, { locale })}\n`;
+    }
+
+    const pct = Math.floor(window.percentage);
+    const bar = getProgressBar(pct, threshold);
+    const suffix = pct >= threshold ? ' ⚠️' : ` ${lt('used', {}, { locale })}`;
+    section += `${bar} ${pct}%${suffix}\n`;
+
+    const resetTime = getLocalizedResetTime(window, { locale });
+    if (resetTime) {
+      const relativeTime = getLocalizedRelativeReset(window, { locale });
+      section += relativeTime ? `${formatLimitResetsIn(relativeTime, resetTime, { locale })}\n` : `${formatLimitResetsAt(resetTime, { locale })}\n`;
+    }
+  } else {
+    section += `${lt('na', {}, { locale })}\n`;
+  }
+  return section;
+}
+
+function hasPositivePercentage(value) {
+  if (value === null || value === undefined) return false;
+  const numeric = Number(value);
+  return Number.isFinite(numeric) && numeric > 0;
+}
+
+function hasPositiveCreditBalance(credits) {
+  if (!credits) return false;
+  if (credits.unlimited) return true;
+  const numeric = Number.parseFloat(String(credits.balance ?? '0'));
+  return Number.isFinite(numeric) && numeric > 0;
+}
+
 /**
  * Get GitHub API rate limits by calling gh api rate_limit
  * Returns rate limit info for core, search, graphql, and other resources
@@ -1061,118 +1116,51 @@ export function formatUsageMessage(usage, diskSpace = null, githubRateLimit = nu
     sections.push(section);
   }
 
-  // Claude limits section
-  // When there's an error (e.g., auth expired), show it once and skip empty subsections
+  const claudeHeading = formatSubscriptionHeading('claude', subscription, { locale });
+  const useShortClaudeLabels = Boolean(claudeHeading);
+  const claudeSections = [];
+
+  // Claude limits section. When there's an error (e.g., auth expired), show it once and skip empty subsections.
   if (claudeError) {
-    sections.push(`${lt('claude_limits', {}, { locale })}\n${claudeError}\n`);
+    claudeSections.push(useShortClaudeLabels ? `${claudeError}\n` : `${lt('claude_limits', {}, { locale })}\n${claudeError}\n`);
   } else {
-    // Claude 5 hour session (five_hour)
-    // Threshold: One-at-a-time mode when usage >= 65%
-    let sessionSection = `${lt('claude_5_hour_session', {}, { locale })}\n`;
-    if (hasLimitPercentage(usage?.currentSession)) {
-      const timePassed = calculateTimePassedPercentage(usage.currentSession.resetsAt, 5);
-      if (timePassed !== null) {
-        const timeBar = getProgressBar(timePassed);
-        sessionSection += `${timeBar} ${timePassed}% ${lt('passed', {}, { locale })}\n`;
-      }
-
-      // Use Math.floor so 100% only appears when usage is exactly 100%
-      // See: https://github.com/link-assistant/hive-mind/issues/1133
-      const pct = Math.floor(usage.currentSession.percentage);
-      const bar = getProgressBar(pct, DISPLAY_THRESHOLDS.CLAUDE_5_HOUR_SESSION);
-      const suffix = pct >= DISPLAY_THRESHOLDS.CLAUDE_5_HOUR_SESSION ? ' ⚠️' : ` ${lt('used', {}, { locale })}`;
-      sessionSection += `${bar} ${pct}%${suffix}\n`;
-
-      const sessionResetTime = getLocalizedResetTime(usage.currentSession, { locale });
-      if (sessionResetTime) {
-        const relativeTime = getLocalizedRelativeReset(usage.currentSession, { locale });
-        if (relativeTime) {
-          sessionSection += `${formatLimitResetsIn(relativeTime, sessionResetTime, { locale })}\n`;
-        } else {
-          sessionSection += `${formatLimitResetsAt(sessionResetTime, { locale })}\n`;
-        }
-      }
-    } else {
-      sessionSection += `${lt('na', {}, { locale })}\n`;
+    const hasSonnetOnly = hasLimitPercentage(usage?.sonnetOnly);
+    claudeSections.push(formatLimitWindowSection(useShortClaudeLabels ? lt('five_hour_limit_session', {}, { locale }) : lt('claude_5_hour_session', {}, { locale }), usage?.currentSession, 5, DISPLAY_THRESHOLDS.CLAUDE_5_HOUR_SESSION, { locale }));
+    claudeSections.push(formatLimitWindowSection(useShortClaudeLabels && !hasSonnetOnly ? lt('current_week', {}, { locale }) : lt('current_week_all_models', {}, { locale }), usage?.allModels, 168, DISPLAY_THRESHOLDS.CLAUDE_WEEKLY, { locale }));
+    if (hasSonnetOnly || !useShortClaudeLabels) {
+      claudeSections.push(formatLimitWindowSection(lt('current_week_sonnet_only', {}, { locale }), usage?.sonnetOnly, 168, DISPLAY_THRESHOLDS.CLAUDE_WEEKLY, { locale }));
     }
-    sections.push(sessionSection);
-
-    // Current week (all models / seven_day)
-    // Threshold: One-at-a-time mode when usage >= 97%
-    let allModelsSection = `${lt('current_week_all_models', {}, { locale })}\n`;
-    if (hasLimitPercentage(usage?.allModels)) {
-      const timePassed = calculateTimePassedPercentage(usage.allModels.resetsAt, 168);
-      if (timePassed !== null) {
-        const timeBar = getProgressBar(timePassed);
-        allModelsSection += `${timeBar} ${timePassed}% ${lt('passed', {}, { locale })}\n`;
-      }
 
-      // Use Math.floor so 100% only appears when usage is exactly 100%
-      // See: https://github.com/link-assistant/hive-mind/issues/1133
-      const pct = Math.floor(usage.allModels.percentage);
-      const bar = getProgressBar(pct, DISPLAY_THRESHOLDS.CLAUDE_WEEKLY);
-      const suffix = pct >= DISPLAY_THRESHOLDS.CLAUDE_WEEKLY ? ' ⚠️' : ` ${lt('used', {}, { locale })}`;
-      allModelsSection += `${bar} ${pct}%${suffix}\n`;
-
-      const allModelsResetTime = getLocalizedResetTime(usage.allModels, { locale });
-      if (allModelsResetTime) {
-        const relativeTime = getLocalizedRelativeReset(usage.allModels, { locale });
-        if (relativeTime) {
-          allModelsSection += `${formatLimitResetsIn(relativeTime, allModelsResetTime, { locale })}\n`;
-        } else {
-          allModelsSection += `${formatLimitResetsAt(allModelsResetTime, { locale })}\n`;
-        }
-      }
-    } else {
-      allModelsSection += `${lt('na', {}, { locale })}\n`;
+    if (!useShortClaudeLabels) {
+      const subscriptionLines = formatSubscriptionLines(subscription, { locale });
+      if (subscriptionLines) claudeSections.push(subscriptionLines);
     }
-    sections.push(allModelsSection);
-
-    // Current week (Sonnet only / seven_day_sonnet)
-    // Threshold: One-at-a-time mode when usage >= 97% (same as all models)
-    let sonnetSection = `${lt('current_week_sonnet_only', {}, { locale })}\n`;
-    if (hasLimitPercentage(usage?.sonnetOnly)) {
-      // Add time passed progress bar first (no threshold marker for time)
-      const timePassed = calculateTimePassedPercentage(usage.sonnetOnly.resetsAt, 168);
-      if (timePassed !== null) {
-        const timeBar = getProgressBar(timePassed);
-        sonnetSection += `${timeBar} ${timePassed}% ${lt('passed', {}, { locale })}\n`;
-      }
+  }
 
-      // Add usage progress bar second with threshold marker
-      // Use Math.floor so 100% only appears when usage is exactly 100%
-      // See: https://github.com/link-assistant/hive-mind/issues/1133
-      const pct = Math.floor(usage.sonnetOnly.percentage);
-      const bar = getProgressBar(pct, DISPLAY_THRESHOLDS.CLAUDE_WEEKLY);
-      const suffix = pct >= DISPLAY_THRESHOLDS.CLAUDE_WEEKLY ? ' ⚠️' : ` ${lt('used', {}, { locale })}`;
-      sonnetSection += `${bar} ${pct}%${suffix}\n`;
-
-      const sonnetResetTime = getLocalizedResetTime(usage.sonnetOnly, { locale });
-      if (sonnetResetTime) {
-        const relativeTime = getLocalizedRelativeReset(usage.sonnetOnly, { locale });
-        if (relativeTime) {
-          sonnetSection += `${formatLimitResetsIn(relativeTime, sonnetResetTime, { locale })}\n`;
-        } else {
-          sonnetSection += `${formatLimitResetsAt(sonnetResetTime, { locale })}\n`;
-        }
-      }
-    } else {
-      sonnetSection += `${lt('na', {}, { locale })}\n`;
+  const hasFencedExtraSection = extraSections.some(extra => String(extra ?? '').includes('```'));
+  const useSplitLayout = Boolean(claudeHeading) || hasFencedExtraSection;
+
+  if (!useSplitLayout) {
+    sections.push(...claudeSections);
+    for (const extra of extraSections) {
+      sections.push(extra);
     }
-    sections.push(sonnetSection);
+    return formatCodeBlock(sections.join('\n'));
+  }
 
-    const subscriptionLines = formatSubscriptionLines(subscription, { locale });
-    if (subscriptionLines) sections.push(subscriptionLines);
+  const markdownSections = [];
+  markdownSections.push(formatCodeBlock(claudeHeading ? sections.join('\n') : [...sections, ...claudeSections].join('\n')));
+  if (claudeHeading) {
+    markdownSections.push(claudeHeading);
+    markdownSections.push(formatCodeBlock(claudeSections.join('\n')));
   }
 
-  // Append any caller-provided extra sections (e.g. queue status) inside the code block
   for (const extra of extraSections) {
-    sections.push(extra);
+    const formatted = formatPlainTitledCodeSection(extra);
+    if (formatted) markdownSections.push(formatted);
   }
 
-  // Wrap all sections in a single code block for monospace font / aligned progress bars.
-  // Sections are separated by blank lines; the trailing newline on each section provides spacing.
-  return '```\n' + sections.join('\n') + '```';
+  return markdownSections.join('\n\n');
 }
 
 /**
@@ -1185,64 +1173,33 @@ export function formatUsageMessage(usage, diskSpace = null, githubRateLimit = nu
  */
 export function formatCodexLimitsSection(codexLimits, codexError = null, options = {}) {
   const locale = resolveLimitLocale(options);
-  if (codexError) {
-    return `${lt('codex_limits', {}, { locale })}\n${codexError}\n`;
-  }
-
+  const subscription = options?.subscription || null;
   const usage = codexLimits?.usage || null;
   const additionalRateLimits = codexLimits?.additionalRateLimits || [];
   const credits = codexLimits?.credits || null;
-  const planType = codexLimits?.planType || null;
-  const subscription = options?.subscription || null;
+  const planType = subscription?.planType || codexLimits?.planType || null;
+  const heading = formatSubscriptionHeading('codex', subscription, { locale, planType });
+  const useTitledLayout = Boolean(heading);
 
-  let section = `${lt('codex_limits', {}, { locale })}\n`;
-  if (planType) {
-    section += `${lt('plan', {}, { locale })}: ${planType}\n`;
+  if (codexError) {
+    const errorSection = useTitledLayout ? `${codexError}\n` : `${lt('codex_limits', {}, { locale })}\n${codexError}\n`;
+    return useTitledLayout ? `${heading}\n\n${formatCodeBlock(errorSection)}` : errorSection;
   }
 
-  let sessionSection = `${lt('codex_5_hour_session', {}, { locale })}\n`;
-  if (hasLimitPercentage(usage?.currentSession)) {
-    const timePassed = calculateTimePassedPercentage(usage.currentSession.resetsAt, 5);
-    if (timePassed !== null) {
-      sessionSection += `${getProgressBar(timePassed)} ${timePassed}% ${lt('passed', {}, { locale })}\n`;
-    }
-    const pct = Math.floor(usage.currentSession.percentage);
-    const bar = getProgressBar(pct, DISPLAY_THRESHOLDS.CODEX_5_HOUR_SESSION);
-    const suffix = pct >= DISPLAY_THRESHOLDS.CODEX_5_HOUR_SESSION ? ' ⚠️' : ` ${lt('used', {}, { locale })}`;
-    sessionSection += `${bar} ${pct}%${suffix}\n`;
-    const sessionResetTime = getLocalizedResetTime(usage.currentSession, { locale });
-    if (sessionResetTime) {
-      const relativeTime = getLocalizedRelativeReset(usage.currentSession, { locale });
-      sessionSection += relativeTime ? `${formatLimitResetsIn(relativeTime, sessionResetTime, { locale })}\n` : `${formatLimitResetsAt(sessionResetTime, { locale })}\n`;
-    }
-  } else {
-    sessionSection += `${lt('na', {}, { locale })}\n`;
+  let section = useTitledLayout ? '' : `${lt('codex_limits', {}, { locale })}\n`;
+  if (planType && !useTitledLayout) {
+    section += `${lt('plan', {}, { locale })}: ${planType}\n`;
   }
 
-  let weeklySection = `${lt('current_week_all_models', {}, { locale })}\n`;
-  if (hasLimitPercentage(usage?.allModels)) {
-    const timePassed = calculateTimePassedPercentage(usage.allModels.resetsAt, 168);
-    if (timePassed !== null) {
-      weeklySection += `${getProgressBar(timePassed)} ${timePassed}% ${lt('passed', {}, { locale })}\n`;
-    }
-    const pct = Math.floor(usage.allModels.percentage);
-    const bar = getProgressBar(pct, DISPLAY_THRESHOLDS.CODEX_WEEKLY);
-    const suffix = pct >= DISPLAY_THRESHOLDS.CODEX_WEEKLY ? ' ⚠️' : ` ${lt('used', {}, { locale })}`;
-    weeklySection += `${bar} ${pct}%${suffix}\n`;
-    const weeklyResetTime = getLocalizedResetTime(usage.allModels, { locale });
-    if (weeklyResetTime) {
-      const relativeTime = getLocalizedRelativeReset(usage.allModels, { locale });
-      weeklySection += relativeTime ? `${formatLimitResetsIn(relativeTime, weeklyResetTime, { locale })}\n` : `${formatLimitResetsAt(weeklyResetTime, { locale })}\n`;
-    }
-  } else {
-    weeklySection += `${lt('na', {}, { locale })}\n`;
-  }
+  const sessionSection = formatLimitWindowSection(useTitledLayout ? lt('five_hour_limit_session', {}, { locale }) : lt('codex_5_hour_session', {}, { locale }), usage?.currentSession, 5, DISPLAY_THRESHOLDS.CODEX_5_HOUR_SESSION, { locale });
+  const weeklySection = formatLimitWindowSection(useTitledLayout ? lt('current_week', {}, { locale }) : lt('current_week_all_models', {}, { locale }), usage?.allModels, 168, DISPLAY_THRESHOLDS.CODEX_WEEKLY, { locale });
 
   section += `${sessionSection}\n${weeklySection}`;
 
-  if (additionalRateLimits.length > 0) {
+  const visibleAdditionalRateLimits = additionalRateLimits.filter(limit => hasPositivePercentage(limit.allModels?.percentage));
+  if (visibleAdditionalRateLimits.length > 0) {
     section += `\n${lt('additional_codex_limits', {}, { locale })}\n`;
-    for (const limit of additionalRateLimits) {
+    for (const limit of visibleAdditionalRateLimits) {
       const sessionPct = limit.currentSession?.percentage;
       const weeklyPct = limit.allModels?.percentage;
       const sessionText = sessionPct === null || sessionPct === undefined ? `${lt('session', {}, { locale })} ${lt('na', {}, { locale })}` : `${lt('session', {}, { locale })} ${Math.floor(sessionPct)}%`;
@@ -1251,15 +1208,17 @@ export function formatCodexLimitsSection(codexLimits, codexError = null, options
     }
   }
 
-  if (credits) {
+  if (hasPositiveCreditBalance(credits)) {
     const creditSummary = credits.unlimited ? lt('unlimited', {}, { locale }) : `${credits.balance ?? '0'} ${lt('balance', {}, { locale })}`;
     section += `\n${lt('codex_credits', {}, { locale })}\n${creditSummary}\n`;
   }
 
-  const subscriptionLines = formatSubscriptionLines(subscription, { locale });
-  if (subscriptionLines) section += subscriptionLines;
+  if (!useTitledLayout) {
+    const subscriptionLines = formatSubscriptionLines(subscription, { locale });
+    if (subscriptionLines) section += subscriptionLines;
+  }
 
-  return section;
+  return useTitledLayout ? `${heading}\n\n${formatCodeBlock(section)}` : section;
 }
 
 // ============================================================================

package/src/locales/en.lino

@@ -192,6 +192,11 @@ en
         hour
           session "Claude 5 hour session"
       limits "Claude limits"
+      subscription
+        title "Claude{{plan}} subscription"
+    chatgpt
+      subscription
+        title "ChatGPT{{plan}} subscription"
     codex
       5
         hour
@@ -205,6 +210,7 @@ en
     current
       time "Current time"
       week
+        label "Current week"
         all
           models "Current week (all models)"
         sonnet
@@ -226,6 +232,8 @@ en
     end "End"
     five
       hour
+        limit
+          session "5 hour session"
         session "5h session"
       min
         load
@@ -314,6 +322,14 @@ en
     session "session"
     start "Start"
     subscription
+      detail
+        ends
+          label "ends {{time}}"
+          in "ends in {{duration}}; {{time}}"
+        trial
+          ends
+            label "trial ends {{time}}"
+            in "trial ends in {{duration}}; {{time}}"
       ends
         label "Subscription ends {{time}}"
         in "Subscription ends in {{duration}} ({{time}})"

package/src/locales/hi.lino

@@ -192,6 +192,11 @@ hi
         hour
           session "Claude 5 घंटे का सत्र"
       limits "Claude सीमाएँ"
+      subscription
+        title "Claude{{plan}} सदस्यता"
+    chatgpt
+      subscription
+        title "ChatGPT{{plan}} सदस्यता"
     codex
       5
         hour
@@ -205,6 +210,7 @@ hi
     current
       time "वर्तमान समय"
       week
+        label "वर्तमान सप्ताह"
         all
           models "वर्तमान सप्ताह (सभी मॉडल)"
         sonnet
@@ -226,6 +232,8 @@ hi
     end "समाप्ति"
     five
       hour
+        limit
+          session "5 घंटे का सत्र"
         session "5 घंटे का सत्र"
       min
         load
@@ -314,6 +322,14 @@ hi
     session "सत्र"
     start "शुरुआत"
     subscription
+      detail
+        ends
+          label "{{time}} को समाप्त होगी"
+          in "{{duration}} में समाप्त होगी; {{time}}"
+        trial
+          ends
+            label "ट्रायल {{time}} को समाप्त होगा"
+            in "ट्रायल {{duration}} में समाप्त होगा; {{time}}"
       ends
         label "सदस्यता समाप्त होगी {{time}}"
         in "सदस्यता {{duration}} में समाप्त होगी ({{time}})"

package/src/locales/ru.lino

@@ -192,6 +192,11 @@ ru
         hour
           session "5-часовой сеанс Claude"
       limits "Лимиты Claude"
+      subscription
+        title "Подписка Claude{{plan}}"
+    chatgpt
+      subscription
+        title "Подписка ChatGPT{{plan}}"
     codex
       5
         hour
@@ -205,6 +210,7 @@ ru
     current
       time "Текущее время"
       week
+        label "Текущая неделя"
         all
           models "Текущая неделя (все модели)"
         sonnet
@@ -226,6 +232,8 @@ ru
     end "Конец"
     five
       hour
+        limit
+          session "5-часовой сеанс"
         session "5-часовой сеанс"
       min
         load
@@ -314,6 +322,14 @@ ru
     session "сеанс"
     start "Начало"
     subscription
+      detail
+        ends
+          label "заканчивается {{time}}"
+          in "заканчивается через {{duration}}; {{time}}"
+        trial
+          ends
+            label "пробный период заканчивается {{time}}"
+            in "пробный период заканчивается через {{duration}}; {{time}}"
       ends
         label "Подписка заканчивается {{time}}"
         in "Подписка заканчивается через {{duration}} ({{time}})"

package/src/locales/zh.lino

@@ -192,6 +192,11 @@ zh
         hour
           session "Claude 5 小时会话"
       limits "Claude 限额"
+      subscription
+        title "Claude{{plan}} 订阅"
+    chatgpt
+      subscription
+        title "ChatGPT{{plan}} 订阅"
     codex
       5
         hour
@@ -205,6 +210,7 @@ zh
     current
       time "当前时间"
       week
+        label "本周"
         all
           models "本周（所有模型）"
         sonnet
@@ -226,6 +232,8 @@ zh
     end "结束"
     five
       hour
+        limit
+          session "5 小时会话"
         session "5 小时会话"
       min
         load
@@ -314,6 +322,14 @@ zh
     session "会话"
     start "开始"
     subscription
+      detail
+        ends
+          label "结束于 {{time}}"
+          in "将在 {{duration}} 后结束；{{time}}"
+        trial
+          ends
+            label "试用结束于 {{time}}"
+            in "试用将在 {{duration}} 后结束；{{time}}"
       ends
         label "订阅结束于 {{time}}"
         in "订阅将在 {{duration}} 后结束 ({{time}})"