Merge remote-tracking branch 'origin/main' into copilot/fix-9fba8f91-6280-4ec9-89b0-5bcfcfeb9051

Author: Test User

.cursor/rules/sync-prs.mdc

@@ -0,0 +1,209 @@
+---
+description: Sync all open pull requests with origin/main to keep them up-to-date
+---
+
+# Sync Open PRs with origin/main
+
+This rule provides a systematic approach to keeping all open pull requests synchronized with the main branch.
+
+## Why Sync PRs?
+
+- Prevents merge conflicts from accumulating
+- Ensures PRs are tested against the latest codebase
+- Makes reviews easier by reducing the delta between PR and main
+- Identifies integration issues early
+
+## Prerequisites
+
+1. Ensure local main is up-to-date:
+   ```bash
+   git checkout main
+   git pull origin main
+   ```
+
+2. Fetch all remote branches:
+   ```bash
+   git fetch origin
+   ```
+
+## Process to Sync All Open PRs
+
+### Step 1: Get List of Open PRs
+
+Use GitHub API to list open PRs:
+```bash
+# Get current origin/main SHA
+git rev-parse origin/main
+
+# List open PRs (requires gh CLI or use GitHub API tools)
+# This will show PR numbers, branches, and base commit
+```
+
+### Step 2: Update Each PR Branch
+
+For each open PR branch:
+
+```bash
+# Checkout the PR branch
+git checkout <pr-branch-name>
+
+# Merge origin/main
+git merge origin/main --no-edit
+
+# If successful, push
+git push origin <pr-branch-name>
+```
+
+### Step 3: Handle Merge Conflicts
+
+When conflicts occur:
+
+1. **Identify conflicting files**:
+   ```bash
+   git status
+   ```
+
+2. **Resolve conflicts manually**:
+   - Read both versions carefully
+   - Understand the intent of each change
+   - Combine changes intelligently (don't just pick one side)
+   - Remove conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`)
+
+3. **Key principles for conflict resolution**:
+   - Preserve new functionality from main
+   - Keep PR-specific changes
+   - Ensure constants/config changes are consistent
+   - Test that the resolution compiles
+
+4. **Complete the merge**:
+   ```bash
+   git add <resolved-files>
+   git commit --no-edit
+   git push origin <pr-branch-name>
+   ```
+
+## Common Conflict Scenarios
+
+### Configuration Constants
+
+When both main and PR modify constants (e.g., `DEFAULT_MODEL`):
+- Use the value from main for default behavior
+- Keep PR-specific additions (e.g., new constants like `DEFAULT_TEMPERATURE`)
+- Ensure visibility (pub vs non-pub) is consistent with usage
+
+Example resolution:
+```rust
+// Keep main's default value
+pub const DEFAULT_MODEL: &str = "gpt-4.1";
+// Keep PR's new constant
+pub const DEFAULT_TEMPERATURE: f64 = 0.7;
+```
+
+### Struct Field Changes
+
+When both branches modify a struct:
+- Include all fields from both versions
+- Ensure derives are compatible (e.g., `Eq` only if all fields implement it)
+- Update corresponding methods to handle all fields
+
+### Import Conflicts
+
+When both branches add imports:
+- Keep all necessary imports
+- Follow Rust import conventions: std → external → internal
+- Remove duplicates
+- Alphabetize within groups
+
+## Automation Script Template
+
+```bash
+#!/bin/bash
+# sync-all-prs.sh - Sync all open PRs with origin/main
+
+set -e
+
+# Fetch latest
+git fetch origin
+
+# Get main SHA
+MAIN_SHA=$(git rev-parse origin/main)
+echo "Syncing PRs to main: $MAIN_SHA"
+
+# List of PR branches (populate from GitHub API)
+PR_BRANCHES=(
+  "copilot/fix-branch-1"
+  "copilot/fix-branch-2"
+  # ... add more branches
+)
+
+for branch in "${PR_BRANCHES[@]}"; do
+  echo "=== Syncing $branch ==="
+
+  # Checkout and merge
+  git checkout "$branch" || git checkout -b "$branch" "origin/$branch"
+
+  if git merge origin/main --no-edit; then
+    echo "✓ Merged successfully"
+    git push origin "$branch"
+  else
+    echo "✗ Merge conflict - manual resolution needed"
+    echo "  Conflicting files:"
+    git status --short | grep "^UU"
+    echo "  Resolve conflicts then run:"
+    echo "    git add <files> && git commit --no-edit && git push origin $branch"
+    exit 1
+  fi
+done
+
+# Return to main
+git checkout main
+echo "All PRs synced!"
+```
+
+## Best Practices
+
+1. **Sync regularly**: Update PRs weekly or after significant main branch changes
+2. **Test after sync**: Run tests to ensure the merge didn't break anything
+3. **Review conflicts carefully**: Don't blindly accept one side
+4. **Document complex resolutions**: Add comments explaining non-obvious merge decisions
+5. **Clean up**: Return to main branch when done
+6. **Verify builds**: Run `cargo check` or `cargo build` after resolving conflicts
+
+## Troubleshooting
+
+### "Your local changes would be overwritten"
+```bash
+# Stash or commit your changes first
+git stash
+# or
+git commit -am "WIP: save current work"
+```
+
+### "Branch is up to date" but GitHub shows behind
+```bash
+# Force fetch to update remote tracking
+git fetch origin --force
+```
+
+### Accidentally pushed broken code
+```bash
+# Fix the issue, then amend and force push (be careful!)
+git commit --amend --no-edit
+git push origin <branch> --force-with-lease
+```
+
+## Related Files
+
+- [src/config.rs](mdc:src/config.rs) - Often contains constants that conflict
+- [src/model.rs](mdc:src/model.rs) - Model definitions that may conflict
+- [Cargo.toml](mdc:Cargo.toml) - Dependency version conflicts
+
+## Verification Checklist
+
+After syncing each PR:
+- [ ] No merge conflict markers remain in code
+- [ ] Code compiles: `cargo check`
+- [ ] No new clippy warnings: `cargo clippy`
+- [ ] Tests pass: `cargo test`
+- [ ] PR branch is pushed to origin
+- [ ] GitHub shows PR is up-to-date with base branch

Dockerfile

@@ -1,5 +1,5 @@
 # Use an official Rust image as a parent image
-FROM rust:latest
+FROM rust:latest AS base
 
 # Install dependencies
 RUN apt-get update && apt-get install -y git fish
@@ -18,3 +18,47 @@ COPY ./scripts/integration-tests scripts/integration-tests
 
 # Run the script
 CMD ["fish", "./scripts/integration-tests"]
+
+# Target for testing PRs with GH CLI
+FROM rust:latest AS pr-tester
+
+# Install wget and GH CLI
+RUN apt-get update && apt-get install -y git fish wget \
+    && mkdir -p -m 755 /etc/apt/keyrings \
+    && wget -nv -O /tmp/githubcli-archive-keyring.gpg https://cli.github.com/packages/githubcli-archive-keyring.gpg \
+    && cat /tmp/githubcli-archive-keyring.gpg | tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null \
+    && chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg \
+    && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
+    && apt-get update \
+    && apt-get install -y gh \
+    && rm -rf /var/lib/apt/lists/* \
+    && git config --global user.email "test@example.com" \
+    && git config --global user.name "Test User"
+
+RUN rustup default nightly
+RUN rustup component add rust-std clippy rustc rustfmt --toolchain nightly
+
+# Copy .git directory into /source
+COPY .git /source/.git
+
+# Clone from local source into working directory
+WORKDIR /app
+
+RUN git clone --branch main /source /app --local
+RUN git remote set-url origin https://github.com/oleander/git-ai.git
+RUN git pull origin main
+RUN cargo fetch
+RUN cargo build
+RUN cargo clippy
+
+ARG PR_NUMBER
+ARG GH_TOKEN
+ENV GH_TOKEN=$GH_TOKEN
+RUN gh pr checkout $PR_NUMBER
+RUN cargo fetch
+RUN cargo build
+RUN cargo clippy
+
+# Default command that can be overridden
+SHELL ["/bin/bash", "-lc"]
+CMD ["bash"]

Justfile

@@ -27,3 +27,13 @@ integration-test:
     source .secrets
     docker build -t git-ai-test .
     docker run --rm git-ai-test -e OPENAI_API_KEY=$OPENAI_API_KEY
+
+# just pr 74 "cargo fmt --all"
+# just pr 74 "cargo build"
+pr PR_NUMBER CMD:
+    docker build --build-arg PR_NUMBER={{PR_NUMBER}} --build-arg GH_TOKEN=$(gh auth token) --target pr-tester -t git-ai-pr-tester .
+    docker run -i --rm -e GITHUB_TOKEN=$(gh auth token) git-ai-pr-tester bash -c "{{CMD}}"
+
+# Sync a specific PR with origin/main
+sync-pr PR_NUM:
+    just pr {{PR_NUM}} "git merge origin/main --no-edit && cargo fmt --check && cargo check && git push origin HEAD"

src/commit.rs

@@ -6,7 +6,7 @@ use async_openai::Client;
 use crate::{config, debug_output, openai, profile};
 use crate::model::Model;
 use crate::config::AppConfig;
-use crate::generation::multi_step::{generate_with_api, generate_local};
+use crate::generation::multi_step::{generate_local, generate_with_api};
 
 /// The instruction template included at compile time
 const INSTRUCTION_TEMPLATE: &str = include_str!("../resources/prompt.md");

src/generation/mod.rs

@@ -2,4 +2,4 @@ pub mod types;
 pub mod multi_step;
 
 pub use types::{CommitResponse, FileCategory, FileChange, OperationType};
-pub use multi_step::{generate_with_api, generate_local, generate_simple};
+pub use multi_step::{generate_local, generate_simple, generate_with_api};