clone/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-04-24 14:46:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve Windows test failures and address final code review comments

Browse Source
This commit is contained in:
Bryan Morgan
2026-01-31 16:20:30 -05:00
parent 3233cddc97
commit 53be0ead7c
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/proposals/client-side-experimentation-framework.md
View File

@@ -45,9 +45,9 @@ protecting users who don't opt-in.
| Agents | `experimental.enableAgents` | `false` | Enable subagent system |
| JIT Context | `experimental.jitContext` | `false` | Just-in-time context loading |
| Event-Driven Scheduler | `experimental.enableEventDrivenScheduler` | `true` | Event-based task orchestration |
| Extension Reloading | `experimental.extensionReloading` | `false` | Runtime extension loading |
| Extension Config | `experimental.extensionConfig` | `false` | Extension settings management |
| Extension Management | `experimental.extensionManagement` | `true` | Extension management features |
| Plugin Hot-Reload | `experimental.extensionReloading` | `false` | Runtime plugin loading |
| Plugin Configuration | `experimental.extensionConfig` | `false` | Plugin settings management |
| Plugin Management | `experimental.extensionManagement` | `true` | Plugin lifecycle features |
| Plan Mode | `experimental.plan` | `false` | Read-only planning mode |
| OSC 52 Paste | `experimental.useOSC52Paste` | `false` | Remote session clipboard |
| Preview Models | `general.previewFeatures` | `false` | Access to preview models |

6
integration-tests/acp-env-auth.test.ts
View File

@@ -7,7 +7,7 @@
import { describe, it, expect, beforeEach, afterEach } from 'vitest';
import { TestRig } from './test-helper.js';
import { spawn, ChildProcess } from 'node:child_process';
import { join } from 'node:path';
import { join, resolve } from 'node:path';
import { writeFileSync, mkdirSync } from 'node:fs';
import { Writable, Readable } from 'node:stream';
import { env } from 'node:process';
@@ -46,7 +46,7 @@ describe('ACP Environment and Auth', () => {
rig.setup('acp-env-loading');
// Create a project directory with a .env file containing a recognizable invalid key
const projectDir = join(rig.testDir!, 'project');
const projectDir = resolve(join(rig.testDir!, 'project'));
mkdirSync(projectDir, { recursive: true });
writeFileSync(
join(projectDir, '.env'),
@@ -148,7 +148,7 @@ describe('ACP Environment and Auth', () => {
await expect(
connection.newSession({
cwd: rig.testDir!,
cwd: resolve(rig.testDir!),
mcpServers: [],
}),
).rejects.toMatchObject({

2
packages/cli/src/config/settings.ts
View File

@@ -470,7 +470,7 @@ export function loadEnvironment(
}
// Load variable only if it's not already set in the environment or if it's an empty string.
if (!Object.hasOwn(process.env, key)) {
if (!Object.hasOwn(process.env, key) || process.env[key] === '') {
process.env[key] = parsedEnv[key];
}
}