diff options
| author | Agus Zubiaga <[email protected]> | 2025-08-13 12:58:26 -0300 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-08-13 15:58:26 +0000 |
| commit | d3fda9dafb3921c9edd5cf4fc166dedecd91d84f (patch) | |
| tree | 355aa9b16d9a296515e7c0ed91aa94969c41bc70 /packages/cli/src/config/config.ts | |
| parent | 150103e5ddaa3d6790f7d64e86b0e0deed576ad8 (diff) | |
Zed integration schema upgrade (#5536)
Co-authored-by: Conrad Irwin <[email protected]>
Co-authored-by: Ben Brandt <[email protected]>
Diffstat (limited to 'packages/cli/src/config/config.ts')
| -rw-r--r-- | packages/cli/src/config/config.ts | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts index dd207ff2..636696fa 100644 --- a/packages/cli/src/config/config.ts +++ b/packages/cli/src/config/config.ts @@ -304,6 +304,7 @@ export async function loadCliConfig( extensions: Extension[], sessionId: string, argv: CliArgs, + cwd: string = process.cwd(), ): Promise<Config> { const debugMode = argv.debug || @@ -343,7 +344,7 @@ export async function loadCliConfig( (e) => e.contextFiles, ); - const fileService = new FileDiscoveryService(process.cwd()); + const fileService = new FileDiscoveryService(cwd); const fileFiltering = { ...DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, @@ -356,7 +357,7 @@ export async function loadCliConfig( // Call the (now wrapper) loadHierarchicalGeminiMemory which calls the server's version const { memoryContent, fileCount } = await loadHierarchicalGeminiMemory( - process.cwd(), + cwd, settings.loadMemoryFromIncludeDirectories ? includeDirectories : [], debugMode, fileService, @@ -398,7 +399,7 @@ export async function loadCliConfig( !!argv.promptInteractive || (process.stdin.isTTY && question.length === 0); // In non-interactive mode, exclude tools that require a prompt. const extraExcludes: string[] = []; - if (!interactive) { + if (!interactive && !argv.experimentalAcp) { switch (approvalMode) { case ApprovalMode.DEFAULT: // In default non-interactive mode, all tools that require approval are excluded. @@ -457,7 +458,7 @@ export async function loadCliConfig( sessionId, embeddingModel: DEFAULT_GEMINI_EMBEDDING_MODEL, sandbox: sandboxConfig, - targetDir: process.cwd(), + targetDir: cwd, includeDirectories, loadMemoryFromIncludeDirectories: settings.loadMemoryFromIncludeDirectories || false, @@ -505,13 +506,13 @@ export async function loadCliConfig( process.env.https_proxy || process.env.HTTP_PROXY || process.env.http_proxy, - cwd: process.cwd(), + cwd, fileDiscoveryService: fileService, bugCommand: settings.bugCommand, model: argv.model || settings.model || DEFAULT_GEMINI_MODEL, extensionContextFilePaths, maxSessionTurns: settings.maxSessionTurns ?? -1, - experimentalAcp: argv.experimentalAcp || false, + experimentalZedIntegration: argv.experimentalAcp || false, listExtensions: argv.listExtensions || false, extensions: allExtensions, blockedMcpServers, |