feat(a2a): merge latest main and resolve agent manager conflicts

2026-04-03 01:40:59 -07:00 · 2026-03-12 15:34:06 -07:00
parent d7d53981f3
commit 9f5c35df37
9 changed files with 121 additions and 10 deletions
--- a/packages/a2a-server/src/config/config.ts
+++ b/packages/a2a-server/src/config/config.ts
@@ -110,6 +110,7 @@ export async function loadConfig(
    interactive: !isHeadlessMode(),
    enableInteractiveShell: !isHeadlessMode(),
    ptyInfo: 'auto',
+    enableAgents: settings.experimental?.enableAgents ?? false,
  };

  const fileService = new FileDiscoveryService(workspaceDir, {
--- a/packages/a2a-server/src/config/settings.ts
+++ b/packages/a2a-server/src/config/settings.ts
@@ -48,6 +48,9 @@ export interface Settings {
    enableRecursiveFileSearch?: boolean;
    customIgnoreFilePaths?: string[];
  };
+  experimental?: {
+    enableAgents?: boolean;
+  };
 }

 export interface SettingsError {