Update dependencies and improve diff line handling logic (#56)

Author: oleander

.github/copilot-instructions.md

@@ -37,7 +37,10 @@ jobs:
           - os: ubuntu-latest
             target: x86_64-unknown-linux-musl
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
 
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@nightly
@@ -84,7 +87,8 @@ jobs:
     runs-on: ubuntu-latest
     needs: artifact
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
+      - uses: Swatinem/rust-cache@v2
 
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@nightly

.github/workflows/cd.yml

@@ -10,30 +10,23 @@ concurrency:
 
 env:
   CARGO_TERM_COLOR: always
+  OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v5
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
 
       - name: Setup nightly toolchain
         uses: actions-rs/toolchain@v1
         with:
           components: rustfmt, clippy
           toolchain: nightly
 
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-nightly-${{ hashFiles('**/Cargo.lock') }}
-
       - name: Run clippy
         uses: actions-rs/cargo@v1
         with:
@@ -45,6 +38,7 @@ jobs:
         with:
           command: fmt
           args: -- --check
+
   test:
     needs: lint
     strategy:
@@ -55,8 +49,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     continue-on-error: false
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v5
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
 
       - name: Set up Rust
         uses: actions-rs/toolchain@v1
@@ -65,29 +61,18 @@ jobs:
           override: true
           profile: minimal
 
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-${{ matrix.rust }}-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: ${{ runner.os }}-${{ matrix.rust }}-
-
-      - name: Install fish on linux
+      - name: Install fish (Linux)
         if: startsWith(matrix.os, 'ubuntu')
-        run: sudo apt-get install fish
+        run: sudo apt install fish
 
-      - name: Install fish on macos
+      - name: Install fish (macOS)
         if: startsWith(matrix.os, 'macos')
         run: brew install fish
 
       - name: Run integration tests
-        run: |
-          ./scripts/integration-tests
-          cargo build --release
-          cargo test --release
-        env:
-          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+        run: fish ./scripts/integration-tests
+
+      - name: Run cargo test
+        uses: actions-rs/cargo@v1
+        with:
+          command: test

.github/workflows/ci.yml

@@ -0,0 +1,47 @@
+---
+name: "Copilot Setup Steps"
+
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+  pull_request:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}-copilot-setup-steps
+  cancel-in-progress: true
+
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  CARGO_TERM_COLOR: always
+
+jobs:
+  copilot-setup-steps:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      actions: write
+      packages: write
+      pull-requests: write
+      issues: write
+      checks: write
+      deployments: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      - name: Cache Rust dependencies
+        uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+
+      - name: Setup Rust nightly toolchain
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+
+      - run: cargo install --path . --debug
+      - run: git ai hook install
+      - run: git ai config set openai-api-key ${{ secrets.OPENAI_API_KEY }}
+      - run: git ai config set model gpt-4.1

.github/workflows/copilot-setup-steps.yml

@@ -10,3 +10,4 @@ finetune_verify.jsonl
 finetune_train.jsonl
 
 **/.claude/settings.local.json
+test-repo/

.gitignore

@@ -111,10 +111,12 @@ The project is structured into several core components:
 
 8. **Function Calling** (`src/function_calling.rs`): Implements OpenAI function calling for structured commit message generation with reasoning and file change summaries.
 
-9. **Multi-Step Analysis** (`src/multi_step_analysis.rs` and `src/multi_step_integration.rs`): Implements the sophisticated divide-and-conquer approach that analyzes files individually, calculates impact scores, and generates multiple commit message candidates.
+9. **Multi-Step Analysis** (`src/multi_step_analysis.rs` and `src/multi_step_integration.rs`): Implements the sophisticated divide-and-conquer approach that analyzes files individually, calculates impact scores, and generates multiple commit message candidates. The integration module uses parallel processing via `join_all` to analyze multiple files concurrently.
 
 10. **Profiling** (`src/profiling.rs`): Performance profiling utilities to measure execution time of various operations.
 
+11. **Debug Output** (`src/debug_output.rs`): Provides debugging session tracking for multi-step analysis, including file analysis results, timings, and payloads.
+
 ## Key Workflows
 
 1. **Hook Installation**: When `git-ai hook install` is run, the tool symlinks its executable to the repository's `.git/hooks/prepare-commit-msg` hook.
@@ -160,6 +162,12 @@ cargo test
 # Run specific tests
 cargo test test_empty_diff
 
+# Run specific test with debugging output
+RUST_LOG=debug cargo test --lib -- multi_step_integration::tests::test_parse_diff_with_c_i_prefixes --exact --nocapture
+
+# Run all multi-step integration tests
+RUST_LOG=debug cargo test --lib multi_step_integration::tests --no-fail-fast
+
 # Run comprehensive tests
 ./scripts/comprehensive-tests
 
@@ -186,3 +194,37 @@ git commit --all --no-edit
 ```
 
 The commit message will be automatically generated based on the staged changes.
+
+## Code Style and Conventions
+
+Based on the project's Cursor rules:
+
+### Formatting
+- Use `rustfmt.toml` with `edition = "2021"` and `max_width = 100`
+- Keep imports grouped: std → external → internal, then alphabetized
+- Run `cargo fmt` before committing
+
+### Naming
+- snake_case for items and functions
+- SCREAMING_SNAKE_CASE for constants
+- PascalCase for types and traits
+- crate names use kebab-case
+
+### Error Handling
+- Use `thiserror` for typed errors; `anyhow::Result<T>` for binaries
+- Prefer `?` operator over `unwrap`/`expect` in library code
+
+### Module Organization
+- Files with underscores should be nested directories (e.g., `foo_bar.rs` → `foo/bar.rs`)
+- Public re-exports go in `lib.rs` for clean API surface
+- Avoid deep module trees (>3 levels)
+
+### Testing
+- Each module should have `#[cfg(test)] mod tests { use super::*; ... }`
+- Integration tests in `tests/` directory use only public API
+- Run tests with debugging: `RUST_LOG=debug cargo test`
+
+### Performance
+- Use parallel processing for large operations (see `multi_step_integration.rs` using `join_all`)
+- Token management and smart truncation for API limits
+- Profile with `profiling.rs` utilities

CLAUDE.md

@@ -48,8 +48,8 @@ tracing = "0.1"
 # CLI and UI
 
 colored = "3.0.0"
-console = { version = "0.15.11", default-features = false }
-indicatif = { version = "0.17.11", default-features = false }
+console = { version = "0.16", default-features = false }
+indicatif = { version = "0.18", default-features = false }
 log = "0.4.27"
 env_logger = { version = "0.11.8", default-features = false }
 
@@ -65,7 +65,7 @@ serde_ini = "0.2.0"
 serde_json = "1.0"
 
 # OpenAI integration
-async-openai = { version = "0.28.1", default-features = false }
+async-openai = { version = "0.29", default-features = false }
 tiktoken-rs = "0.7.0"
 reqwest = { version = "0.12.15", default-features = true }