From a72be90c4df35a5a36433d9377ee8de339dca712 Mon Sep 17 00:00:00 2001 From: Shi Shu Date: Tue, 9 Sep 2025 11:00:38 -0400 Subject: [PATCH 1/2] Wire up folderTrust from settings to the config --- packages/a2a-server/src/config/config.ts | 3 ++- packages/a2a-server/src/config/settings.ts | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/a2a-server/src/config/config.ts b/packages/a2a-server/src/config/config.ts index 0b6b9b85998..f0bda08cb67 100644 --- a/packages/a2a-server/src/config/config.ts +++ b/packages/a2a-server/src/config/config.ts @@ -69,6 +69,7 @@ export async function loadConfig( settings.fileFiltering?.enableRecursiveFileSearch, }, ideMode: false, + folderTrust: settings.folderTrust ?? false, }; const fileService = new FileDiscoveryService(workspaceDir); @@ -79,7 +80,7 @@ export async function loadConfig( false, fileService, extensionContextFilePaths, - true, /// TODO: Wire up folder trust logic here. + settings.folderTrust ?? false, ); configParams.userMemory = memoryContent; configParams.geminiMdFileCount = fileCount; diff --git a/packages/a2a-server/src/config/settings.ts b/packages/a2a-server/src/config/settings.ts index dbe5129955c..c5bb8cd7b6f 100644 --- a/packages/a2a-server/src/config/settings.ts +++ b/packages/a2a-server/src/config/settings.ts @@ -27,6 +27,7 @@ export interface Settings { telemetry?: TelemetrySettings; showMemoryUsage?: boolean; checkpointing?: CheckpointingSettings; + folderTrust?: boolean; // Git-aware file filtering settings fileFiltering?: { From d881332aa543d3ed84a13340e8620e65223355f3 Mon Sep 17 00:00:00 2001 From: Shi Shu Date: Thu, 11 Sep 2025 10:58:40 -0400 Subject: [PATCH 2/2] Make folderTrust check true value --- packages/a2a-server/src/config/config.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/a2a-server/src/config/config.ts b/packages/a2a-server/src/config/config.ts index ee3dae48852..dd380b24b3e 100644 --- a/packages/a2a-server/src/config/config.ts +++ b/packages/a2a-server/src/config/config.ts @@ -69,7 +69,7 @@ export async function loadConfig( settings.fileFiltering?.enableRecursiveFileSearch, }, ideMode: false, - folderTrust: settings.folderTrust ?? false, + folderTrust: settings.folderTrust === true, }; const fileService = new FileDiscoveryService(workspaceDir); @@ -80,7 +80,7 @@ export async function loadConfig( false, fileService, extensionContextFilePaths, - settings.folderTrust ?? false, + settings.folderTrust === true, ); configParams.userMemory = memoryContent; configParams.geminiMdFileCount = fileCount;