@link-assistant/hive-mind 1.49.3 → 1.50.1

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @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
+
+- 4aed1c1: fix: interactive mode GitHub comments display improvements (#1576)
+  - Fix agent task comments stuck at "⏳ Running..." by propagating taskId through comment queue
+  - Fix misleading token counts by preferring modelUsage (cumulative per-model) over usage (last-iteration)
+  - Change truncation format from "[N lines truncated]" to "[X-Y lines are omitted]" showing actual line range
+  - Rename "Session Complete" to "Interactive session completed"
+  - Rename Write tool "Content" to "Change", expand by default, add line numbers to diffs
+  - Show checked/total count in TodoWrite: "Todos (2/9 items)" instead of "Todos (9 items)"
+  - Make Task prompt and Edit Change sections expanded by default
+  - Add ToolSearch-specific display with Query/Max Results fields
+  - Mark sub-agent tasks with 🤖🔀 emoji and Agent ID field
+  - Add queue flushing before waiting for comment IDs in task progress/notification handlers
+
 ## 1.49.3
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-assistant/hive-mind",
-  "version": "1.49.3",
+  "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/interactive-mode.lib.mjs

@@ -143,9 +143,11 @@ const truncateMiddle = (content, options = {}) => {
 
   const startLines = lines.slice(0, keepStart);
   const endLines = lines.slice(-keepEnd);
-  const removedCount = lines.length - keepStart - keepEnd;
+  // Show the actual line number range that was omitted (1-based)
+  const omitStart = keepStart + 1;
+  const omitEnd = lines.length - keepEnd;
 
-  return sanitizeUnicode([...startLines, '', `... [${removedCount} lines truncated] ...`, '', ...endLines].join('\n'));
+  return sanitizeUnicode([...startLines, '', `... [${omitStart}-${omitEnd} lines are omitted] ...`, '', ...endLines].join('\n'));
 };
 
 /**
@@ -278,6 +280,7 @@ const getToolIcon = toolName => {
     WebFetch: '🌐',
     WebSearch: '🔍',
     TodoWrite: '📋',
+    ToolSearch: '🔍',
     Task: '🎯',
     Agent: '🤖',
     NotebookEdit: '📓',
@@ -339,10 +342,11 @@ export const createInteractiveHandler = options => {
    * Post a comment to the PR (with rate limiting)
    * @param {string} body - Comment body
    * @param {string} [toolId] - Optional tool ID for tracking pending tool calls
+   * @param {string} [taskId] - Optional task ID for tracking pending agent tasks
    * @returns {Promise<string|null>} Comment ID if successful, null if queued or failed
    * @private
    */
-  const postComment = async (body, toolId = null) => {
+  const postComment = async (body, toolId = null, taskId = null) => {
     if (!prNumber || !owner || !repo) {
       if (verbose) {
         await log('⚠️ Interactive mode: Cannot post comment - missing PR info', { verbose: true });
@@ -354,10 +358,10 @@ export const createInteractiveHandler = options => {
     const timeSinceLastComment = now - state.lastCommentTime;
 
     if (timeSinceLastComment < CONFIG.MIN_COMMENT_INTERVAL) {
-      // Queue the comment for later with toolId for tracking
-      state.commentQueue.push({ body, toolId });
+      // Queue the comment for later with toolId/taskId for tracking
+      state.commentQueue.push({ body, toolId, taskId });
       if (verbose) {
-        await log(`📝 Interactive mode: Comment queued (${state.commentQueue.length} in queue)${toolId ? ` [tool: ${toolId}]` : ''}`, { verbose: true });
+        await log(`📝 Interactive mode: Comment queued (${state.commentQueue.length} in queue)${toolId ? ` [tool: ${toolId}]` : ''}${taskId ? ` [task: ${taskId}]` : ''}`, { verbose: true });
       }
       return null;
     }
@@ -461,8 +465,8 @@ export const createInteractiveHandler = options => {
 
       const queueItem = state.commentQueue.shift();
       if (queueItem) {
-        const { body, toolId } = queueItem;
-        // Post the comment (don't pass toolId to avoid re-queueing)
+        const { body, toolId, taskId } = queueItem;
+        // Post the comment (don't pass toolId/taskId to avoid re-queueing)
         const commentId = await postComment(body);
 
         // If this was a tool use comment, update the pending call with the comment ID
@@ -481,6 +485,25 @@ export const createInteractiveHandler = options => {
             }
           }
         }
+
+        // If this was a task comment, update the pending task with the comment ID
+        // Fix: task comments previously lost their commentId when queued, causing
+        // task_notification edits to fail and leaving tasks stuck at "⏳ Running..."
+        // See: https://github.com/link-assistant/hive-mind/issues/1576
+        if (taskId && commentId) {
+          const pendingTask = state.pendingTasks.get(taskId);
+          if (pendingTask) {
+            pendingTask.commentId = commentId;
+            if (pendingTask.resolveCommentId) {
+              pendingTask.resolveCommentId(commentId);
+            }
+            if (verbose) {
+              await log(`📋 Interactive mode: Updated pending task ${taskId} with comment ID ${commentId}`, {
+                verbose: true,
+              });
+            }
+          }
+        }
       }
     }
 
@@ -613,26 +636,26 @@ ${createRawJsonSection(data)}`;
           keepStart: 12,
           keepEnd: 12,
         });
-        // Format content as diff with + prefix for added lines
+        // Format content as diff with + prefix and line numbers for added lines
         const diffContent = truncatedContent
           .split('\n')
-          .map(line => `+ ${line}`)
+          .map((line, i) => `+${String(i + 1).padStart(4)} | ${line}`)
           .join('\n');
-        inputDisplay += '\n\n' + createCollapsible('📄 Content', '```diff\n' + escapeMarkdown(diffContent) + '\n```');
+        inputDisplay += '\n\n' + createCollapsible('📄 Change', '```diff\n' + escapeMarkdown(diffContent) + '\n```', true);
       }
     } else if (toolName === 'Edit' && input.file_path) {
       inputDisplay = `**File:** \`${input.file_path}\``;
       if (input.old_string && input.new_string) {
         const truncatedOld = truncateMiddle(input.old_string, { maxLines: 15, keepStart: 6, keepEnd: 6 });
         const truncatedNew = truncateMiddle(input.new_string, { maxLines: 15, keepStart: 6, keepEnd: 6 });
-        // Format as unified diff with - for removed lines and + for added lines
+        // Format as unified diff with - for removed lines and + for added lines, with line numbers
         const diffOld = truncatedOld
           .split('\n')
-          .map(line => `- ${line}`)
+          .map((line, i) => `-${String(i + 1).padStart(4)} | ${line}`)
           .join('\n');
         const diffNew = truncatedNew
           .split('\n')
-          .map(line => `+ ${line}`)
+          .map((line, i) => `+${String(i + 1).padStart(4)} | ${line}`)
           .join('\n');
         inputDisplay += '\n\n' + createCollapsible('🔄 Change', '```diff\n' + escapeMarkdown(diffOld + '\n' + diffNew) + '\n```', true);
       }
@@ -665,13 +688,17 @@ ${createRawJsonSection(data)}`;
         todosPreview = [...startTodos, `- _...and ${skipped} more_`, ...endTodos].join('\n');
       }
 
-      inputDisplay = createCollapsible(`📋 Todos (${todos.length} items)`, todosPreview, true);
+      const completedCount = todos.filter(t => t.status === 'completed').length;
+      inputDisplay = createCollapsible(`📋 Todos (${completedCount}/${todos.length} items)`, todosPreview, true);
     } else if (toolName === 'Task') {
       inputDisplay = `**Description:** ${input.description || 'N/A'}`;
       if (input.prompt) {
         const truncatedPrompt = truncateMiddle(input.prompt, { maxLines: 20, keepStart: 8, keepEnd: 8 });
-        inputDisplay += '\n\n' + createCollapsible('📝 Prompt', truncatedPrompt);
+        inputDisplay += '\n\n' + createCollapsible('📝 Prompt', truncatedPrompt, true);
       }
+    } else if (toolName === 'ToolSearch') {
+      inputDisplay = `**Query:** \`${input.query || 'N/A'}\``;
+      if (input.max_results) inputDisplay += `\n**Max Results:** ${input.max_results}`;
     } else {
       // Generic input display
       const inputJson = truncateMiddle(safeJsonStringify(input, 2), {
@@ -885,7 +912,7 @@ ${createRawJsonSection(data)}`;
   const handleResult = async data => {
     const isError = data.is_error || false;
     const statusIcon = isError ? '❌' : '✅';
-    const statusText = isError ? 'Session Failed' : 'Session Complete';
+    const statusText = isError ? 'Interactive session failed' : 'Interactive session completed';
 
     // Format result text
     const resultText = data.result || '_No result message_';
@@ -913,9 +940,22 @@ ${createRawJsonSection(data)}`;
       statsTable += `| **Cost** | ${formatCost(data.total_cost_usd)} |\n`;
     }
 
-    // Usage breakdown if available
+    // Usage breakdown — prefer modelUsage (cumulative per-model totals including sub-agents)
+    // over usage (which only contains last-iteration tokens and is misleading).
+    // See: https://github.com/link-assistant/hive-mind/issues/1576
     let usageSection = '';
-    if (data.usage) {
+    if (data.modelUsage && Object.keys(data.modelUsage).length > 0) {
+      usageSection = '\n### 📊 Token Usage (by model)\n\n';
+      for (const [model, mu] of Object.entries(data.modelUsage)) {
+        usageSection += `**${model}:**\n\n| Type | Count |\n|------|-------|\n`;
+        if (mu.inputTokens) usageSection += `| Input | ${mu.inputTokens.toLocaleString()} |\n`;
+        if (mu.outputTokens) usageSection += `| Output | ${mu.outputTokens.toLocaleString()} |\n`;
+        if (mu.cacheCreationInputTokens) usageSection += `| Cache Creation | ${mu.cacheCreationInputTokens.toLocaleString()} |\n`;
+        if (mu.cacheReadInputTokens) usageSection += `| Cache Read | ${mu.cacheReadInputTokens.toLocaleString()} |\n`;
+        if (typeof mu.costUSD === 'number') usageSection += `| Cost | ${formatCost(mu.costUSD)} |\n`;
+        usageSection += '\n';
+      }
+    } else if (data.usage) {
       const u = data.usage;
       usageSection = '\n### 📊 Token Usage\n\n| Type | Count |\n|------|-------|\n';
       if (u.input_tokens) usageSection += `| Input | ${u.input_tokens.toLocaleString()} |\n`;
@@ -954,6 +994,7 @@ ${createRawJsonSection(data)}`;
     const toolUseId = data.tool_use_id || '';
     const description = data.description || 'Agent task';
     const taskType = data.task_type || 'unknown';
+    const agentId = data.agent_id || taskId;
 
     // Create a promise for the comment ID (handles queued comments)
     let resolveCommentId;
@@ -965,13 +1006,14 @@ ${createRawJsonSection(data)}`;
     let promptSection = '';
     if (data.prompt) {
       const truncatedPrompt = truncateMiddle(data.prompt, { maxLines: 15, keepStart: 6, keepEnd: 6 });
-      promptSection = '\n\n' + createCollapsible('📝 Task prompt', truncatedPrompt);
+      promptSection = '\n\n' + createCollapsible('📝 Task prompt', truncatedPrompt, true);
     }
 
-    const comment = `## 🤖 Agent task: ${escapeMarkdown(description)}
+    const comment = `## 🤖🔀 Agent task: ${escapeMarkdown(description)}
 
 | Property | Value |
 |----------|-------|
+| **Agent ID** | \`${agentId}\` |
 | **Task ID** | \`${taskId || 'unknown'}\` |
 | **Type** | \`${taskType}\` |
 | **Status** | ⏳ Running... |
@@ -988,12 +1030,13 @@ ${createRawJsonSection(data)}`;
       resolveCommentId,
       toolUseId,
       description,
+      agentId,
       lastProgressDescription: description,
       progressCount: 0,
       allEvents: [data],
     });
 
-    const commentId = await postComment(comment, null);
+    const commentId = await postComment(comment, null, taskId);
 
     if (commentId) {
       const pendingTask = state.pendingTasks.get(taskId);
@@ -1028,19 +1071,29 @@ ${createRawJsonSection(data)}`;
 
       let commentId = pendingTask.commentId;
 
-      // Wait for comment ID if not yet available
+      // Wait for comment ID if not yet available — flush queue first to avoid timeout
       if (!commentId && pendingTask.commentIdPromise) {
-        const timeoutPromise = new Promise(resolve => setTimeout(() => resolve(null), 15000));
-        commentId = await Promise.race([pendingTask.commentIdPromise, timeoutPromise]);
+        if (state.commentQueue.length > 0) {
+          const wasProcessing = state.isProcessing;
+          state.isProcessing = false;
+          await processQueue();
+          state.isProcessing = wasProcessing;
+        }
+        commentId = pendingTask.commentId;
+        if (!commentId) {
+          const timeoutPromise = new Promise(resolve => setTimeout(() => resolve(null), 15000));
+          commentId = await Promise.race([pendingTask.commentIdPromise, timeoutPromise]);
+        }
       }
 
       if (commentId) {
-        // Build progress steps list from accumulated events
+        // Build progress steps list from accumulated events, marking with agent ID
+        const agentTag = pendingTask.agentId ? `\`[${pendingTask.agentId}]\`` : '';
         const progressSteps = pendingTask.allEvents
           .filter(e => e.subtype === 'task_progress')
           .map(e => {
             const toolIcon = e.last_tool_name ? getToolIcon(e.last_tool_name) : '🔄';
-            return `- ${toolIcon} ${e.description || 'Working...'}`;
+            return `- 🔀 ${agentTag} ${toolIcon} ${e.description || 'Working...'}`;
           })
           .join('\n');
 
@@ -1048,10 +1101,11 @@ ${createRawJsonSection(data)}`;
         const toolUsesText = usage.tool_uses ? `${usage.tool_uses} tool calls` : '';
         const statsText = [durationText, toolUsesText].filter(Boolean).join(' | ');
 
-        const updatedComment = `## 🤖 Agent task: ${escapeMarkdown(pendingTask.description)}
+        const updatedComment = `## 🤖🔀 Agent task: ${escapeMarkdown(pendingTask.description)}
 
 | Property | Value |
 |----------|-------|
+| **Agent ID** | \`${pendingTask.agentId || taskId}\` |
 | **Task ID** | \`${taskId}\` |
 | **Status** | ⏳ Running... |
 | **Progress** | ${pendingTask.progressCount} updates |
@@ -1098,19 +1152,29 @@ ${createRawJsonSection(pendingTask.allEvents.slice(-3))}`;
 
       let commentId = pendingTask.commentId;
 
-      // Wait for comment ID if not yet available
+      // Wait for comment ID if not yet available — flush queue first to avoid timeout
       if (!commentId && pendingTask.commentIdPromise) {
-        const timeoutPromise = new Promise(resolve => setTimeout(() => resolve(null), 15000));
-        commentId = await Promise.race([pendingTask.commentIdPromise, timeoutPromise]);
+        if (state.commentQueue.length > 0) {
+          const wasProcessing = state.isProcessing;
+          state.isProcessing = false;
+          await processQueue();
+          state.isProcessing = wasProcessing;
+        }
+        commentId = pendingTask.commentId;
+        if (!commentId) {
+          const timeoutPromise = new Promise(resolve => setTimeout(() => resolve(null), 15000));
+          commentId = await Promise.race([pendingTask.commentIdPromise, timeoutPromise]);
+        }
       }
 
       if (commentId) {
-        // Build final progress steps list
+        // Build final progress steps list, marking with agent ID
+        const agentTag = pendingTask.agentId ? `\`[${pendingTask.agentId}]\`` : '';
         const progressSteps = pendingTask.allEvents
           .filter(e => e.subtype === 'task_progress')
           .map(e => {
             const toolIcon = e.last_tool_name ? getToolIcon(e.last_tool_name) : '🔄';
-            return `- ${toolIcon} ${e.description || 'Working...'}`;
+            return `- 🔀 ${agentTag} ${toolIcon} ${e.description || 'Working...'}`;
           })
           .join('\n');
 
@@ -1119,10 +1183,11 @@ ${createRawJsonSection(pendingTask.allEvents.slice(-3))}`;
         const tokensText = usage.total_tokens ? `${usage.total_tokens.toLocaleString()} tokens` : '';
         const statsText = [durationText, toolUsesText, tokensText].filter(Boolean).join(' | ');
 
-        const updatedComment = `## 🤖 Agent task: ${escapeMarkdown(pendingTask.description)}
+        const updatedComment = `## 🤖🔀 Agent task: ${escapeMarkdown(pendingTask.description)}
 
 | Property | Value |
 |----------|-------|
+| **Agent ID** | \`${pendingTask.agentId || taskId}\` |
 | **Task ID** | \`${taskId}\` |
 | **Status** | ${statusIcon} ${statusText} |
 | **Summary** | ${escapeMarkdown(summary)} |
@@ -1140,8 +1205,11 @@ ${createRawJsonSection([pendingTask.allEvents[0], data])}`;
       state.pendingTasks.delete(taskId);
     } else {
       // Post as standalone if no pending task
-      const comment = `## 🤖 Agent task ${statusIcon} ${statusText}
+      const agentId = data.agent_id || taskId;
+      const comment = `## 🤖🔀 Agent task ${statusIcon} ${statusText}
 
+| **Agent ID** | \`${agentId}\` |
+|---|---|
 **Summary:** ${escapeMarkdown(summary)}
 
 ---

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)