From ad2e47dc20cb19ab892a40077e101e2bae93ac63 Mon Sep 17 00:00:00 2001 From: Leo <45218470+ngleo@users.noreply.github.com> Date: Thu, 12 Jun 2025 18:28:20 +0100 Subject: [PATCH] remove enable editor flag (#984) --- packages/cli/src/config/config.ts | 1 - packages/cli/src/config/settings.ts | 1 - .../messages/ToolConfirmationMessage.tsx | 16 +++++----------- packages/core/src/config/config.ts | 8 -------- 4 files changed, 5 insertions(+), 21 deletions(-) diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts index ccdcf74b..2f989883 100644 --- a/packages/cli/src/config/config.ts +++ b/packages/cli/src/config/config.ts @@ -195,7 +195,6 @@ export async function loadCliConfig( fileFilteringRespectGitIgnore: settings.fileFiltering?.respectGitIgnore, fileFilteringAllowBuildArtifacts: settings.fileFiltering?.allowBuildArtifacts, - enableModifyWithExternalEditors: settings.enableModifyWithExternalEditors, checkpoint: argv.checkpoint, }); } diff --git a/packages/cli/src/config/settings.ts b/packages/cli/src/config/settings.ts index af1278a6..df557e25 100644 --- a/packages/cli/src/config/settings.ts +++ b/packages/cli/src/config/settings.ts @@ -38,7 +38,6 @@ export interface Settings { contextFileName?: string; accessibility?: AccessibilitySettings; telemetry?: boolean; - enableModifyWithExternalEditors?: boolean; preferredEditor?: string; // Git-aware file filtering settings diff --git a/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx b/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx index 0de85ba4..b747cabc 100644 --- a/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx +++ b/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx @@ -28,7 +28,7 @@ export interface ToolConfirmationMessageProps { export const ToolConfirmationMessage: React.FC< ToolConfirmationMessageProps -> = ({ confirmationDetails, config, isFocused = true }) => { +> = ({ confirmationDetails, isFocused = true }) => { const { onConfirm } = confirmationDetails; useInput((_, key) => { @@ -85,18 +85,12 @@ export const ToolConfirmationMessage: React.FC< label: 'Yes, allow always', value: ToolConfirmationOutcome.ProceedAlways, }, - ); - - const externalEditorsEnabled = - config?.getEnableModifyWithExternalEditors() ?? false; - if (externalEditorsEnabled) { - options.push({ + { label: 'Modify with external editor', value: ToolConfirmationOutcome.ModifyWithEditor, - }); - } - - options.push({ label: 'No (esc)', value: ToolConfirmationOutcome.Cancel }); + }, + { label: 'No (esc)', value: ToolConfirmationOutcome.Cancel }, + ); } else if (confirmationDetails.type === 'exec') { const executionProps = confirmationDetails as ToolExecuteConfirmationDetails; diff --git a/packages/core/src/config/config.ts b/packages/core/src/config/config.ts index b94585a5..b94a88a4 100644 --- a/packages/core/src/config/config.ts +++ b/packages/core/src/config/config.ts @@ -81,7 +81,6 @@ export interface ConfigParameters { telemetryLogUserPromptsEnabled?: boolean; fileFilteringRespectGitIgnore?: boolean; fileFilteringAllowBuildArtifacts?: boolean; - enableModifyWithExternalEditors?: boolean; checkpoint?: boolean; } @@ -113,7 +112,6 @@ export class Config { private readonly geminiIgnorePatterns: string[] = []; private readonly fileFilteringRespectGitIgnore: boolean; private readonly fileFilteringAllowBuildArtifacts: boolean; - private readonly enableModifyWithExternalEditors: boolean; private fileDiscoveryService: FileDiscoveryService | null = null; private gitService: GitService | undefined = undefined; private readonly checkpoint: boolean; @@ -147,8 +145,6 @@ export class Config { params.fileFilteringRespectGitIgnore ?? true; this.fileFilteringAllowBuildArtifacts = params.fileFilteringAllowBuildArtifacts ?? false; - this.enableModifyWithExternalEditors = - params.enableModifyWithExternalEditors ?? false; this.checkpoint = params.checkpoint ?? false; if (params.contextFileName) { @@ -297,10 +293,6 @@ export class Config { return this.fileFilteringAllowBuildArtifacts; } - getEnableModifyWithExternalEditors(): boolean { - return this.enableModifyWithExternalEditors; - } - getCheckpointEnabled(): boolean { return this.checkpoint; }