diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts
index 50c10eec2a..63f0895ed2 100755
--- a/packages/cli/src/config/config.ts
+++ b/packages/cli/src/config/config.ts
@@ -79,6 +79,7 @@ export interface CliArgs {
   allowedTools: string[] | undefined;
   experimentalAcp: boolean | undefined;
   experimentalAgentHarness: boolean | undefined;
+  experimentalEnableAgents: boolean | undefined;
   extensions: string[] | undefined;
   listExtensions: boolean | undefined;
   resume: string | typeof RESUME_LATEST | undefined;
@@ -167,6 +168,10 @@ export async function parseArguments(
           type: 'boolean',
           description: 'Enable the new unified agent harness',
         })
+        .option('experimental-enable-agents', {
+          type: 'boolean',
+          description: 'Enable local and remote subagents',
+        })
         .option('allowed-mcp-server-names', {
           type: 'array',
           string: true,
@@ -792,10 +797,12 @@ export async function loadCliConfig(
     enabledExtensions: argv.extensions,
     extensionLoader: extensionManager,
     enableExtensionReloading: settings.experimental?.extensionReloading,
-    enableAgents: settings.experimental?.enableAgents,
+    enableAgents:
+      argv.experimentalEnableAgents ?? settings.experimental?.enableAgents,
     enableAgentHarness:
       argv.experimentalAgentHarness ??
       settings.experimental?.enableAgentHarness,
+
     plan: settings.experimental?.plan,
     enableEventDrivenScheduler: true,
     skillsSupport: settings.skills?.enabled ?? true,
diff --git a/packages/cli/src/gemini.test.tsx b/packages/cli/src/gemini.test.tsx
index 62cb010d68..4307dc3916 100644
--- a/packages/cli/src/gemini.test.tsx
+++ b/packages/cli/src/gemini.test.tsx
@@ -468,6 +468,7 @@ describe('gemini.tsx main function kitty protocol', () => {
       allowedTools: undefined,
       experimentalAcp: undefined,
       experimentalAgentHarness: undefined,
+      experimentalEnableAgents: undefined,
       extensions: undefined,
       listExtensions: undefined,
       includeDirectories: undefined,