diff --git a/packages/cli/src/config/config.test.ts b/packages/cli/src/config/config.test.ts
index b22b7412cc..c1b3870e2c 100644
--- a/packages/cli/src/config/config.test.ts
+++ b/packages/cli/src/config/config.test.ts
@@ -669,6 +669,23 @@ describe('parseArguments', () => {
     const argv = await parseArguments(settings);
     expect(argv.isCommand).toBe(true);
   });
+  it('should parse --acp flag', async () => {
+    process.argv = ['node', 'script.js', '--acp'];
+    const argv = await parseArguments(createTestMergedSettings());
+    expect(argv.acp).toBe(true);
+  });
+
+  it('should parse --experimental-acp flag', async () => {
+    process.argv = ['node', 'script.js', '--experimental-acp'];
+    const argv = await parseArguments(createTestMergedSettings());
+    expect(argv.experimentalAcp).toBe(true);
+  });
+
+  it('should parse --experimental-zed-integration flag', async () => {
+    process.argv = ['node', 'script.js', '--experimental-zed-integration'];
+    const argv = await parseArguments(createTestMergedSettings());
+    expect(argv.experimentalZedIntegration).toBe(true);
+  });
 });
 
 describe('loadCliConfig', () => {
@@ -791,6 +808,30 @@ describe('loadCliConfig', () => {
 
     expect(config.isInteractive()).toBe(false);
   });
+
+  it('should enable acp mode when --acp flag is present', async () => {
+    process.argv = ['node', 'script.js', '--acp'];
+    const argv = await parseArguments(createTestMergedSettings());
+    const settings = createTestMergedSettings();
+    const config = await loadCliConfig(settings, 'test-session', argv);
+    expect(config.getAcp()).toBe(true);
+  });
+
+  it('should enable acp mode when --experimental-acp flag is present', async () => {
+    process.argv = ['node', 'script.js', '--experimental-acp'];
+    const argv = await parseArguments(createTestMergedSettings());
+    const settings = createTestMergedSettings();
+    const config = await loadCliConfig(settings, 'test-session', argv);
+    expect(config.getAcp()).toBe(true);
+  });
+
+  it('should enable acp mode when --experimental-zed-integration flag is present', async () => {
+    process.argv = ['node', 'script.js', '--experimental-zed-integration'];
+    const argv = await parseArguments(createTestMergedSettings());
+    const settings = createTestMergedSettings();
+    const config = await loadCliConfig(settings, 'test-session', argv);
+    expect(config.getAcp()).toBe(true);
+  });
 });
 
 describe('Hierarchical Memory Loading (config.ts) - Placeholder Suite', () => {
diff --git a/packages/cli/src/gemini.tsx b/packages/cli/src/gemini.tsx
index 99a92600a8..572f68be29 100644
--- a/packages/cli/src/gemini.tsx
+++ b/packages/cli/src/gemini.tsx
@@ -243,7 +243,7 @@ export async function startInteractiveUI(
               <ScrollProvider>
                 <OverflowProvider>
                   <SessionStatsProvider>
-                    <VimModeProvider>
+                    <VimModeProvider settings={settings}>
                       <AppContainer
                         config={config}
                         startupWarnings={startupWarnings}