From 53f8617b249c9f0443f5082a293a30504a118030 Mon Sep 17 00:00:00 2001 From: shrutip90 Date: Thu, 7 Aug 2025 14:06:17 -0700 Subject: Add new folderTrust setting that the users can enable or disable (#5798) --- packages/cli/src/config/settings.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'packages/cli/src/config/settings.ts') diff --git a/packages/cli/src/config/settings.ts b/packages/cli/src/config/settings.ts index 8005ad65..a3bd8d47 100644 --- a/packages/cli/src/config/settings.ts +++ b/packages/cli/src/config/settings.ts @@ -113,10 +113,14 @@ export interface Settings { // Flag to be removed post-launch. ideModeFeature?: boolean; - folderTrustFeature?: boolean; /// IDE mode setting configured via slash command toggle. ideMode?: boolean; + // Flag to be removed post-launch. + folderTrustFeature?: boolean; + // Setting to track whether Folder trust is enabled. + folderTrust?: boolean; + // Setting to track if the user has seen the IDE integration nudge. hasSeenIdeIntegrationNudge?: boolean; @@ -178,9 +182,13 @@ export class LoadedSettings { const user = this.user.settings; const workspace = this.workspace.settings; + // folderTrust is not supported at workspace level. + // eslint-disable-next-line @typescript-eslint/no-unused-vars + const { folderTrust, ...workspaceWithoutFolderTrust } = workspace; + return { ...user, - ...workspace, + ...workspaceWithoutFolderTrust, ...system, customThemes: { ...(user.customThemes || {}), -- cgit v1.2.3