@link-assistant/hive-mind 0.41.2 → 0.41.3

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @link-assistant/hive-mind
 
+## 0.41.3
+
+### Patch Changes
+
+- db8cef7: Fix CLAUDE.md not being deleted in continue mode
+
+  When a work session completes successfully but the CLAUDE.md commit hash was lost between sessions (e.g., due to session interruption), the system now attempts to detect the CLAUDE.md commit from the branch structure instead of silently skipping cleanup.
+
+  **Safety Checks (Preventing Issue #617 Recurrence):**
+
+  1. CLAUDE.md must exist in current branch
+  2. Find merge base to isolate PR-only commits
+  3. Must have at least 2 commits (CLAUDE.md + actual work)
+  4. First commit message must match expected pattern
+  5. First commit must ONLY change CLAUDE.md file
+
+  Fixes #940
+
 ## 0.41.2
 
 ### Patch Changes

package/package.json

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

package/src/solve.results.lib.mjs

@@ -50,14 +50,151 @@ const { reportError } = sentryLib;
 const githubLinking = await import('./github-linking.lib.mjs');
 const { hasGitHubLinkingKeyword } = githubLinking;
 
+/**
+ * Detect the CLAUDE.md commit hash from branch structure when not available in session
+ * This handles continue mode where the commit hash was lost between sessions
+ *
+ * Safety checks to prevent Issue #617 (wrong commit revert):
+ * 1. Only look at commits on the PR branch (not default branch commits)
+ * 2. Verify the commit message matches our expected pattern
+ * 3. Verify the commit ONLY adds CLAUDE.md (no other files changed)
+ * 4. Verify there are additional commits after it (actual work was done)
+ *
+ * @param {string} tempDir - The temporary directory with the git repo
+ * @param {string} branchName - The PR branch name
+ * @returns {string|null} - The detected commit hash or null if not found/safe
+ */
+const detectClaudeMdCommitFromBranch = async (tempDir, branchName) => {
+  try {
+    await log('   Attempting to detect CLAUDE.md commit from branch structure...', { verbose: true });
+
+    // First check if CLAUDE.md exists in current branch
+    const claudeMdExistsResult = await $({ cwd: tempDir })`git ls-files CLAUDE.md 2>&1`;
+    if (claudeMdExistsResult.code !== 0 || !claudeMdExistsResult.stdout || !claudeMdExistsResult.stdout.trim()) {
+      await log('   CLAUDE.md does not exist in current branch', { verbose: true });
+      return null;
+    }
+
+    // Get the default branch to find the fork point
+    const defaultBranchResult = await $({ cwd: tempDir })`git symbolic-ref refs/remotes/origin/HEAD 2>&1`;
+    let defaultBranch = 'main';
+    if (defaultBranchResult.code === 0 && defaultBranchResult.stdout) {
+      const match = defaultBranchResult.stdout.toString().match(/refs\/remotes\/origin\/(.+)/);
+      if (match) {
+        defaultBranch = match[1].trim();
+      }
+    }
+    await log(`   Using default branch: ${defaultBranch}`, { verbose: true });
+
+    // Find the merge base (fork point) between current branch and default branch
+    const mergeBaseResult = await $({ cwd: tempDir })`git merge-base origin/${defaultBranch} HEAD 2>&1`;
+    if (mergeBaseResult.code !== 0 || !mergeBaseResult.stdout) {
+      await log('   Could not find merge base, cannot safely detect CLAUDE.md commit', { verbose: true });
+      return null;
+    }
+    const mergeBase = mergeBaseResult.stdout.toString().trim();
+    await log(`   Merge base: ${mergeBase.substring(0, 7)}`, { verbose: true });
+
+    // Get all commits on the PR branch (commits after the merge base)
+    // Format: hash|message|files_changed
+    const branchCommitsResult = await $({ cwd: tempDir })`git log ${mergeBase}..HEAD --reverse --format="%H|%s" 2>&1`;
+    if (branchCommitsResult.code !== 0 || !branchCommitsResult.stdout) {
+      await log('   No commits found on PR branch', { verbose: true });
+      return null;
+    }
+
+    const branchCommits = branchCommitsResult.stdout.toString().trim().split('\n').filter(Boolean);
+    if (branchCommits.length === 0) {
+      await log('   No commits found on PR branch', { verbose: true });
+      return null;
+    }
+
+    await log(`   Found ${branchCommits.length} commit(s) on PR branch`, { verbose: true });
+
+    // Safety check: Must have at least 2 commits (CLAUDE.md commit + actual work)
+    if (branchCommits.length < 2) {
+      await log('   Only 1 commit on branch - not enough commits to safely revert CLAUDE.md', { verbose: true });
+      await log('   (Need at least 2 commits: CLAUDE.md initial + actual work)', { verbose: true });
+      return null;
+    }
+
+    // Get the first commit on the PR branch
+    const firstCommitLine = branchCommits[0];
+    const [firstCommitHash, firstCommitMessage] = firstCommitLine.split('|');
+
+    await log(`   First commit on branch: ${firstCommitHash.substring(0, 7)} - "${firstCommitMessage}"`, { verbose: true });
+
+    // Safety check: Verify commit message matches expected pattern
+    const expectedMessagePatterns = [
+      /^Initial commit with task details/i,
+      /^Add CLAUDE\.md/i,
+      /^CLAUDE\.md/i
+    ];
+
+    const messageMatches = expectedMessagePatterns.some(pattern => pattern.test(firstCommitMessage));
+    if (!messageMatches) {
+      await log('   First commit message does not match expected CLAUDE.md pattern', { verbose: true });
+      await log('   Expected patterns: "Initial commit with task details...", "Add CLAUDE.md", etc.', { verbose: true });
+      return null;
+    }
+
+    // Safety check: Verify the commit ONLY adds CLAUDE.md file (no other files)
+    const filesChangedResult = await $({ cwd: tempDir })`git diff-tree --no-commit-id --name-only -r ${firstCommitHash} 2>&1`;
+    if (filesChangedResult.code !== 0 || !filesChangedResult.stdout) {
+      await log('   Could not get files changed in first commit', { verbose: true });
+      return null;
+    }
+
+    const filesChanged = filesChangedResult.stdout.toString().trim().split('\n').filter(Boolean);
+    await log(`   Files changed in first commit: ${filesChanged.join(', ')}`, { verbose: true });
+
+    // Check if CLAUDE.md is in the files changed
+    if (!filesChanged.includes('CLAUDE.md')) {
+      await log('   First commit does not include CLAUDE.md', { verbose: true });
+      return null;
+    }
+
+    // CRITICAL SAFETY CHECK: Only allow revert if CLAUDE.md is the ONLY file changed
+    // This prevents Issue #617 where reverting a commit deleted .gitignore, LICENSE, README.md
+    if (filesChanged.length > 1) {
+      await log(`   ⚠️  First commit changes more than just CLAUDE.md (${filesChanged.length} files)`, { verbose: true });
+      await log(`   Files: ${filesChanged.join(', ')}`, { verbose: true });
+      await log('   Refusing to revert to prevent data loss (Issue #617 safety)', { verbose: true });
+      return null;
+    }
+
+    // All safety checks passed!
+    await log(`   ✅ Detected CLAUDE.md commit: ${firstCommitHash.substring(0, 7)}`, { verbose: true });
+    await log('   ✅ Commit only contains CLAUDE.md (safe to revert)', { verbose: true });
+    await log(`   ✅ Branch has ${branchCommits.length - 1} additional commit(s) (work was done)`, { verbose: true });
+
+    return firstCommitHash;
+  } catch (error) {
+    reportError(error, {
+      context: 'detect_claude_md_commit',
+      tempDir,
+      branchName,
+      operation: 'detect_commit_from_branch_structure'
+    });
+    await log(`   Error detecting CLAUDE.md commit: ${error.message}`, { verbose: true });
+    return null;
+  }
+};
+
 // Revert the CLAUDE.md commit to restore original state
 export const cleanupClaudeFile = async (tempDir, branchName, claudeCommitHash = null) => {
   try {
-    // Only revert if we have the commit hash from this session
-    // This prevents reverting the wrong commit in continue mode
+    // If no commit hash provided, try to detect it from branch structure
+    // This handles continue mode where the hash was lost between sessions
     if (!claudeCommitHash) {
-      await log('   No CLAUDE.md commit to revert (not created in this session)', { verbose: true });
-      return;
+      await log('   No CLAUDE.md commit hash from session, attempting to detect from branch...', { verbose: true });
+      claudeCommitHash = await detectClaudeMdCommitFromBranch(tempDir, branchName);
+
+      if (!claudeCommitHash) {
+        await log('   Could not safely detect CLAUDE.md commit to revert', { verbose: true });
+        return;
+      }
+      await log(`   Detected CLAUDE.md commit: ${claudeCommitHash.substring(0, 7)}`, { verbose: true });
     }
 
     await log(formatAligned('🔄', 'Cleanup:', 'Reverting CLAUDE.md commit'));