MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-03-31 08:20:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

feat: simplify tool confirmation labels for better UX (#15296)

Browse Source
This commit is contained in:
N. Taylor Mullen
2025-12-18 16:38:53 -08:00
committed by GitHub
parent 402148dbc4
commit e0f159085e
10 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx
View File

@@ -102,20 +102,20 @@ export const ToolConfirmationMessage: React.FC<
if (!confirmationDetails.isModifying) {
question = `Apply this change?`;
options.push({
label: 'Yes, allow once',
label: 'Allow once',
value: ToolConfirmationOutcome.ProceedOnce,
key: 'Yes, allow once',
key: 'Allow once',
});
if (isTrustedFolder) {
options.push({
label: 'Yes, allow always',
label: 'Allow for this session',
value: ToolConfirmationOutcome.ProceedAlways,
key: 'Yes, allow always',
key: 'Allow for this session',
});
options.push({
label: 'Yes, allow always and save to policy',
label: 'Allow for all future sessions',
value: ToolConfirmationOutcome.ProceedAlwaysAndSave,
key: 'Yes, allow always and save to policy',
key: 'Allow for all future sessions',
});
}
if (!config.getIdeMode() || !isDiffingEnabled) {
@@ -137,20 +137,20 @@ export const ToolConfirmationMessage: React.FC<
question = `Allow execution of: '${executionProps.rootCommand}'?`;
options.push({
label: 'Yes, allow once',
label: 'Allow once',
value: ToolConfirmationOutcome.ProceedOnce,
key: 'Yes, allow once',
key: 'Allow once',
});
if (isTrustedFolder) {
options.push({
label: `Yes, allow always ...`,
label: `Allow for this session`,
value: ToolConfirmationOutcome.ProceedAlways,
key: `Yes, allow always ...`,
key: `Allow for this session`,
});
options.push({
label: `Yes, allow always and save to policy`,
label: `Allow for all future sessions`,
value: ToolConfirmationOutcome.ProceedAlwaysAndSave,
key: `Yes, allow always and save to policy`,
key: `Allow for all future sessions`,
});
}
options.push({
@@ -161,20 +161,20 @@ export const ToolConfirmationMessage: React.FC<
} else if (confirmationDetails.type === 'info') {
question = `Do you want to proceed?`;
options.push({
label: 'Yes, allow once',
label: 'Allow once',
value: ToolConfirmationOutcome.ProceedOnce,
key: 'Yes, allow once',
key: 'Allow once',
});
if (isTrustedFolder) {
options.push({
label: 'Yes, allow always',
label: 'Allow for this session',
value: ToolConfirmationOutcome.ProceedAlways,
key: 'Yes, allow always',
key: 'Allow for this session',
});
options.push({
label: 'Yes, allow always and save to policy',
label: 'Allow for all future sessions',
value: ToolConfirmationOutcome.ProceedAlwaysAndSave,
key: 'Yes, allow always and save to policy',
key: 'Allow for all future sessions',
});
}
options.push({
@@ -187,25 +187,25 @@ export const ToolConfirmationMessage: React.FC<
const mcpProps = confirmationDetails;
question = `Allow execution of MCP tool "${mcpProps.toolName}" from server "${mcpProps.serverName}"?`;
options.push({
label: 'Yes, allow once',
label: 'Allow once',
value: ToolConfirmationOutcome.ProceedOnce,
key: 'Yes, allow once',
key: 'Allow once',
});
if (isTrustedFolder) {
options.push({
label: `Yes, always allow tool "${mcpProps.toolName}" from server "${mcpProps.serverName}"`,
value: ToolConfirmationOutcome.ProceedAlwaysTool, // Cast until types are updated
key: `Yes, always allow tool "${mcpProps.toolName}" from server "${mcpProps.serverName}"`,
label: 'Allow tool for this session',
value: ToolConfirmationOutcome.ProceedAlwaysTool,
key: 'Allow tool for this session',
});
options.push({
label: `Yes, always allow all tools from server "${mcpProps.serverName}"`,
label: 'Allow all server tools for this session',
value: ToolConfirmationOutcome.ProceedAlwaysServer,
key: `Yes, always allow all tools from server "${mcpProps.serverName}"`,
key: 'Allow all server tools for this session',
});
options.push({
label: `Yes, allow always tool "${mcpProps.toolName}" and save to policy`,
label: 'Allow tool for all future sessions',
value: ToolConfirmationOutcome.ProceedAlwaysAndSave,
key: `Yes, allow always tool "${mcpProps.toolName}" and save to policy`,
key: 'Allow tool for all future sessions',
});
}
options.push({