fix: pull with rebase before pushing to handle remote changes

- Add git pull --rebase before push to sync with remote branch
- Prevents non-fast-forward errors when remote has new commits
- Gracefully handles rebase failures and attempts push anyway

Author: Tulga Tsogtgerel

assistant/src/index.ts

@@ -253,9 +253,19 @@ Automatically generated by Auggie Assistant`;
 
   await exec.exec('git', ['commit', '-m', commitMessage]);
 
+  // Pull latest changes from remote branch with rebase to avoid conflicts
+  core.info(`🔄 Pulling latest changes from ${headBranch}...`);
+  const remoteUrl = `https://x-access-token:${githubToken}@github.com/${owner}/${repo}.git`;
+
+  try {
+    await exec.exec('git', ['pull', '--rebase', remoteUrl, headBranch]);
+    core.info('✅ Successfully rebased on latest changes');
+  } catch (error) {
+    core.warning('Pull with rebase failed, attempting to push anyway');
+  }
+
   // Push changes
   core.info(`🚀 Pushing to ${headBranch}...`);
-  const remoteUrl = `https://x-access-token:${githubToken}@github.com/${owner}/${repo}.git`;
   await exec.exec('git', ['push', remoteUrl, `HEAD:${headBranch}`]);
 
   core.info('✅ Changes committed and pushed successfully');