mirror of
https://github.com/google-gemini/gemini-cli.git
synced 2026-05-04 00:44:05 -07:00
fix(cli): resolve rebase conflicts and fix test regressions in settings naming
This commit is contained in:
Keith Guerin
@@ -5,35 +5,36 @@ exports[`SettingsDialog > Initial Rendering > should render settings list with v
|
||||
│ │
|
||||
│ > Settings │
|
||||
│ │
|
||||
│ All │ General │ UI │ Model │ Context │ Tools │ IDE │ Security │ Experimental │ Advanced │
|
||||
│ │
|
||||
│ │
|
||||
│ ╭──────────────────────────────────────────────────────────────────────────────────────────────╮ │
|
||||
│ │ Search to filter │ │
|
||||
│ ╰──────────────────────────────────────────────────────────────────────────────────────────────╯ │
|
||||
│ │
|
||||
│ ▲ │
|
||||
│ ● Vim Mode false │
|
||||
│ │
|
||||
│ General ────────────────────────────────────────────────────────────────────────────────────── │
|
||||
│ │
|
||||
│ ● Vim Mode Off │
|
||||
│ Enable Vim keybindings │
|
||||
│ │
|
||||
│ Default Approval Mode Default │
|
||||
│ Approval Mode Default │
|
||||
│ The default approval mode for tool execution. 'default' prompts for approval, 'au… │
|
||||
│ │
|
||||
│ Enable Auto Update true │
|
||||
│ Enable automatic updates. │
|
||||
│ │
|
||||
│ Enable Notifications false │
|
||||
│ Enable run-event notifications for action-required prompts and session completion. … │
|
||||
│ Auto Update Off │
|
||||
│ Disable automatic updates. │
|
||||
│ │
|
||||
│ Notifications Off │
|
||||
│ Enable run-event notifications for action-required prompts and session completion. Cu… │
|
||||
│ Plan Directory undefined │
|
||||
│ The directory where planning artifacts are stored. If not specified, defaults t… │
|
||||
│ │
|
||||
│ Plan Model Routing true │
|
||||
│ Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr… │
|
||||
│ Plan Model Routing On │
|
||||
│ Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pro … │
|
||||
│ │
|
||||
│ Max Chat Model Attempts 10 │
|
||||
│ Maximum number of attempts for requests to the main chat model. Cannot exceed 10. │
|
||||
│ │
|
||||
│ Debug Keystroke Logging false │
|
||||
│ Enable debug logging of keystrokes to the console. │
|
||||
│ │
|
||||
│ ▼ │
|
||||
│ │
|
||||
│ Apply To │
|
||||
@@ -51,35 +52,36 @@ exports[`SettingsDialog > Snapshot Tests > should render 'accessibility settings
|
||||
│ │
|
||||
│ > Settings │
|
||||
│ │
|
||||
│ All │ General │ UI │ Model │ Context │ Tools │ IDE │ Security │ Experimental │ Advanced │
|
||||
│ │
|
||||
│ │
|
||||
│ ╭──────────────────────────────────────────────────────────────────────────────────────────────╮ │
|
||||
│ │ Search to filter │ │
|
||||
│ ╰──────────────────────────────────────────────────────────────────────────────────────────────╯ │
|
||||
│ │
|
||||
│ ▲ │
|
||||
│ ● Vim Mode true* │
|
||||
│ │
|
||||
│ General ────────────────────────────────────────────────────────────────────────────────────── │
|
||||
│ │
|
||||
│ ● Vim Mode On* │
|
||||
│ Enable Vim keybindings │
|
||||
│ │
|
||||
│ Default Approval Mode Default │
|
||||
│ Approval Mode Default │
|
||||
│ The default approval mode for tool execution. 'default' prompts for approval, 'au… │
|
||||
│ │
|
||||
│ Enable Auto Update true │
|
||||
│ Enable automatic updates. │
|
||||
│ │
|
||||
│ Enable Notifications false │
|
||||
│ Enable run-event notifications for action-required prompts and session completion. … │
|
||||
│ Auto Update Off │
|
||||
│ Disable automatic updates. │
|
||||
│ │
|
||||
│ Notifications Off │
|
||||
│ Enable run-event notifications for action-required prompts and session completion. Cu… │
|
||||
│ Plan Directory undefined │
|
||||
│ The directory where planning artifacts are stored. If not specified, defaults t… │
|
||||
│ │
|
||||
│ Plan Model Routing true │
|
||||
│ Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr… │
|
||||
│ Plan Model Routing On │
|
||||
│ Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pro … │
|
||||
│ │
|
||||
│ Max Chat Model Attempts 10 │
|
||||
│ Maximum number of attempts for requests to the main chat model. Cannot exceed 10. │
|
||||
│ │
|
||||
│ Debug Keystroke Logging false │
|
||||
│ Enable debug logging of keystrokes to the console. │
|
||||
│ │
|
||||
│ ▼ │
|
||||
│ │
|
||||
│ Apply To │
|
||||
@@ -97,35 +99,36 @@ exports[`SettingsDialog > Snapshot Tests > should render 'all boolean settings d
|
||||
│ │
|
||||
│ > Settings │
|
||||
│ │
|
||||
│ All │ General │ UI │ Model │ Context │ Tools │ IDE │ Security │ Experimental │ Advanced │
|
||||
│ │
|
||||
│ │
|
||||
│ ╭──────────────────────────────────────────────────────────────────────────────────────────────╮ │
|
||||
│ │ Search to filter │ │
|
||||
│ ╰──────────────────────────────────────────────────────────────────────────────────────────────╯ │
|
||||
│ │
|
||||
│ ▲ │
|
||||
│ ● Vim Mode false* │
|
||||
│ │
|
||||
│ General ────────────────────────────────────────────────────────────────────────────────────── │
|
||||
│ │
|
||||
│ ● Vim Mode Off* │
|
||||
│ Enable Vim keybindings │
|
||||
│ │
|
||||
│ Default Approval Mode Default │
|
||||
│ Approval Mode Default │
|
||||
│ The default approval mode for tool execution. 'default' prompts for approval, 'au… │
|
||||
│ │
|
||||
│ Enable Auto Update true* │
|
||||
│ Enable automatic updates. │
|
||||
│ │
|
||||
│ Enable Notifications false │
|
||||
│ Enable run-event notifications for action-required prompts and session completion. … │
|
||||
│ Auto Update On* │
|
||||
│ Disable automatic updates. │
|
||||
│ │
|
||||
│ Notifications Off │
|
||||
│ Enable run-event notifications for action-required prompts and session completion. Cu… │
|
||||
│ Plan Directory undefined │
|
||||
│ The directory where planning artifacts are stored. If not specified, defaults t… │
|
||||
│ │
|
||||
│ Plan Model Routing true │
|
||||
│ Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr… │
|
||||
│ Plan Model Routing On │
|
||||
│ Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pro … │
|
||||
│ │
|
||||
│ Max Chat Model Attempts 10 │
|
||||
│ Maximum number of attempts for requests to the main chat model. Cannot exceed 10. │
|
||||
│ │
|
||||
│ Debug Keystroke Logging false* │
|
||||
│ Enable debug logging of keystrokes to the console. │
|
||||
│ │
|
||||
│ ▼ │
|
||||
│ │
|
||||
│ Apply To │
|
||||
@@ -143,35 +146,36 @@ exports[`SettingsDialog > Snapshot Tests > should render 'default state' correct
|
||||
│ │
|
||||
│ > Settings │
|
||||
│ │
|
||||
│ All │ General │ UI │ Model │ Context │ Tools │ IDE │ Security │ Experimental │ Advanced │
|
||||
│ │
|
||||
│ │
|
||||
│ ╭──────────────────────────────────────────────────────────────────────────────────────────────╮ │
|
||||
│ │ Search to filter │ │
|
||||
│ ╰──────────────────────────────────────────────────────────────────────────────────────────────╯ │
|
||||
│ │
|
||||
│ ▲ │
|
||||
│ ● Vim Mode false │
|
||||
│ │
|
||||
│ General ────────────────────────────────────────────────────────────────────────────────────── │
|
||||
│ │
|
||||
│ ● Vim Mode Off │
|
||||
│ Enable Vim keybindings │
|
||||
│ │
|
||||
│ Default Approval Mode Default │
|
||||
│ Approval Mode Default │
|
||||
│ The default approval mode for tool execution. 'default' prompts for approval, 'au… │
|
||||
│ │
|
||||
│ Enable Auto Update true │
|
||||
│ Enable automatic updates. │
|
||||
│ │
|
||||
│ Enable Notifications false │
|
||||
│ Enable run-event notifications for action-required prompts and session completion. … │
|
||||
│ Auto Update Off │
|
||||
│ Disable automatic updates. │
|
||||
│ │
|
||||
│ Notifications Off │
|
||||
│ Enable run-event notifications for action-required prompts and session completion. Cu… │
|
||||
│ Plan Directory undefined │
|
||||
│ The directory where planning artifacts are stored. If not specified, defaults t… │
|
||||
│ │
|
||||
│ Plan Model Routing true │
|
||||
│ Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr… │
|
||||
│ Plan Model Routing On │
|
||||
│ Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pro … │
|
||||
│ │
|
||||
│ Max Chat Model Attempts 10 │
|
||||
│ Maximum number of attempts for requests to the main chat model. Cannot exceed 10. │
|
||||
│ │
|
||||
│ Debug Keystroke Logging false │
|
||||
│ Enable debug logging of keystrokes to the console. │
|
||||
│ │
|
||||
│ ▼ │
|
||||
│ │
|
||||
│ Apply To │
|
||||
@@ -189,35 +193,36 @@ exports[`SettingsDialog > Snapshot Tests > should render 'file filtering setting
|
||||
│ │
|
||||
│ > Settings │
|
||||
│ │
|
||||
│ All │ General │ UI │ Model │ Context │ Tools │ IDE │ Security │ Experimental │ Advanced │
|
||||
│ │
|
||||
│ │
|
||||
│ ╭──────────────────────────────────────────────────────────────────────────────────────────────╮ │
|
||||
│ │ Search to filter │ │
|
||||
│ ╰──────────────────────────────────────────────────────────────────────────────────────────────╯ │
|
||||
│ │
|
||||
│ ▲ │
|
||||
│ ● Vim Mode false │
|
||||
│ │
|
||||
│ General ────────────────────────────────────────────────────────────────────────────────────── │
|
||||
│ │
|
||||
│ ● Vim Mode Off │
|
||||
│ Enable Vim keybindings │
|
||||
│ │
|
||||
│ Default Approval Mode Default │
|
||||
│ Approval Mode Default │
|
||||
│ The default approval mode for tool execution. 'default' prompts for approval, 'au… │
|
||||
│ │
|
||||
│ Enable Auto Update true │
|
||||
│ Enable automatic updates. │
|
||||
│ │
|
||||
│ Enable Notifications false │
|
||||
│ Enable run-event notifications for action-required prompts and session completion. … │
|
||||
│ Auto Update Off │
|
||||
│ Disable automatic updates. │
|
||||
│ │
|
||||
│ Notifications Off │
|
||||
│ Enable run-event notifications for action-required prompts and session completion. Cu… │
|
||||
│ Plan Directory undefined │
|
||||
│ The directory where planning artifacts are stored. If not specified, defaults t… │
|
||||
│ │
|
||||
│ Plan Model Routing true │
|
||||
│ Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr… │
|
||||
│ Plan Model Routing On │
|
||||
│ Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pro … │
|
||||
│ │
|
||||
│ Max Chat Model Attempts 10 │
|
||||
│ Maximum number of attempts for requests to the main chat model. Cannot exceed 10. │
|
||||
│ │
|
||||
│ Debug Keystroke Logging false │
|
||||
│ Enable debug logging of keystrokes to the console. │
|
||||
│ │
|
||||
│ ▼ │
|
||||
│ │
|
||||
│ Apply To │
|
||||
@@ -235,35 +240,36 @@ exports[`SettingsDialog > Snapshot Tests > should render 'focused on scope selec
|
||||
│ │
|
||||
│ Settings │
|
||||
│ │
|
||||
│ All │ General │ UI │ Model │ Context │ Tools │ IDE │ Security │ Experimental │ Advanced │
|
||||
│ │
|
||||
│ │
|
||||
│ ╭──────────────────────────────────────────────────────────────────────────────────────────────╮ │
|
||||
│ │ Search to filter │ │
|
||||
│ ╰──────────────────────────────────────────────────────────────────────────────────────────────╯ │
|
||||
│ │
|
||||
│ ▲ │
|
||||
│ Vim Mode false │
|
||||
│ │
|
||||
│ General ────────────────────────────────────────────────────────────────────────────────────── │
|
||||
│ │
|
||||
│ Vim Mode Off │
|
||||
│ Enable Vim keybindings │
|
||||
│ │
|
||||
│ Default Approval Mode Default │
|
||||
│ Approval Mode Default │
|
||||
│ The default approval mode for tool execution. 'default' prompts for approval, 'au… │
|
||||
│ │
|
||||
│ Enable Auto Update true │
|
||||
│ Enable automatic updates. │
|
||||
│ │
|
||||
│ Enable Notifications false │
|
||||
│ Enable run-event notifications for action-required prompts and session completion. … │
|
||||
│ Auto Update Off │
|
||||
│ Disable automatic updates. │
|
||||
│ │
|
||||
│ Notifications Off │
|
||||
│ Enable run-event notifications for action-required prompts and session completion. Cu… │
|
||||
│ Plan Directory undefined │
|
||||
│ The directory where planning artifacts are stored. If not specified, defaults t… │
|
||||
│ │
|
||||
│ Plan Model Routing true │
|
||||
│ Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr… │
|
||||
│ Plan Model Routing On │
|
||||
│ Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pro … │
|
||||
│ │
|
||||
│ Max Chat Model Attempts 10 │
|
||||
│ Maximum number of attempts for requests to the main chat model. Cannot exceed 10. │
|
||||
│ │
|
||||
│ Debug Keystroke Logging false │
|
||||
│ Enable debug logging of keystrokes to the console. │
|
||||
│ │
|
||||
│ ▼ │
|
||||
│ │
|
||||
│ > Apply To │
|
||||
@@ -281,35 +287,36 @@ exports[`SettingsDialog > Snapshot Tests > should render 'mixed boolean and numb
|
||||
│ │
|
||||
│ > Settings │
|
||||
│ │
|
||||
│ All │ General │ UI │ Model │ Context │ Tools │ IDE │ Security │ Experimental │ Advanced │
|
||||
│ │
|
||||
│ │
|
||||
│ ╭──────────────────────────────────────────────────────────────────────────────────────────────╮ │
|
||||
│ │ Search to filter │ │
|
||||
│ ╰──────────────────────────────────────────────────────────────────────────────────────────────╯ │
|
||||
│ │
|
||||
│ ▲ │
|
||||
│ ● Vim Mode false* │
|
||||
│ │
|
||||
│ General ────────────────────────────────────────────────────────────────────────────────────── │
|
||||
│ │
|
||||
│ ● Vim Mode Off* │
|
||||
│ Enable Vim keybindings │
|
||||
│ │
|
||||
│ Default Approval Mode Default │
|
||||
│ Approval Mode Default │
|
||||
│ The default approval mode for tool execution. 'default' prompts for approval, 'au… │
|
||||
│ │
|
||||
│ Enable Auto Update false* │
|
||||
│ Enable automatic updates. │
|
||||
│ │
|
||||
│ Enable Notifications false │
|
||||
│ Enable run-event notifications for action-required prompts and session completion. … │
|
||||
│ Auto Update Off* │
|
||||
│ Disable automatic updates. │
|
||||
│ │
|
||||
│ Notifications Off │
|
||||
│ Enable run-event notifications for action-required prompts and session completion. Cu… │
|
||||
│ Plan Directory undefined │
|
||||
│ The directory where planning artifacts are stored. If not specified, defaults t… │
|
||||
│ │
|
||||
│ Plan Model Routing true │
|
||||
│ Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr… │
|
||||
│ Plan Model Routing On │
|
||||
│ Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pro … │
|
||||
│ │
|
||||
│ Max Chat Model Attempts 10 │
|
||||
│ Maximum number of attempts for requests to the main chat model. Cannot exceed 10. │
|
||||
│ │
|
||||
│ Debug Keystroke Logging false │
|
||||
│ Enable debug logging of keystrokes to the console. │
|
||||
│ │
|
||||
│ ▼ │
|
||||
│ │
|
||||
│ Apply To │
|
||||
@@ -327,35 +334,36 @@ exports[`SettingsDialog > Snapshot Tests > should render 'tools and security set
|
||||
│ │
|
||||
│ > Settings │
|
||||
│ │
|
||||
│ All │ General │ UI │ Model │ Context │ Tools │ IDE │ Security │ Experimental │ Advanced │
|
||||
│ │
|
||||
│ │
|
||||
│ ╭──────────────────────────────────────────────────────────────────────────────────────────────╮ │
|
||||
│ │ Search to filter │ │
|
||||
│ ╰──────────────────────────────────────────────────────────────────────────────────────────────╯ │
|
||||
│ │
|
||||
│ ▲ │
|
||||
│ ● Vim Mode false │
|
||||
│ │
|
||||
│ General ────────────────────────────────────────────────────────────────────────────────────── │
|
||||
│ │
|
||||
│ ● Vim Mode Off │
|
||||
│ Enable Vim keybindings │
|
||||
│ │
|
||||
│ Default Approval Mode Default │
|
||||
│ Approval Mode Default │
|
||||
│ The default approval mode for tool execution. 'default' prompts for approval, 'au… │
|
||||
│ │
|
||||
│ Enable Auto Update true │
|
||||
│ Enable automatic updates. │
|
||||
│ │
|
||||
│ Enable Notifications false │
|
||||
│ Enable run-event notifications for action-required prompts and session completion. … │
|
||||
│ Auto Update Off │
|
||||
│ Disable automatic updates. │
|
||||
│ │
|
||||
│ Notifications Off │
|
||||
│ Enable run-event notifications for action-required prompts and session completion. Cu… │
|
||||
│ Plan Directory undefined │
|
||||
│ The directory where planning artifacts are stored. If not specified, defaults t… │
|
||||
│ │
|
||||
│ Plan Model Routing true │
|
||||
│ Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr… │
|
||||
│ Plan Model Routing On │
|
||||
│ Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pro … │
|
||||
│ │
|
||||
│ Max Chat Model Attempts 10 │
|
||||
│ Maximum number of attempts for requests to the main chat model. Cannot exceed 10. │
|
||||
│ │
|
||||
│ Debug Keystroke Logging false │
|
||||
│ Enable debug logging of keystrokes to the console. │
|
||||
│ │
|
||||
│ ▼ │
|
||||
│ │
|
||||
│ Apply To │
|
||||
@@ -373,35 +381,36 @@ exports[`SettingsDialog > Snapshot Tests > should render 'various boolean settin
|
||||
│ │
|
||||
│ > Settings │
|
||||
│ │
|
||||
│ All │ General │ UI │ Model │ Context │ Tools │ IDE │ Security │ Experimental │ Advanced │
|
||||
│ │
|
||||
│ │
|
||||
│ ╭──────────────────────────────────────────────────────────────────────────────────────────────╮ │
|
||||
│ │ Search to filter │ │
|
||||
│ ╰──────────────────────────────────────────────────────────────────────────────────────────────╯ │
|
||||
│ │
|
||||
│ ▲ │
|
||||
│ ● Vim Mode true* │
|
||||
│ │
|
||||
│ General ────────────────────────────────────────────────────────────────────────────────────── │
|
||||
│ │
|
||||
│ ● Vim Mode On* │
|
||||
│ Enable Vim keybindings │
|
||||
│ │
|
||||
│ Default Approval Mode Default │
|
||||
│ Approval Mode Default │
|
||||
│ The default approval mode for tool execution. 'default' prompts for approval, 'au… │
|
||||
│ │
|
||||
│ Enable Auto Update false* │
|
||||
│ Enable automatic updates. │
|
||||
│ │
|
||||
│ Enable Notifications false │
|
||||
│ Enable run-event notifications for action-required prompts and session completion. … │
|
||||
│ Auto Update Off* │
|
||||
│ Disable automatic updates. │
|
||||
│ │
|
||||
│ Notifications Off │
|
||||
│ Enable run-event notifications for action-required prompts and session completion. Cu… │
|
||||
│ Plan Directory undefined │
|
||||
│ The directory where planning artifacts are stored. If not specified, defaults t… │
|
||||
│ │
|
||||
│ Plan Model Routing true │
|
||||
│ Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pr… │
|
||||
│ Plan Model Routing On │
|
||||
│ Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pro … │
|
||||
│ │
|
||||
│ Max Chat Model Attempts 10 │
|
||||
│ Maximum number of attempts for requests to the main chat model. Cannot exceed 10. │
|
||||
│ │
|
||||
│ Debug Keystroke Logging true* │
|
||||
│ Enable debug logging of keystrokes to the console. │
|
||||
│ │
|
||||
│ ▼ │
|
||||
│ │
|
||||
│ Apply To │
|
||||
|
||||
Reference in New Issue
Block a user