@@ -20,9 +20,7 @@ pub fn extractor_cli_config(_attr: TokenStream, item: TokenStream) -> TokenStrea
         .iter()
         .map(|f| {
             let ty_tip = get_type_tip(&f.ty);
-            if f.ident.as_ref().is_some_and(|i| i != "inputs")
-                && ty_tip.is_some_and(|i| i == "Vec")
-            {
+            if ty_tip.is_some_and(|i| i == "Vec") {
                 quote! {
                     #[serde(deserialize_with="deserialize::deserialize_newline_or_comma_separated_vec")]
                     #f
@@ -62,10 +60,6 @@ pub fn extractor_cli_config(_attr: TokenStream, item: TokenStream) -> TokenStrea
                     #[serde(skip_serializing_if="u8::is_zero")]
                     #id: u8
                 }
-            } else if id == &format_ident!("inputs") {
-                quote! {
-                    #f
-                }
             } else if type_tip.is_some_and(|i| i == "Vec" || i == "FxHashMap" || i == "HashMap") {
                 quote! {
                     #[arg(long)]
@@ -84,14 +78,8 @@ pub fn extractor_cli_config(_attr: TokenStream, item: TokenStream) -> TokenStrea
         .iter()
         .map(|f| {
             let id = f.ident.as_ref().unwrap();
-            if id == &format_ident!("inputs") {
-                quote! {
-                    .field("number of inputs", &self.#id.len())
-                }
-            } else {
-                quote! {
-                    .field(stringify!(#id), &self.#id)
-                }
+            quote! {
+                .field(stringify!(#id), &self.#id)
             }
         })
         .collect::<Vec<_>>();
 
@@ -62,7 +62,7 @@ pub struct Config {
     pub logging_flamegraph: Option<PathBuf>,
     pub logging_verbosity: Option<String>,
     pub trap_compression: Compression,
-    pub inputs: Vec<PathBuf>,
+    pub file_list: Option<PathBuf>,
     pub qltest: bool,
     pub qltest_cargo_check: bool,
     pub qltest_dependencies: Vec<String>,
@@ -95,9 +95,7 @@ impl Config {
     }
 
     pub fn extract() -> anyhow::Result<Config> {
-        let args = argfile::expand_args(argfile::parse_fromfile, argfile::PREFIX)
-            .context("expanding parameter files")?;
-        let cli_args = CliConfig::parse_from(args);
+        let cli_args = CliConfig::parse();
         let mut figment = Figment::new()
             .merge(Env::raw().filter_map(|f| {
                 if f.eq("CODEQL_VERBOSITY") {
 
@@ -15,7 +15,9 @@ use ra_ap_project_model::{CargoConfig, ProjectManifest};
 use ra_ap_vfs::Vfs;
 use rust_analyzer::{ParseResult, RustAnalyzer};
 use std::collections::HashSet;
+use std::fs::File;
 use std::hash::RandomState;
+use std::io::{self, BufRead, BufReader};
 use std::time::Instant;
 use std::{
     collections::HashMap,
@@ -212,10 +214,20 @@ fn cwd() -> anyhow::Result<AbsPathBuf> {
 }
 
 fn main() -> anyhow::Result<()> {
-    let mut cfg = config::Config::extract().context("failed to load configuration")?;
-    if cfg.qltest {
-        qltest::prepare(&mut cfg)?;
-    }
+    let cfg = config::Config::extract().context("failed to load configuration")?;
+    let inputs = if cfg.qltest {
+        qltest::prepare(&cfg)?
+    } else if let Some(path) = &cfg.file_list {
+        let file =
+            File::open(path).with_context(|| format!("opening file list {}", path.display()))?;
+        BufReader::new(file)
+            .lines()
+            .map(|line| line.map(PathBuf::from))
+            .collect::<io::Result<Vec<_>>>()
+            .with_context(|| format!("reading file list {}", path.display()))?
+    } else {
+        Vec::new()
+    };
     let start = Instant::now();
     let (flame_layer, _flush_guard) = if let Some(path) = &cfg.logging_flamegraph {
         tracing_flame::FlameLayer::with_file(path)
@@ -240,8 +252,7 @@ fn main() -> anyhow::Result<()> {
         root: cfg.source_archive_dir.clone(),
     };
     let mut extractor = Extractor::new(&archiver, &traps);
-    let files: Vec<PathBuf> = cfg
-        .inputs
+    let files: Vec<PathBuf> = inputs
         .iter()
         .map(|file| {
             let file = std::path::absolute(file).unwrap_or(file.to_path_buf());
 
@@ -4,7 +4,7 @@ use glob::glob;
 use itertools::Itertools;
 use std::ffi::OsStr;
 use std::fs;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 use tracing::info;
 
 const DEFAULT_EDITION: &str = "2021";
@@ -80,13 +80,12 @@ fn dump_nightly_toolchain() -> anyhow::Result<()> {
     Ok(())
 }
 
-fn set_sources(config: &mut Config) -> anyhow::Result<()> {
+fn get_sources() -> anyhow::Result<Vec<PathBuf>> {
     let path_iterator = glob("**/*.rs").context("globbing test sources")?;
-    config.inputs = path_iterator
+    path_iterator
         .filter(|f| f.is_err() || !f.as_ref().unwrap().starts_with("target"))
         .collect::<Result<Vec<_>, _>>()
-        .context("fetching test sources")?;
-    Ok(())
+        .context("fetching test sources")
 }
 
 fn cargo_check(config: &Config) -> anyhow::Result<()> {
@@ -105,9 +104,9 @@ fn cargo_check(config: &Config) -> anyhow::Result<()> {
     }
 }
 
-pub(crate) fn prepare(config: &mut Config) -> anyhow::Result<()> {
+pub(crate) fn prepare(config: &Config) -> anyhow::Result<Vec<PathBuf>> {
     dump_lib()?;
-    set_sources(config)?;
+    let inputs = get_sources()?;
     let edition = config.qltest_edition.as_deref().unwrap_or(DEFAULT_EDITION);
     dump_cargo_manifest(&config.qltest_dependencies, edition)?;
     if config.qltest_use_nightly {
@@ -116,5 +115,5 @@ pub(crate) fn prepare(config: &mut Config) -> anyhow::Result<()> {
     if config.qltest_cargo_check {
         cargo_check(config)?;
     }
-    Ok(())
+    Ok(inputs)
 }
@@ -1,5 +1,6 @@
 @echo off
 
-type NUL && "%CODEQL_EXTRACTOR_RUST_ROOT%\tools\%CODEQL_PLATFORM%\extractor" @"%1"
+type NUL && "%CODEQL_EXTRACTOR_RUST_ROOT%\tools\%CODEQL_PLATFORM%\extractor" ^
+        --file-list "%1"
 
 exit /b %ERRORLEVEL%
@@ -3,4 +3,5 @@
 set -eu
 
 export RUST_BACKTRACE=1
-exec "$CODEQL_EXTRACTOR_RUST_ROOT/tools/$CODEQL_PLATFORM/extractor" @"$1"
+exec "$CODEQL_EXTRACTOR_RUST_ROOT/tools/$CODEQL_PLATFORM/extractor" \
+        --file-list "$1"