MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-03-16 17:11:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix modifyOtherKeys enablement on unsupported terminals (#16714)

Browse Source 
Co-authored-by: Tommaso Sciortino <sciortino@gmail.com>
This commit is contained in:
seeksky
2026-01-24 01:34:52 +08:00
committed by GitHub
parent 4fc3ebb930
commit b5cac836c5
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/cli/src/ui/utils/terminalCapabilityManager.test.ts
View File

@@ -277,7 +277,7 @@ describe('TerminalCapabilityManager', () => {
expect(enableModifyOtherKeys).toHaveBeenCalled();
});
it('should infer modifyOtherKeys support from Device Attributes (DA1) alone', async () => {
it('should not enable modifyOtherKeys without explicit response', async () => {
const manager = TerminalCapabilityManager.getInstance();
const promise = manager.detectCapabilities();
@@ -287,9 +287,7 @@ describe('TerminalCapabilityManager', () => {
await promise;
expect(manager.isKittyProtocolEnabled()).toBe(false);
// It should fall back to modifyOtherKeys because DA1 proves it's an ANSI terminal
expect(enableModifyOtherKeys).toHaveBeenCalled();
expect(enableModifyOtherKeys).not.toHaveBeenCalled();
});
});
});

12
packages/cli/src/ui/utils/terminalCapabilityManager.ts
View File

@@ -47,9 +47,8 @@ export class TerminalCapabilityManager {
private terminalBackgroundColor: TerminalBackgroundColor;
private kittySupported = false;
private kittyEnabled = false;
private modifyOtherKeysSupported = false;
private terminalName: string | undefined;
private modifyOtherKeysSupported?: boolean;
private deviceAttributesSupported = false;
private constructor() {}
@@ -186,7 +185,6 @@ export class TerminalCapabilityManager {
);
if (match) {
deviceAttributesReceived = true;
this.deviceAttributesSupported = true;
cleanup();
}
}
@@ -215,13 +213,7 @@ export class TerminalCapabilityManager {
if (this.kittySupported) {
enableKittyKeyboardProtocol();
this.kittyEnabled = true;
} else if (
this.modifyOtherKeysSupported === true ||
// If device attributes were received it's safe to try enabling
// anyways, since it will be ignored if unsupported
(this.modifyOtherKeysSupported === undefined &&
this.deviceAttributesSupported)
) {
} else if (this.modifyOtherKeysSupported) {
enableModifyOtherKeys();
}
// Always enable bracketed paste since it'll be ignored if unsupported.