Skip to content

Commit ef852e6

Browse files
committed
Merge remote-tracking branch 'origin/main' into issue-1458-95ae87b62e25
2 parents 8a44735 + 3da9913 commit ef852e6

File tree

8 files changed

+21
-11
lines changed

8 files changed

+21
-11
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# @link-assistant/hive-mind
22

3+
## 1.35.3
4+
5+
### Patch Changes
6+
7+
- 22ae6d6: fix: rename "attempt" to "iteration" in auto-restart messages (Issue #1456)
8+
9+
The auto-restart PR comment title and log message now use "iteration" instead of "attempt" to match the project's terminology. Affected messages:
10+
- PR comment: `Auto-restart triggered (iteration N)` (was `attempt N`)
11+
- Log: `Exiting auto-restart mode after N iterations` (was `attempts`)
12+
313
## 1.35.2
414

515
### Patch Changes

docs/case-studies/issue-1389/CASE-STUDY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ All times UTC, from https://github.com/link-assistant/hive-mind/pull/1388
2424
| Time (UTC) | Event |
2525
| ----------------- | -------------------------------------------------------------------------------------------------- |
2626
| 09:24:34 | **Session 1** starts: initial solution draft log uploaded to PR #1388 |
27-
| 09:26:50 | Session 1: auto-restart triggered (attempt 1) due to CI failures |
27+
| 09:26:50 | Session 1: auto-restart triggered (iteration 1) due to CI failures |
2828
| 09:36:08 | Session 1 iteration 1: auto-restart-until-mergeable log uploaded (cost: $0.52) |
2929
| **09:37:14** | **Session 1**: `## ✅ Ready to merge` comment posted — all CI checks passed |
3030
| 09:51:14 | Human feedback: "Will it not break queue display that goes after claude limits section?" |

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@link-assistant/hive-mind",
3-
"version": "1.35.2",
3+
"version": "1.35.3",
44
"description": "AI-powered issue solver and hive mind for collaborative problem solving",
55
"main": "src/hive.mjs",
66
"type": "module",

src/solve.auto-merge.lib.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ Once the billing issue is resolved, you can re-run the CI checks or push a new c
658658
// Post a comment to PR about the restart
659659
// Issue #1356: Include restart count for tracking and add deduplication
660660
try {
661-
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.*`;
661+
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.*`;
662662
await $`gh pr comment ${prNumber} --repo ${owner}/${repo} --body ${commentBody}`;
663663
await log(formatAligned('', '💬 Posted auto-restart notification to PR', '', 2));
664664
} catch (commentError) {

src/solve.watch.lib.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ export const watchForFeedback = async params => {
112112
// Check if we've reached max iterations
113113
if (autoRestartCount >= maxAutoRestartIterations) {
114114
await log('');
115-
await log(formatAligned('⚠️', 'MAX ITERATIONS REACHED', `Exiting auto-restart mode after ${autoRestartCount} attempts`));
115+
await log(formatAligned('⚠️', 'MAX ITERATIONS REACHED', `Exiting auto-restart mode after ${autoRestartCount} iterations`));
116116
await log(formatAligned('', 'Some uncommitted changes may remain', '', 2));
117117
await log(formatAligned('', 'Please review and commit manually if needed', '', 2));
118118
await log('');

tests/test-auto-restart-usage-limit-1356.mjs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,15 +289,15 @@ test('wait is at least buffer duration even without a reset time', () => {
289289
assert(totalWaitMs === 10 * 60 * 1000, 'Wait should be exactly buffer when no reset time');
290290
});
291291

292-
// ===== Test: Auto-restart comment includes attempt number =====
292+
// ===== Test: Auto-restart comment includes iteration number =====
293293
console.log('\n📋 Auto-restart Comment Tracking Tests\n');
294294

295-
test('auto-restart comment includes attempt number', () => {
295+
test('auto-restart comment includes iteration number', () => {
296296
const restartCount = 3;
297297
const restartReason = 'CI failures detected';
298-
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.*`;
298+
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.*`;
299299

300-
assert(commentBody.includes('(attempt 3)'), 'Comment should include attempt number');
300+
assert(commentBody.includes('(iteration 3)'), 'Comment should include iteration number');
301301
assert(commentBody.includes('CI failures detected'), 'Comment should include reason');
302302
});
303303

tests/test-ready-to-merge-cross-session-1389.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ test('OLD BUG: Session 1 posts "Ready to merge" → Session 3 sees it in history
110110
// PR comment history after Session 1
111111
const allPrCommentBodies = [
112112
'## 🤖 Solution Draft Log\nCost: $0.729114...',
113-
'## 🔄 Auto-restart triggered (attempt 1)\n\nReason: CI failures...',
113+
'## 🔄 Auto-restart triggered (iteration 1)\n\nReason: CI failures...',
114114
'## 🔄 Auto-restart-until-mergeable Log (iteration 1)...',
115115
'## ✅ Ready to merge\n\nThis pull request is now ready to be merged:\n- All CI checks have passed\n...', // ← Session 1 comment
116116
'Human: "Will it not break queue display?"',

0 commit comments

Comments
 (0)