@link-assistant/hive-mind 1.50.0 → 1.50.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @link-assistant/hive-mind
 
+## 1.50.1
+
+### Patch Changes
+
+- 494989e: Add paths filter to CI/CD workflow trigger to skip unnecessary runs for non-code file changes (#1582)
+- c4fadea: fix: prevent push failures in auto-restart and cleanup by syncing with remote (#1572)
+  - Add `git pull` before restart sessions and cleanup push to prevent stale local state
+  - Add `2>&1` to all `git push` commands so stderr is captured for proper error handling
+  - Fix multi-line log message formatting to include timestamps on each line
+
 ## 1.50.0
 
 ### Minor Changes

package/package.json

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

package/src/agent.lib.mjs

@@ -1082,12 +1082,12 @@ export const checkForUncommittedChanges = async (tempDir, owner, repo, branchNam
             if (commitResult.code === 0) {
               await log('✅ Changes committed successfully');
 
-              const pushResult = await $({ cwd: tempDir })`git push origin ${branchName}`;
+              const pushResult = await $({ cwd: tempDir })`git push origin ${branchName} 2>&1`;
 
               if (pushResult.code === 0) {
                 await log('✅ Changes pushed successfully');
               } else {
-                await log(`⚠️ Warning: Could not push changes: ${pushResult.stderr?.toString().trim()}`, {
+                await log(`⚠️ Warning: Could not push changes: ${pushResult.stderr?.toString().trim() || pushResult.stdout?.toString().trim()}`, {
                   level: 'warning',
                 });
               }

package/src/claude.lib.mjs

@@ -1449,11 +1449,11 @@ export const checkForUncommittedChanges = async (tempDir, owner, repo, branchNam
             if (commitResult.code === 0) {
               await log('✅ Changes committed successfully');
               await log('📤 Pushing changes to remote...');
-              const pushResult = await $({ cwd: tempDir })`git push origin ${branchName}`;
+              const pushResult = await $({ cwd: tempDir })`git push origin ${branchName} 2>&1`;
               if (pushResult.code === 0) {
                 await log('✅ Changes pushed successfully');
               } else {
-                await log(`⚠️ Warning: Could not push changes: ${pushResult.stderr?.toString().trim()}`, {
+                await log(`⚠️ Warning: Could not push changes: ${pushResult.stderr?.toString().trim() || pushResult.stdout?.toString().trim()}`, {
                   level: 'warning',
                 });
               }

package/src/codex.lib.mjs

@@ -492,12 +492,12 @@ export const checkForUncommittedChanges = async (tempDir, owner, repo, branchNam
             if (commitResult.code === 0) {
               await log('✅ Changes committed successfully');
 
-              const pushResult = await $({ cwd: tempDir })`git push origin ${branchName}`;
+              const pushResult = await $({ cwd: tempDir })`git push origin ${branchName} 2>&1`;
 
               if (pushResult.code === 0) {
                 await log('✅ Changes pushed successfully');
               } else {
-                await log(`⚠️ Warning: Could not push changes: ${pushResult.stderr?.toString().trim()}`, {
+                await log(`⚠️ Warning: Could not push changes: ${pushResult.stderr?.toString().trim() || pushResult.stdout?.toString().trim()}`, {
                   level: 'warning',
                 });
               }

package/src/lib.mjs

@@ -83,8 +83,13 @@ export const log = async (message, options = {}) => {
   }
 
   // Write to file if log file is set
+  // Issue #1572: Handle multi-line messages by timestamping each line,
+  // so continuation lines don't appear without timestamps in the log file
   if (logFile) {
-    const logMessage = `[${new Date().toISOString()}] [${level.toUpperCase()}] ${message}`;
+    const timestamp = new Date().toISOString();
+    const prefix = `[${timestamp}] [${level.toUpperCase()}]`;
+    const lines = String(message).split('\n');
+    const logMessage = lines.map(line => `${prefix} ${line}`).join('\n');
     await fs.appendFile(logFile, logMessage + '\n').catch(error => {
       // Silent fail for file append errors to avoid infinite loop
       // but report to Sentry in verbose mode

package/src/opencode.lib.mjs

@@ -546,12 +546,12 @@ export const checkForUncommittedChanges = async (tempDir, owner, repo, branchNam
             if (commitResult.code === 0) {
               await log('✅ Changes committed successfully');
 
-              const pushResult = await $({ cwd: tempDir })`git push origin ${branchName}`;
+              const pushResult = await $({ cwd: tempDir })`git push origin ${branchName} 2>&1`;
 
               if (pushResult.code === 0) {
                 await log('✅ Changes pushed successfully');
               } else {
-                await log(`⚠️ Warning: Could not push changes: ${pushResult.stderr?.toString().trim()}`, {
+                await log(`⚠️ Warning: Could not push changes: ${pushResult.stderr?.toString().trim() || pushResult.stdout?.toString().trim()}`, {
                   level: 'warning',
                 });
               }

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

@@ -76,6 +76,14 @@ export const runAutoEnsureRequirements = async ({ issueUrl, owner, repo, issueNu
   for (let ensureIteration = 1; ensureIteration <= finalizeCount; ensureIteration++) {
     await log(`🔄 FINALIZE iteration ${ensureIteration}/${finalizeCount}: Restarting to verify requirements...`);
 
+    // Issue #1572: Sync local branch with remote before each finalize iteration
+    const pullResult = await $({ cwd: tempDir })`git pull origin ${branchName} 2>&1`;
+    if (pullResult.code === 0) {
+      await log(`   Synced local branch ${branchName} from remote`, { verbose: true });
+    } else {
+      throw new Error(`git pull failed (code ${pullResult.code}): ${pullResult.stdout || pullResult.stderr || 'no output'}`);
+    }
+
     const ensureFeedbackLines = ['', '='.repeat(60), '🔍 FINALIZE REQUIREMENTS CHECK:', '='.repeat(60), '', 'We need to ensure all changes are correct, consistent, validated, tested, logged and fully meet all discussed requirements (check issue description and all comments in issue and in pull request). Ensure all CI/CD checks pass.', ''];
 
     const ensureResult = await executeToolIteration({

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

@@ -976,6 +976,16 @@ Once the billing issue is resolved, you can re-run the CI checks or push a new c
         const prStateResult = await $`gh api repos/${owner}/${repo}/pulls/${prNumber} --jq '.mergeStateStatus'`;
         const mergeStateStatus = prStateResult.code === 0 ? prStateResult.stdout.toString().trim() : null;
 
+        // Issue #1572: Sync local branch with remote before restarting to avoid push failures.
+        // Without this, the restarted session works on stale local state and can't push.
+        const effectiveBranch = prBranch || branchName;
+        const pullResult = await $({ cwd: tempDir })`git pull origin ${effectiveBranch} 2>&1`;
+        if (pullResult.code === 0) {
+          await log(formatAligned('🔄', 'Synced:', `Local branch ${effectiveBranch} updated from remote`));
+        } else {
+          throw new Error(`git pull failed (code ${pullResult.code}): ${pullResult.stdout || pullResult.stderr || 'no output'}`);
+        }
+
         // Execute the AI tool using shared utility
         await log(formatAligned('🔄', 'Restarting:', `Running ${argv.tool.toUpperCase()} to address issues...`));
 

package/src/solve.mjs

@@ -573,12 +573,12 @@ try {
       const mergeResult = await $({ cwd: tempDir })`git merge ${defaultBranch} --no-edit`;
       if (mergeResult.code === 0) {
         await log(`${formatAligned('✅', 'Merge successful:', 'Pushing merged branch...')}`);
-        const pushResult = await $({ cwd: tempDir })`git push origin ${branchName}`;
+        const pushResult = await $({ cwd: tempDir })`git push origin ${branchName} 2>&1`;
         if (pushResult.code === 0) {
           await log(`${formatAligned('✅', 'Push successful:', 'Branch updated with latest changes')}`);
         } else {
           await log(`${formatAligned('⚠️', 'Push failed:', 'Merge completed but push failed')}`, { level: 'warning' });
-          await log(`  Error: ${pushResult.stderr?.toString() || 'Unknown error'}`, { level: 'warning' });
+          await log(`  Error: ${pushResult.stderr?.toString() || pushResult.stdout?.toString() || 'Unknown error'}`, { level: 'warning' });
         }
       } else {
         // Merge failed - likely due to conflicts
@@ -1343,13 +1343,13 @@ try {
     await log('');
 
     try {
-      const pushResult = await $({ cwd: tempDir })`git push origin ${branchName}`;
+      const pushResult = await $({ cwd: tempDir })`git push origin ${branchName} 2>&1`;
       if (pushResult.code === 0) {
         await log('✅ Changes pushed successfully to remote branch');
         await log(`   Branch: ${branchName}`);
         await log('');
       } else {
-        const errorMsg = pushResult.stderr?.toString() || 'Unknown error';
+        const errorMsg = pushResult.stderr?.toString() || pushResult.stdout?.toString() || 'Unknown error';
         await log('⚠️  Push failed:', { level: 'error' });
         await log(`   ${errorMsg.trim()}`, { level: 'error' });
         await log('   Please push manually:', { level: 'error' });

package/src/solve.repository.lib.mjs

@@ -1113,12 +1113,12 @@ export const setupUpstreamAndSync = async (tempDir, forkedRepo, upstreamRemote,
 
               // Step 3: Push the updated default branch to fork to keep it in sync
               await log(`${formatAligned('🔄', 'Pushing to fork:', `${upstreamDefaultBranch} branch`)}`);
-              const pushResult = await $({ cwd: tempDir })`git push origin ${upstreamDefaultBranch}`;
+              const pushResult = await $({ cwd: tempDir })`git push origin ${upstreamDefaultBranch} 2>&1`;
               if (pushResult.code === 0) {
                 await log(`${formatAligned('✅', 'Fork updated:', 'Default branch pushed to fork')}`);
               } else {
                 // Check if it's a non-fast-forward error (fork has diverged from upstream)
-                const errorMsg = pushResult.stderr ? pushResult.stderr.toString().trim() : '';
+                const errorMsg = (pushResult.stderr ? pushResult.stderr.toString().trim() : '') || (pushResult.stdout ? pushResult.stdout.toString().trim() : '');
                 const isNonFastForward = errorMsg.includes('non-fast-forward') || errorMsg.includes('rejected') || errorMsg.includes('tip of your current branch is behind');
 
                 if (isNonFastForward) {
@@ -1147,7 +1147,7 @@ export const setupUpstreamAndSync = async (tempDir, forkedRepo, upstreamRemote,
                     await log(`${formatAligned('🔄', 'Force pushing:', 'Syncing fork with upstream (--force-with-lease)')}`);
                     const forcePushResult = await $({
                       cwd: tempDir,
-                    })`git push --force-with-lease origin ${upstreamDefaultBranch}`;
+                    })`git push --force-with-lease origin ${upstreamDefaultBranch} 2>&1`;
 
                     if (forcePushResult.code === 0) {
                       await log(`${formatAligned('✅', 'Fork synced:', 'Successfully force-pushed to align with upstream')}`);

package/src/solve.results.lib.mjs

@@ -269,6 +269,15 @@ export const cleanupClaudeFile = async (tempDir, branchName, claudeCommitHash =
     await log(formatAligned('🔄', 'Cleanup:', `Reverting ${fileName} commit`));
     await log(`   Using saved commit hash: ${claudeCommitHash.substring(0, 7)}...`, { verbose: true });
 
+    // Issue #1572: Sync local branch with remote before cleanup to prevent push failures.
+    // After auto-restart sessions, the local branch may be behind the remote.
+    const pullResult = await $({ cwd: tempDir })`git pull origin ${branchName} 2>&1`;
+    if (pullResult.code === 0) {
+      await log(`   Synced local branch before cleanup`, { verbose: true });
+    } else {
+      throw new Error(`git pull failed (code ${pullResult.code}): ${pullResult.stdout || pullResult.stderr || 'no output'}`);
+    }
+
     const commitToRevert = claudeCommitHash;
 
     // APPROACH 3: Check for modifications before reverting (proactive detection)