merge: resolve v1.22.0 conflicts with custom

2026-08-31 07:37:26 -04:00
parent bdda3c36bc 6b2b12382e
commit 119caff03c
200 changed files with 44922 additions and 775 deletions
@@ -1,3 +1,4 @@
+import { sanitizeGitProviders } from '../git-providers/config.js';
 import { isAgentMemoryFeatureAvailable } from '../agent-memory/feature-flag.js';

 export const createSettingsHelpers = (dependencies) => {
@@ -498,6 +499,10 @@ export const createSettingsHelpers = (dependencies) => {
      const trimmed = candidate.gitModelId.trim();
      result.gitModelId = trimmed.length > 0 ? trimmed : undefined;
    }
+    const gitProviders = sanitizeGitProviders(candidate.gitProviders);
+    if (gitProviders) {
+      result.gitProviders = gitProviders;
+    }
    if (typeof candidate.pwaAppName === 'string') {
      result.pwaAppName = normalizePwaAppName(candidate.pwaAppName, undefined);
    }