MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-03-29 15:30:40 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Shell approval rework" (#11143)

Browse Source
This commit is contained in:
cornmander
2025-10-14 18:55:28 -04:00
committed by GitHub
parent 6f0107e7b7
commit bd5c158a62
12 changed files with 279 additions and 661 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/cli/src/services/prompt-processors/shellProcessor.test.ts
View File

@@ -9,7 +9,8 @@ import { ConfirmationRequiredError, ShellProcessor } from './shellProcessor.js';
import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
import type { CommandContext } from '../../ui/commands/types.js';
import type { Config } from '@google/gemini-cli-core';
import { ApprovalMode, getShellConfiguration } from '@google/gemini-cli-core';
import { ApprovalMode } from '@google/gemini-cli-core';
import os from 'node:os';
import { quote } from 'shell-quote';
import { createPartFromText } from '@google/genai';
import type { PromptPipelineContent } from './types.js';
@@ -17,16 +18,18 @@ import type { PromptPipelineContent } from './types.js';
// Helper function to determine the expected escaped string based on the current OS,
// mirroring the logic in the actual `escapeShellArg` implementation.
function getExpectedEscapedArgForPlatform(arg: string): string {
const { shell } = getShellConfiguration();
if (os.platform() === 'win32') {
const comSpec = (process.env['ComSpec'] || 'cmd.exe').toLowerCase();
const isPowerShell =
comSpec.endsWith('powershell.exe') || comSpec.endsWith('pwsh.exe');
switch (shell) {
case 'powershell':
if (isPowerShell) {
return `'${arg.replace(/'/g, "''")}'`;
case 'cmd':
} else {
return `"${arg.replace(/"/g, '""')}"`;
case 'bash':
default:
return quote([arg]);
}
} else {
return quote([arg]);
}
}