Merge remote-tracking branch 'origin/main' into feature/status-line-customization

# Conflicts:
#	packages/cli/src/ui/components/Footer.tsx

packages/cli/src/config/keyBindings.ts

@@ -51,6 +51,7 @@ export enum Command {
   EXIT = 'exit',
   SHOW_MORE_LINES = 'showMoreLines',
   RETRY_LAST = 'retryLast',
+  TOGGLE_VERBOSE_MODE = 'toggleVerboseMode',
 
   // Shell commands
   REVERSE_SEARCH = 'reverseSearch',
@@ -172,6 +173,7 @@ export const defaultKeyBindings: KeyBindingConfig = {
   [Command.EXIT]: [{ key: 'd', ctrl: true }],
   [Command.SHOW_MORE_LINES]: [{ key: 's', ctrl: true }],
   [Command.RETRY_LAST]: [{ key: 'y', ctrl: true }],
+  [Command.TOGGLE_VERBOSE_MODE]: [{ key: 'o', ctrl: true }],
 
   // Shell commands
   [Command.REVERSE_SEARCH]: [{ key: 'r', ctrl: true }],

packages/cli/src/config/settingsSchema.ts

@@ -593,6 +593,16 @@ const SETTINGS_SCHEMA = {
         description: 'The last time the feedback dialog was shown.',
         showInDialog: false,
       },
+      verboseMode: {
+        type: 'boolean',
+        label: 'Verbose Mode',
+        category: 'UI',
+        requiresRestart: false,
+        default: true,
+        description:
+          'Show full tool output and thinking in verbose mode (toggle with Ctrl+O).',
+        showInDialog: false,
+      },
     },
   },