2 files changed, 3 insertions, 7 deletions
diff --git a/packages/cli/src/config/config.test.ts b/packages/cli/src/config/config.test.ts
index 802cf588..fffc5883 100644
--- a/packages/cli/src/config/config.test.ts
+++ b/packages/cli/src/config/config.test.ts
@@ -34,7 +34,7 @@ vi.mock('@gemini-code/core', async () => {
   return {
     ...actualServer,
     loadEnvironment: vi.fn(),
-    createServerConfig: vi.fn((params) => ({
+    Config: vi.fn((params) => ({
       // Mock the config object and its methods
       getApiKey: () => params.apiKey,
       getModel: () => params.model,
diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts
index 6ab1453f..3a932090 100644
--- a/packages/cli/src/config/config.ts
+++ b/packages/cli/src/config/config.ts
@@ -10,9 +10,7 @@ import process from 'node:process';
 import {
   Config,
   loadEnvironment,
-  createServerConfig,
   loadServerHierarchicalMemory,
-  ConfigParameters,
   setGeminiMdFilename as setServerGeminiMdFilename,
   getCurrentGeminiMdFilename,
   ApprovalMode,
@@ -175,7 +173,7 @@ export async function loadCliConfig(
     modelToUse = await getEffectiveModel(apiKeyForServer, modelToUse);
   }
 
-  const configParams: ConfigParameters = {
+  return new Config({
     apiKey: apiKeyForServer,
     model: modelToUse,
     embeddingModel: DEFAULT_GEMINI_EMBEDDING_MODEL,
@@ -206,7 +204,5 @@ export async function loadCliConfig(
     fileFilteringRespectGitIgnore: settings.fileFiltering?.respectGitIgnore,
     fileFilteringAllowBuildArtifacts:
       settings.fileFiltering?.allowBuildArtifacts,
-  };
-
-  return createServerConfig(configParams);
+  });
 }