fix: clean up Gemini CLI backend checks

This commit is contained in:
Shakker 2026-06-17 01:25:06 +01:00 committed by Shakker
parent 589d3b12dd
commit e074f36168
2 changed files with 5 additions and 3 deletions

View file

@ -1026,6 +1026,7 @@ describe("resolveCliBackendConfig google-gemini-cli defaults", () => {
defaults: {
cliBackends: {
"google-gemini-cli": {
command: "gemini",
args: ["--skip-trust", "--output-format", "json", "--prompt", "{prompt}"],
resumeArgs: [
"--skip-trust",
@ -1061,6 +1062,7 @@ describe("resolveCliBackendConfig google-gemini-cli defaults", () => {
defaults: {
cliBackends: {
"google-gemini-cli": {
command: "gemini",
args: ["--skip-trust", "-o", "stream-json", "--prompt", "{prompt}"],
resumeArgs: [
"--skip-trust",

View file

@ -693,8 +693,8 @@ export async function executePreparedCliRun(
delete next[key];
}
const backendEnv = {
...(backend.env ?? {}),
...(context.preparedBackend.env ?? {}),
...backend.env,
...context.preparedBackend.env,
};
if (Object.keys(backendEnv).length > 0) {
Object.assign(
@ -1380,7 +1380,7 @@ export async function executePreparedCliRun(
runOutput = {
...parsed,
diagnostics: {
...(parsed.diagnostics ?? {}),
...parsed.diagnostics,
process: processDiagnostics,
},
rawText,