diff --git a/src/ai.rs b/src/ai.rs
index 491859a..eb71077 100644
--- a/src/ai.rs
+++ b/src/ai.rs
@@ -628,6 +628,13 @@ mod cli_backend {
         } else {
             cmd.args(req.base_args);
         }
+        let has_skip_flag = req
+            .base_args
+            .iter()
+            .any(|arg| arg == "--skip-git-repo-check");
+        if !has_skip_flag {
+            cmd.arg("--skip-git-repo-check");
+        }
         cmd.arg("--json");
         let reasoning = req.reasoning_effort.unwrap_or("minimal");
         cmd.arg("-c");
diff --git a/tests/cli_backend_tests.rs b/tests/cli_backend_tests.rs
index 50097c4..62f8dec 100644
--- a/tests/cli_backend_tests.rs
+++ b/tests/cli_backend_tests.rs
@@ -139,6 +139,7 @@ printf '%s\n' '{{"type":"item.completed","item":{{"type":"agent_message","text":
     let args = read_args(&args_dump);
     let expected: Vec<String> = vec![
         "exec",
+        "--skip-git-repo-check",
         "--json",
         "-c",
         "model_reasoning_effort=minimal",