Improve CLI defaults and PR workflow safeguards

Author: haasonsaas

.github/workflows/diffscope.yml

@@ -14,7 +14,7 @@ concurrency:
 jobs:
   review:
     runs-on: ubuntu-latest
-    if: github.event.pull_request.head.repo.full_name == github.repository
+    if: github.event.pull_request.head.repo.full_name == github.repository && !github.event.pull_request.draft
     steps:
       - uses: actions/checkout@v4
         with:

README.md

@@ -123,6 +123,9 @@ git diff | diffscope smart-review --model claude-3-5-sonnet-20241022
 export OPENAI_API_KEY=your-key
 git diff | diffscope review --model gpt-4o
 
+# Force OpenAI Responses API usage
+git diff | diffscope review --openai-responses true
+
 # Anthropic Claude
 export ANTHROPIC_API_KEY=your-key  
 git diff | diffscope review --model claude-3-5-sonnet-20241022
@@ -482,13 +485,16 @@ diffscope smart-review [--diff file.patch]
 # Git integration
 diffscope git uncommitted    # Review uncommitted changes
 diffscope git staged         # Review staged changes
-diffscope git branch [base]  # Compare against branch (default: main)
+diffscope git branch [base]  # Compare against branch (default: repo default)
 diffscope git suggest        # Generate commit messages
 diffscope git pr-title       # Generate PR titles
 
 # Pull request operations
 diffscope pr [--number N] [--post-comments] [--summary]
 
+# Repository check (uncommitted changes at path)
+diffscope check [path]
+
 # File comparison
 diffscope compare --old-file old.py --new-file new.py
 

src/main.rs

@@ -31,6 +31,9 @@ struct Cli {
     #[arg(long, global = true)]
     max_tokens: Option<usize>,
 
+    #[arg(long, global = true, value_parser = clap::value_parser!(bool))]
+    openai_responses: Option<bool>,
+
     #[arg(long, global = true, default_value = "json")]
     output_format: OutputFormat,
 
@@ -115,8 +118,8 @@ enum GitCommands {
     Uncommitted,
     Staged,
     Branch {
-        #[arg(default_value = "main")]
-        base: String,
+        #[arg(help = "Base branch/ref (defaults to repo default)")]
+        base: Option<String>,
     },
     Suggest,
     PrTitle,
@@ -152,6 +155,9 @@ async fn main() -> Result<()> {
     if let Some(tokens) = cli.max_tokens {
         config.max_tokens = tokens;
     }
+    if let Some(flag) = cli.openai_responses {
+        config.openai_use_responses = Some(flag);
+    }
     config.normalize();
 
     match cli.command {
@@ -397,8 +403,12 @@ async fn git_command(
             git.get_staged_diff()?
         }
         GitCommands::Branch { base } => {
-            info!("Analyzing changes from branch: {}", base);
-            git.get_branch_diff(&base)?
+            let base_branch = base.unwrap_or_else(|| {
+                git.get_default_branch()
+                    .unwrap_or_else(|_| "main".to_string())
+            });
+            info!("Analyzing changes from branch: {}", base_branch);
+            git.get_branch_diff(&base_branch)?
         }
         GitCommands::Suggest => {
             return suggest_commit_message(config).await;