@link-assistant/hive-mind 1.35.0 → 1.35.2

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @link-assistant/hive-mind
 
+## 1.35.2
+
+### Patch Changes
+
+- 0cfcb6a: Fix CI/CD changelog formatting when multiple PRs merge before a release (Issue #1452). The merge-changesets script now keeps each changeset as a separate file (only harmonizing bump types) instead of merging descriptions into one, so @changesets/cli produces separate bullet items. Also enhances release notes PR detection to find all related PRs via tag-range merge commit lookup.
+- a689f6b: fix: use result JSON modelUsage for accurate multi-model display in GitHub comments
+
+  When Claude Code uses multiple models (e.g., main model + subagent), the completion
+  comment now correctly displays all models instead of just the main model.
+
+## 1.35.1
+
+### Patch Changes
+
+- Fix misleading "Retry after: 0s" message in /limits command when Claude Usage API returns 429. Now shows "Try again later." for zero/missing retry-after values, or proper reset time format (e.g., "Resets in 5m (Mar 19, 8:00pm UTC)") for meaningful values. Also caches 429 errors to prevent repeated requests to rate-limited endpoint, and adds full request/response verbose logging for debugging.
+
+  improve Solution Draft Log comment formatting for better readability (issue #1448)
+
 ## 1.35.0
 
 ### Minor Changes

package/package.json

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

package/src/claude.lib.mjs

@@ -848,6 +848,7 @@ export const executeClaudeCommand = async params => {
     let anthropicTotalCostUSD = null; // Capture Anthropic's official total_cost_usd from result
     let errorDuringExecution = false; // Issue #1088: Track if error_during_execution subtype occurred
     let resultSummary = null; // Issue #1263: Capture AI result summary for --attach-solution-summary
+    let resultModelUsage = null; // Issue #1454
     // Create interactive mode handler if enabled
     let interactiveHandler = null;
     if (argv.interactiveMode && owner && repo && prNumber) {
@@ -1028,6 +1029,7 @@ export const executeClaudeCommand = async params => {
                   resultNumTurns = data.num_turns;
                   await log(`📊 Session num_turns: ${resultNumTurns}`, { verbose: true });
                 }
+                if (data.subtype === 'success' && data.modelUsage) resultModelUsage = data.modelUsage; // Issue #1454
                 if (data.is_error === true) {
                   lastMessage = data.result || JSON.stringify(data);
                   const subtype = data.subtype || 'unknown';
@@ -1107,7 +1109,6 @@ export const executeClaudeCommand = async params => {
               if (line.trim() && !line.includes('node:internal')) {
                 await log(line, { stream: 'raw' });
                 lastMessage = line;
-
                 // Issue #1015: Detect terms acceptance prompt (non-JSON "[ACTION REQUIRED]..." message)
                 const termsAcceptancePattern = /\[ACTION REQUIRED\].*terms|must run.*claude.*review.*terms/i;
                 if (termsAcceptancePattern.test(line)) {
@@ -1182,7 +1183,6 @@ export const executeClaudeCommand = async params => {
           await log(`\n❌ Command not found (exit code 127) - "${claudePath}" is not installed or not in PATH\n   Please ensure Claude CLI is installed: npm install -g @anthropic-ai/claude-code`, { level: 'error' });
         }
       }
-
       // Flush any remaining queued comments from interactive mode
       if (interactiveHandler) {
         try {
@@ -1380,6 +1380,7 @@ export const executeClaudeCommand = async params => {
         anthropicTotalCostUSD, // Pass Anthropic's official total cost
         errorDuringExecution, // Issue #1088: Track if error_during_execution subtype occurred
         resultSummary, // Issue #1263: Include result summary for --attach-solution-summary
+        resultModelUsage, // Issue #1454
       };
     } catch (error) {
       reportError(error, {

package/src/github.lib.mjs

@@ -22,7 +22,7 @@ const buildCostInfoString = (totalCostUSD, anthropicTotalCostUSD, pricingInfo) =
   const hasPricing = pricingInfo && (pricingInfo.modelName || pricingInfo.tokenUsage || pricingInfo.isFreeModel || pricingInfo.isOpencodeFreeModel);
   const hasOpencodeCost = pricingInfo?.opencodeCost !== null && pricingInfo?.opencodeCost !== undefined;
   if (!hasPublic && !hasAnthropic && !hasPricing && !hasOpencodeCost) return '';
-  let costInfo = '\n\n💰 **Cost estimation:**';
+  let costInfo = '\n\n### 💰 **Cost estimation:**';
   if (pricingInfo?.modelName) {
     costInfo += `\n- Model: ${pricingInfo.modelName}`;
     if (pricingInfo.provider) costInfo += `\n- Provider: ${pricingInfo.provider}`;
@@ -366,21 +366,15 @@ export async function attachLogToGitHub(options) {
     limitResetTime = null,
     toolName = 'AI tool',
     resumeCommand = null,
-    // Whether auto-resume/auto-restart is enabled (determines if CLI commands should be shown)
-    // See: https://github.com/link-assistant/hive-mind/issues/1152
-    isAutoResumeEnabled = false,
+    isAutoResumeEnabled = false, // Issue #1152: Whether auto-resume/auto-restart is enabled
     autoResumeMode = 'resume', // 'resume' or 'restart'
-    // Session type for differentiating solution draft log comments
-    // See: https://github.com/link-assistant/hive-mind/issues/1152
-    sessionType = 'new', // 'new', 'resume', 'auto-resume', 'auto-restart'
-    // New parameters for agent tool pricing support
-    publicPricingEstimate = null,
+    sessionType = 'new', // Issue #1152: 'new', 'resume', 'auto-resume', 'auto-restart'
+    publicPricingEstimate = null, // Agent tool pricing support
     pricingInfo = null,
-    // Issue #1088: Track error_during_execution for "Finished with errors" state
-    errorDuringExecution = false,
-    // Issue #1225: Model information for PR comments
-    requestedModel = null, // The --model flag value (e.g., "opus", "sonnet")
-    tool = null, // The tool used (e.g., "claude", "agent", "codex", "opencode")
+    errorDuringExecution = false, // Issue #1088
+    requestedModel = null, // Issue #1225: The --model flag value
+    tool = null, // The tool used (claude, agent, opencode, codex)
+    resultModelUsage = null, // Issue #1454
   } = options;
   const targetName = targetType === 'pr' ? 'Pull Request' : 'Issue';
   const ghCommand = targetType === 'pr' ? 'pr' : 'issue';
@@ -391,15 +385,12 @@ export async function attachLogToGitHub(options) {
       await log('  ⚠️  Log file is empty, skipping upload');
       return false;
     }
-    // Issue #1173: Remove premature size check that blocked large files.
-    // gh-upload-log can handle files of any size by using repositories for large files.
-    // For files larger than fileMaxSize, we'll skip inline comment attempt and go directly to gh-upload-log.
+    // Issue #1173: gh-upload-log handles large files; skip inline comment for files > fileMaxSize
     const useLargeFileMode = logStats.size > githubLimits.fileMaxSize;
     if (useLargeFileMode && verbose) {
       await log(`  📁 Large log file (${Math.round(logStats.size / 1024 / 1024)}MB), will use gh-upload-log`, { verbose: true });
     }
-    // Calculate token usage if sessionId and tempDir are provided
-    // For agent tool, publicPricingEstimate is already provided, so we skip Claude-specific calculation
+    // Calculate token usage if sessionId and tempDir are provided (skip for agent tool with pricing)
     let totalCostUSD = publicPricingEstimate;
     // Issue #1225: Collect actual model IDs from Claude session JSON output
     let actualModelIds = null;
@@ -429,6 +420,15 @@ export async function attachLogToGitHub(options) {
         }
       }
     }
+    // Issue #1454: Use resultModelUsage from result JSON when it has more models (includes subagent models)
+    if (resultModelUsage && typeof resultModelUsage === 'object') {
+      const ids = Object.keys(resultModelUsage);
+      if (ids.length > 0 && (!actualModelIds || ids.length > actualModelIds.length)) {
+        ids.sort((a, b) => (resultModelUsage[b]?.costUSD ?? 0) - (resultModelUsage[a]?.costUSD ?? 0));
+        actualModelIds = ids;
+        if (verbose) await log(`  🤖 Using result JSON modelUsage (${ids.length} models): ${ids.join(', ')}`, { verbose: true });
+      }
+    }
     // For agent tool, extract actual model ID from pricingInfo (Issue #1225)
     if (!actualModelIds && pricingInfo?.modelId) {
       actualModelIds = [pricingInfo.modelId];
@@ -557,7 +557,7 @@ ${logContent}
       logComment = `## ⚠️ Solution Draft Finished with Errors
 This log file contains the complete execution trace of the AI ${targetType === 'pr' ? 'solution draft' : 'analysis'} process.${costInfo}${modelInfoString}
 
-**Note**: The session encountered errors during execution, but some work may have been completed. Please review the changes carefully.
+> **Note**: The session encountered errors during execution, but some work may have been completed. Please review the changes carefully.
 
 <details>
 <summary>Click to expand solution draft log (${Math.round(logStats.size / 1024)}KB)</summary>
@@ -714,8 +714,8 @@ ${resumeCommand}
 
             logUploadComment += `${modelInfoString}
 
-📎 **Execution log uploaded as ${uploadTypeLabel}${chunkInfo}** (${Math.round(logStats.size / 1024)}KB)
-🔗 [View complete execution log](${logUrl})
+### 📎 **Execution log uploaded as ${uploadTypeLabel}${chunkInfo}** (${Math.round(logStats.size / 1024)}KB)
+- [View complete execution log](${logUrl})
 
 ---
 *This session was interrupted due to usage limits. You can resume once the limit resets.*`;
@@ -726,8 +726,10 @@ The automated solution draft encountered an error:
 \`\`\`
 ${errorMessage}
 \`\`\`${modelInfoString}
-📎 **Failure log uploaded as ${uploadTypeLabel}${chunkInfo}** (${Math.round(logStats.size / 1024)}KB)
-🔗 [View complete failure log](${logUrl})
+
+### 📎 **Failure log uploaded as ${uploadTypeLabel}${chunkInfo}** (${Math.round(logStats.size / 1024)}KB)
+- [View complete failure log](${logUrl})
+
 ---
 *Now working session is ended, feel free to review and add any feedback on the solution draft.*`;
           } else if (errorDuringExecution) {
@@ -736,10 +738,11 @@ ${errorMessage}
             logUploadComment = `## ⚠️ Solution Draft Finished with Errors
 This log file contains the complete execution trace of the AI ${targetType === 'pr' ? 'solution draft' : 'analysis'} process.${costInfo}${modelInfoString}
 
-**Note**: The session encountered errors during execution, but some work may have been completed. Please review the changes carefully.
+> **Note**: The session encountered errors during execution, but some work may have been completed. Please review the changes carefully.
+
+### 📎 **Log file uploaded as ${uploadTypeLabel}${chunkInfo}** (${Math.round(logStats.size / 1024)}KB)
+- [View complete solution draft log](${logUrl})
 
-📎 **Log file uploaded as ${uploadTypeLabel}${chunkInfo}** (${Math.round(logStats.size / 1024)}KB)
-🔗 [View complete solution draft log](${logUrl})
 ---
 *Now working session is ended, feel free to review and add any feedback on the solution draft.*`;
           } else {
@@ -761,8 +764,10 @@ This log file contains the complete execution trace of the AI ${targetType === '
             }
             logUploadComment = `## ${title}
 This log file contains the complete execution trace of the AI ${targetType === 'pr' ? 'solution draft' : 'analysis'} process.${costInfo}${modelInfoString}
-${sessionNote}📎 **Log file uploaded as ${uploadTypeLabel}${chunkInfo}** (${Math.round(logStats.size / 1024)}KB)
-🔗 [View complete solution draft log](${logUrl})
+${sessionNote}
+### 📎 **Log file uploaded as ${uploadTypeLabel}${chunkInfo}** (${Math.round(logStats.size / 1024)}KB)
+- [View complete solution draft log](${logUrl})
+
 ---
 *Now working session is ended, feel free to review and add any feedback on the solution draft.*`;
           }

package/src/limits.lib.mjs

@@ -61,6 +61,63 @@ async function readCredentials(credentialsPath = DEFAULT_CREDENTIALS_PATH, verbo
   }
 }
 
+/**
+ * Format a retry-after value into a user-friendly message.
+ * The retry-after header can be either a number of seconds or an HTTP-date.
+ * Handles edge cases like 0, missing, or negative values gracefully.
+ *
+ * @param {string|null} retryAfter - Value of the retry-after header
+ * @returns {string} Formatted message part (e.g., " Resets in 2m 30s (Mar 19, 8:00pm UTC)" or " Try again later.")
+ * @see https://github.com/link-assistant/hive-mind/issues/1446
+ */
+export function formatRetryAfterMessage(retryAfter) {
+  if (retryAfter === null || retryAfter === undefined) {
+    return ' Try again later.';
+  }
+
+  // Try to parse as number of seconds first
+  const seconds = Number(retryAfter);
+  if (!Number.isNaN(seconds) && seconds > 0) {
+    // Calculate reset time from now + seconds
+    const resetAt = dayjs().add(seconds, 'second').utc();
+    const resetTimeStr = resetAt.format('MMM D, h:mma');
+
+    // Format relative time
+    const totalMinutes = Math.floor(seconds / 60);
+    const remainingSeconds = Math.round(seconds % 60);
+    const hours = Math.floor(totalMinutes / 60);
+    const minutes = totalMinutes % 60;
+
+    let relativeStr;
+    if (hours > 0) {
+      relativeStr = `${hours}h ${minutes}m`;
+    } else if (minutes > 0) {
+      relativeStr = remainingSeconds > 0 ? `${minutes}m ${remainingSeconds}s` : `${minutes}m`;
+    } else {
+      relativeStr = `${remainingSeconds}s`;
+    }
+
+    return ` Resets in ${relativeStr} (${resetTimeStr} UTC)`;
+  }
+
+  // Try to parse as HTTP-date (e.g., "Wed, 21 Oct 2015 07:28:00 GMT")
+  const retryDate = dayjs(retryAfter);
+  if (retryDate.isValid()) {
+    const diffMs = retryDate.diff(dayjs());
+    if (diffMs > 0) {
+      const totalMinutes = Math.floor(diffMs / (1000 * 60));
+      const hours = Math.floor(totalMinutes / 60);
+      const minutes = totalMinutes % 60;
+      const relativeStr = hours > 0 ? `${hours}h ${minutes}m` : `${minutes}m`;
+      const resetTimeStr = retryDate.utc().format('MMM D, h:mma');
+      return ` Resets in ${relativeStr} (${resetTimeStr} UTC)`;
+    }
+  }
+
+  // Fallback for 0, negative, or unparseable values - don't show misleading info
+  return ' Try again later.';
+}
+
 /**
  * Format an ISO date string to a human-readable reset time using dayjs
  *
@@ -534,31 +591,47 @@ export async function getClaudeUsageLimits(verbose = false, credentialsPath = DE
       };
     }
 
+    const requestHeaders = {
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+      'User-Agent': 'claude-code/2.0.55',
+      Authorization: `Bearer ${accessToken}`,
+      'anthropic-beta': 'oauth-2025-04-20',
+    };
+
     if (verbose) {
       console.log('[VERBOSE] /limits fetching usage from API...');
+      console.log(`[VERBOSE] /limits API request: GET ${USAGE_API_ENDPOINT}`);
+      // Log request headers with sanitized Authorization (show only last 8 chars)
+      const sanitizedHeaders = { ...requestHeaders };
+      if (sanitizedHeaders.Authorization) {
+        const token = sanitizedHeaders.Authorization;
+        sanitizedHeaders.Authorization = `Bearer ...${token.slice(-8)}`;
+      }
+      console.log('[VERBOSE] /limits API request headers:', JSON.stringify(sanitizedHeaders, null, 2));
     }
 
     // Call the Anthropic OAuth usage API
     const response = await fetch(USAGE_API_ENDPOINT, {
       method: 'GET',
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-        'User-Agent': 'claude-code/2.0.55',
-        Authorization: `Bearer ${accessToken}`,
-        'anthropic-beta': 'oauth-2025-04-20',
-      },
+      headers: requestHeaders,
     });
 
-    // Log HTTP response status for debugging (always, not just on error)
+    // Log HTTP response status and headers for debugging (always in verbose mode, not just on error)
     if (verbose) {
       console.log(`[VERBOSE] /limits API HTTP status: ${response.status} ${response.statusText}`);
+      // Log all response headers for debugging
+      const responseHeaders = {};
+      response.headers.forEach((value, key) => {
+        responseHeaders[key] = value;
+      });
+      console.log('[VERBOSE] /limits API response headers:', JSON.stringify(responseHeaders, null, 2));
     }
 
     if (!response.ok) {
       const errorText = await response.text();
       if (verbose) {
-        console.error('[VERBOSE] /limits API error:', response.status, errorText);
+        console.error('[VERBOSE] /limits API error body:', errorText);
       }
 
       // Check for specific error conditions
@@ -574,7 +647,7 @@ export async function getClaudeUsageLimits(verbose = false, credentialsPath = DE
         const retryAfter = response.headers.get('retry-after');
         return {
           success: false,
-          error: `Rate limited by Claude Usage API. ${retryAfter ? `Retry after: ${retryAfter}s` : 'Try again later.'}`,
+          error: `Claude Usage API access has reached rate limit.${formatRetryAfterMessage(retryAfter)}`,
         };
       }
 
@@ -587,7 +660,7 @@ export async function getClaudeUsageLimits(verbose = false, credentialsPath = DE
     const data = await response.json();
 
     if (verbose) {
-      console.log('[VERBOSE] /limits API response:', JSON.stringify(data, null, 2));
+      console.log('[VERBOSE] /limits API response body:', JSON.stringify(data, null, 2));
     }
 
     // Parse the API response
@@ -971,9 +1044,23 @@ export async function getCachedClaudeLimits(verbose = false) {
     if (verbose) console.log('[VERBOSE] /limits-cache: Using cached Claude limits (TTL: ' + Math.round(CACHE_TTL.USAGE_API / 60000) + ' minutes)');
     return cached;
   }
+  // Also check if we have a cached rate-limit error to avoid hammering a 429'd endpoint
+  const cachedError = cache.get('claude-rate-limited', CACHE_TTL.USAGE_API);
+  if (cachedError) {
+    if (verbose) console.log('[VERBOSE] /limits-cache: Using cached rate-limit error (avoiding repeated 429 requests)');
+    return cachedError;
+  }
   if (verbose) console.log('[VERBOSE] /limits-cache: Cache miss for Claude limits, fetching from API...');
   const result = await getClaudeUsageLimits(verbose);
-  if (result.success) cache.set('claude', result, CACHE_TTL.USAGE_API);
+  if (result.success) {
+    cache.set('claude', result, CACHE_TTL.USAGE_API);
+  } else if (result.error && result.error.includes('Rate limited')) {
+    // Cache rate-limit errors to prevent hammering the API
+    // Use the same 20-minute TTL as successful responses
+    // See: https://github.com/link-assistant/hive-mind/issues/1446
+    cache.set('claude-rate-limited', result, CACHE_TTL.USAGE_API);
+    if (verbose) console.log('[VERBOSE] /limits-cache: Cached rate-limit error for ' + Math.round(CACHE_TTL.USAGE_API / 60000) + ' minutes');
+  }
   return result;
 }
 
@@ -1040,6 +1127,7 @@ export default {
   getProgressBar,
   calculateTimePassedPercentage,
   formatUsageMessage,
+  formatRetryAfterMessage,
   // Threshold constants for progress bar visualization
   DISPLAY_THRESHOLDS,
   // Cache management

package/src/model-info.lib.mjs

@@ -179,7 +179,7 @@ export const buildModelInfoString = ({ requestedModel = null, tool = null, prici
 
   if (!hasRequested && !hasModelsUsed && !hasModelInfo && !hasPricingModel) return '';
 
-  let info = '\n\n🤖 **Models used:**';
+  let info = '\n\n### 🤖 **Models used:**';
 
   // Display tool name
   if (tool) {
@@ -201,26 +201,26 @@ export const buildModelInfoString = ({ requestedModel = null, tool = null, prici
 
     // Build main model line
     const mainModelName = mainModelMeta?.name || mainModelId;
-    const mainModelProvider = mainModelMeta?.provider || null;
-    const mainModelKnowledge = mainModelMeta?.knowledge || null;
+
+    // Use "Model" label when only one model, "Main model" when multiple
+    const modelLabel = supportingEntries.length > 0 ? 'Main model' : 'Model';
 
     if (mainMatches) {
-      info += `\n- **Main model: ${mainModelName}** (ID: \`${mainModelId}\`${mainModelProvider ? `, ${mainModelProvider}` : ''}${mainModelKnowledge ? `, cutoff: ${mainModelKnowledge}` : ''})`;
+      info += `\n- **${modelLabel}: ${mainModelName}** (\`${mainModelId}\`)`;
     } else {
       // Main model doesn't match requested - show warning
-      info += `\n- **Main model: ${mainModelName}** (ID: \`${mainModelId}\`${mainModelProvider ? `, ${mainModelProvider}` : ''}${mainModelKnowledge ? `, cutoff: ${mainModelKnowledge}` : ''})`;
+      info += `\n- **${modelLabel}: ${mainModelName}** (\`${mainModelId}\`)`;
       if (hasRequested) {
         info += `\n- ⚠️ **Warning**: Main model \`${mainModelId}\` does not match requested model \`${requestedModel}\``;
       }
     }
 
-    // Display supporting models
+    // Display additional models
     if (supportingEntries.length > 0) {
-      info += '\n- Supporting models:';
+      info += '\n- **Additional models:**';
       for (const entry of supportingEntries) {
         const name = entry.modelInfo?.name || entry.modelId;
-        const provider = entry.modelInfo?.provider || null;
-        info += `\n  - ${name} (\`${entry.modelId}\`${provider ? `, ${provider}` : ''})`;
+        info += `\n  *  **${name}** (\`${entry.modelId}\`)`;
       }
     }
   } else if (hasModelInfo) {

package/src/solve.mjs

@@ -864,6 +864,7 @@ try {
   let pricingInfo = toolResult.pricingInfo; // Used by agent tool for detailed pricing
   let errorDuringExecution = toolResult.errorDuringExecution || false; // Issue #1088: Track error_during_execution
   let resultSummary = toolResult.resultSummary || null; // Issue #1263: Capture result summary for --attach-solution-summary
+  let resultModelUsage = toolResult.resultModelUsage || null; // Issue #1454: Capture modelUsage from result JSON
   limitReached = toolResult.limitReached;
   cleanupContext.limitReached = limitReached;
 
@@ -938,6 +939,8 @@ try {
             sessionId,
             requestedModel: argv.model,
             tool: argv.tool || 'claude',
+            // Issue #1454: Pass resultModelUsage for accurate multi-model display
+            resultModelUsage,
           });
 
           if (logUploadSuccess) {
@@ -1004,6 +1007,8 @@ try {
               autoResumeMode: limitContinueMode,
               requestedModel: argv.model,
               tool: argv.tool || 'claude',
+              // Issue #1454: Pass resultModelUsage for accurate multi-model display
+              resultModelUsage,
             });
 
             if (logUploadSuccess) {
@@ -1100,6 +1105,8 @@ try {
           errorMessage: limitReached ? undefined : `${argv.tool.toUpperCase()} execution failed`,
           requestedModel: argv.model,
           tool: argv.tool || 'claude',
+          // Issue #1454: Pass resultModelUsage for accurate multi-model display
+          resultModelUsage,
         });
 
         if (logUploadSuccess) {
@@ -1183,7 +1190,7 @@ try {
   }
 
   // Search for newly created pull requests and comments
-  const verifyResult = await verifyResults(owner, repo, branchName, issueNumber, prNumber, prUrl, referenceTime, argv, shouldAttachLogs, shouldRestart, sessionId, tempDir, anthropicTotalCostUSD, publicPricingEstimate, pricingInfo, errorDuringExecution, sessionType);
+  const verifyResult = await verifyResults(owner, repo, branchName, issueNumber, prNumber, prUrl, referenceTime, argv, shouldAttachLogs, shouldRestart, sessionId, tempDir, anthropicTotalCostUSD, publicPricingEstimate, pricingInfo, errorDuringExecution, sessionType, resultModelUsage);
   const logsAlreadyUploaded = verifyResult?.logUploadSuccess || false;
 
   // Issue #1162: Auto-restart when PR title/description still has placeholder content
@@ -1230,7 +1237,7 @@ try {
     await cleanupClaudeFile(tempDir, branchName, null, argv);
 
     // Re-verify results after restart (without auto-restart flag to prevent recursion)
-    const reVerifyResult = await verifyResults(owner, repo, branchName, issueNumber, prNumber, prUrl, referenceTime, { ...argv, autoRestartOnNonUpdatedPullRequestDescription: false }, shouldAttachLogs, false, sessionId, tempDir, anthropicTotalCostUSD, publicPricingEstimate, pricingInfo, errorDuringExecution, sessionType);
+    const reVerifyResult = await verifyResults(owner, repo, branchName, issueNumber, prNumber, prUrl, referenceTime, { ...argv, autoRestartOnNonUpdatedPullRequestDescription: false }, shouldAttachLogs, false, sessionId, tempDir, anthropicTotalCostUSD, publicPricingEstimate, pricingInfo, errorDuringExecution, sessionType, resultModelUsage);
 
     if (reVerifyResult?.prTitleHasPlaceholder || reVerifyResult?.prBodyHasPlaceholder) {
       await log('⚠️  PR title/description still not updated after restart');
@@ -1353,6 +1360,8 @@ try {
           anthropicTotalCostUSD,
           requestedModel: argv.model,
           tool: argv.tool || 'claude',
+          // Issue #1454: Pass resultModelUsage for accurate multi-model display
+          resultModelUsage,
         });
 
         if (logUploadSuccess) {

package/src/solve.results.lib.mjs

@@ -494,7 +494,7 @@ export const showSessionSummary = async (sessionId, limitReached, argv, issueUrl
 };
 
 // Verify results by searching for new PRs and comments
-export const verifyResults = async (owner, repo, branchName, issueNumber, prNumber, prUrl, referenceTime, argv, shouldAttachLogs, shouldRestart = false, sessionId = null, tempDir = null, anthropicTotalCostUSD = null, publicPricingEstimate = null, pricingInfo = null, errorDuringExecution = false, sessionType = 'new') => {
+export const verifyResults = async (owner, repo, branchName, issueNumber, prNumber, prUrl, referenceTime, argv, shouldAttachLogs, shouldRestart = false, sessionId = null, tempDir = null, anthropicTotalCostUSD = null, publicPricingEstimate = null, pricingInfo = null, errorDuringExecution = false, sessionType = 'new', resultModelUsage = null) => {
   await log('\n🔍 Searching for created pull requests or comments...');
 
   try {
@@ -711,6 +711,8 @@ Fixes ${issueRef}
             // Issue #1225: Pass model and tool info for PR comments
             requestedModel: argv.model,
             tool: argv.tool || 'claude',
+            // Issue #1454: Pass resultModelUsage for accurate multi-model display
+            resultModelUsage,
           });
         }
 
@@ -793,6 +795,8 @@ Fixes ${issueRef}
           // Issue #1225: Pass model and tool info for issue comments
           requestedModel: argv.model,
           tool: argv.tool || 'claude',
+          // Issue #1454: Pass resultModelUsage for accurate multi-model display
+          resultModelUsage,
         });
       }