From c45e4c3cf4ecd5c6c03f5e552d44e83140b9352c Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Fri, 24 Apr 2026 05:54:58 +0100
Subject: [PATCH] fix: pass Gemini trust flag

---
 extensions/google/cli-backend.ts | 12 ++++++++++--
 src/agents/cli-backends.test.ts  | 21 ++++++++++++++++++---
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/extensions/google/cli-backend.ts b/extensions/google/cli-backend.ts
index 71d800311bf..c99138047cb 100644
--- a/extensions/google/cli-backend.ts
+++ b/extensions/google/cli-backend.ts
@@ -27,8 +27,16 @@ export function buildGoogleGeminiCliBackend(): CliBackendPlugin {
     bundleMcpMode: "gemini-system-settings",
     config: {
       command: "gemini",
-      args: ["--output-format", "json", "--prompt", "{prompt}"],
-      resumeArgs: ["--resume", "{sessionId}", "--output-format", "json", "--prompt", "{prompt}"],
+      args: ["--skip-trust", "--output-format", "json", "--prompt", "{prompt}"],
+      resumeArgs: [
+        "--skip-trust",
+        "--resume",
+        "{sessionId}",
+        "--output-format",
+        "json",
+        "--prompt",
+        "{prompt}",
+      ],
       output: "json",
       input: "arg",
       imageArg: "@",
diff --git a/src/agents/cli-backends.test.ts b/src/agents/cli-backends.test.ts
index cfede00062f..3716ee37cf0 100644
--- a/src/agents/cli-backends.test.ts
+++ b/src/agents/cli-backends.test.ts
@@ -327,8 +327,16 @@ beforeEach(() => {
       bundleMcpMode: "gemini-system-settings",
       config: {
         command: "gemini",
-        args: ["--output-format", "json", "--prompt", "{prompt}"],
-        resumeArgs: ["--resume", "{sessionId}", "--output-format", "json", "--prompt", "{prompt}"],
+        args: ["--skip-trust", "--output-format", "json", "--prompt", "{prompt}"],
+        resumeArgs: [
+          "--skip-trust",
+          "--resume",
+          "{sessionId}",
+          "--output-format",
+          "json",
+          "--prompt",
+          "{prompt}",
+        ],
         imageArg: "@",
         imagePathScope: "workspace",
         modelArg: "--model",
@@ -882,8 +890,15 @@ describe("resolveCliBackendConfig google-gemini-cli defaults", () => {
     expect(resolved).not.toBeNull();
     expect(resolved?.bundleMcp).toBe(true);
     expect(resolved?.bundleMcpMode).toBe("gemini-system-settings");
-    expect(resolved?.config.args).toEqual(["--output-format", "json", "--prompt", "{prompt}"]);
+    expect(resolved?.config.args).toEqual([
+      "--skip-trust",
+      "--output-format",
+      "json",
+      "--prompt",
+      "{prompt}",
+    ]);
     expect(resolved?.config.resumeArgs).toEqual([
+      "--skip-trust",
       "--resume",
       "{sessionId}",
       "--output-format",