feat(cli): disable ctrl-s shortcut outside of alternate buffer mode (#18887)

packages/cli/src/ui/AppContainer.tsx

@@ -1620,6 +1620,14 @@ Logging in with Google... Restarting Gemini CLI to continue.
         return true;
       } else if (keyMatchers[Command.SUSPEND_APP](key)) {
         handleSuspend();
+      } else if (
+        keyMatchers[Command.TOGGLE_COPY_MODE](key) &&
+        !isAlternateBuffer
+      ) {
+        showTransientMessage({
+          text: 'Use Ctrl+O to expand and collapse blocks of content.',
+          type: TransientMessageType.Warning,
+        });
         return true;
       }
 

packages/cli/src/ui/keyMatchers.test.ts

@@ -344,11 +344,12 @@ describe('keyMatchers', () => {
     },
     {
       command: Command.SHOW_MORE_LINES,
-      positive: [
+      positive: [createKey('o', { ctrl: true })],
+      negative: [
         createKey('s', { ctrl: true }),
-        createKey('o', { ctrl: true }),
+        createKey('s'),
+        createKey('l', { ctrl: true }),
       ],
-      negative: [createKey('s'), createKey('l', { ctrl: true })],
     },
 
     // Shell commands