Merge branch 'main' into chore/sync-gemini-cli-v0.3.4

packages/cli/src/config/settingsSchema.test.ts

@@ -24,6 +24,7 @@ describe('SettingsSchema', () => {
         'mcp',
         'security',
         'advanced',
+        'enableWelcomeBack',
       ];
 
       expectedSettings.forEach((setting) => {

packages/cli/src/config/settingsSchema.ts

@@ -863,6 +863,16 @@ export const SETTINGS_SCHEMA = {
     description: 'Skip the next speaker check.',
     showInDialog: true,
   },
+  enableWelcomeBack: {
+    type: 'boolean',
+    label: 'Enable Welcome Back',
+    category: 'UI',
+    requiresRestart: false,
+    default: true,
+    description:
+      'Show welcome back dialog when returning to a project with conversation history.',
+    showInDialog: true,
+  },
 } as const;
 
 type InferSettings<T extends SettingsSchema> = {