@link-assistant/hive-mind 1.35.1 → 1.35.3

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @link-assistant/hive-mind
 
+## 1.35.3
+
+### Patch Changes
+
+- 22ae6d6: fix: rename "attempt" to "iteration" in auto-restart messages (Issue #1456)
+
+  The auto-restart PR comment title and log message now use "iteration" instead of "attempt" to match the project's terminology. Affected messages:
+  - PR comment: `Auto-restart triggered (iteration N)` (was `attempt N`)
+  - Log: `Exiting auto-restart mode after N iterations` (was `attempts`)
+
+## 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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-assistant/hive-mind",
-  "version": "1.35.1",
+  "version": "1.35.3",
   "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

@@ -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];

package/src/solve.auto-merge.lib.mjs

@@ -658,7 +658,7 @@ Once the billing issue is resolved, you can re-run the CI checks or push a new c
         // Post a comment to PR about the restart
         // Issue #1356: Include restart count for tracking and add deduplication
         try {
-          const commentBody = `## 🔄 Auto-restart triggered (attempt ${restartCount})\n\n**Reason:** ${restartReason}\n\nStarting new session to address the issues.\n\n---\n*Auto-restart-until-mergeable mode is active. Will continue until PR becomes mergeable.*`;
+          const commentBody = `## 🔄 Auto-restart triggered (iteration ${restartCount})\n\n**Reason:** ${restartReason}\n\nStarting new session to address the issues.\n\n---\n*Auto-restart-until-mergeable mode is active. Will continue until PR becomes mergeable.*`;
           await $`gh pr comment ${prNumber} --repo ${owner}/${repo} --body ${commentBody}`;
           await log(formatAligned('', '💬 Posted auto-restart notification to PR', '', 2));
         } catch (commentError) {

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,
         });
       }
 

package/src/solve.watch.lib.mjs

@@ -112,7 +112,7 @@ export const watchForFeedback = async params => {
       // Check if we've reached max iterations
       if (autoRestartCount >= maxAutoRestartIterations) {
         await log('');
-        await log(formatAligned('⚠️', 'MAX ITERATIONS REACHED', `Exiting auto-restart mode after ${autoRestartCount} attempts`));
+        await log(formatAligned('⚠️', 'MAX ITERATIONS REACHED', `Exiting auto-restart mode after ${autoRestartCount} iterations`));
         await log(formatAligned('', 'Some uncommitted changes may remain', '', 2));
         await log(formatAligned('', 'Please review and commit manually if needed', '', 2));
         await log('');