@link-assistant/hive-mind 0.51.13 → 0.51.14

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @link-assistant/hive-mind
 
+## 0.51.14
+
+### Patch Changes
+
+- 4e4fe08: Improve fork divergence error message clarity
+  - Remove misleading "Option 3: Work without syncing fork (NOT RECOMMENDED)"
+  - Add new Option 1 for deleting and recreating fork (marked as SIMPLEST)
+  - Reorder options by simplicity: deletion → auto-resolution → manual resolution
+  - Move risk warnings inline with relevant options for better context
+  - Add comprehensive case study documentation in docs/case-studies/issue-972/
+
+  This change makes the error message more useful by removing options that were never actually viable and adding the fork deletion option as the cleanest solution for most fork divergence scenarios.
+
 ## 0.51.13
 
 ### Patch Changes

package/package.json

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

package/src/solve.repository.lib.mjs

@@ -946,18 +946,19 @@ export const setupUpstreamAndSync = async (tempDir, forkedRepo, upstreamRemote,
                     }
                   } else {
                     // Flag is not enabled - provide guidance
-                    await log('  ⚠️  RISKS of force-pushing:');
-                    await log('     • Overwrites fork history - any unique commits in your fork will be LOST');
-                    await log('     • Other collaborators working on your fork may face conflicts');
-                    await log('     • Cannot be undone - use with extreme caution');
-                    await log('');
                     await log('  💡 Your options:');
                     await log('');
-                    await log('     Option 1: Enable automatic force-push (DANGEROUS)');
+                    await log('     Option 1: Delete your fork and recreate it (SIMPLEST)');
+                    await log(`              gh repo delete ${forkedRepo}`);
+                    await log('              Then run the solve command again - the fork will be recreated automatically');
+                    await log('              ⚠️  Only use this if your fork has no unique commits you need to preserve');
+                    await log('');
+                    await log('     Option 2: Enable automatic force-push (DANGEROUS)');
                     await log('              Add --allow-fork-divergence-resolution-using-force-push-with-lease flag to your command');
                     await log('              This will automatically sync your fork with upstream using force-with-lease');
+                    await log('              ⚠️  Overwrites fork history - any unique commits will be LOST');
                     await log('');
-                    await log('     Option 2: Manually resolve the divergence');
+                    await log('     Option 3: Manually resolve the divergence');
                     await log('              1. Decide if you need any commits unique to your fork');
                     await log('              2. If yes, cherry-pick them after syncing');
                     await log('              3. If no, manually force-push:');
@@ -965,10 +966,6 @@ export const setupUpstreamAndSync = async (tempDir, forkedRepo, upstreamRemote,
                     await log(`                 git reset --hard upstream/${upstreamDefaultBranch}`);
                     await log(`                 git push --force origin ${upstreamDefaultBranch}`);
                     await log('');
-                    await log('     Option 3: Work without syncing fork (NOT RECOMMENDED)');
-                    await log('              Your fork will remain out-of-sync with upstream');
-                    await log('              May cause merge conflicts in pull requests');
-                    await log('');
                     await log('  🔧 To proceed with auto-resolution, restart with:');
                     await log(`     solve ${argv.url || argv['issue-url'] || argv._[0] || '<issue-url>'} --allow-fork-divergence-resolution-using-force-push-with-lease`);
                     await log('');