@google/gemini-cli-core 0.35.0-preview.2 → 0.36.0-nightly.20260318.e2658ccda
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/docs/changelogs/latest.md +6 -3
- package/dist/docs/changelogs/preview.md +7 -3
- package/dist/docs/reference/configuration.md +191 -8
- package/dist/docs/tools/todos.md +2 -1
- package/dist/{google-gemini-cli-core-0.35.0-preview.1.tgz → google-gemini-cli-core-0.36.0-nightly.20260317.2f90b4653.tgz} +0 -0
- package/dist/src/agents/a2a-client-manager.d.ts +2 -11
- package/dist/src/agents/a2a-client-manager.js +3 -19
- package/dist/src/agents/a2a-client-manager.js.map +1 -1
- package/dist/src/agents/a2a-client-manager.test.js +6 -10
- package/dist/src/agents/a2a-client-manager.test.js.map +1 -1
- package/dist/src/agents/registry.js +6 -3
- package/dist/src/agents/registry.js.map +1 -1
- package/dist/src/agents/registry.test.js +23 -24
- package/dist/src/agents/registry.test.js.map +1 -1
- package/dist/src/agents/remote-invocation.d.ts +3 -1
- package/dist/src/agents/remote-invocation.js +10 -5
- package/dist/src/agents/remote-invocation.js.map +1 -1
- package/dist/src/agents/remote-invocation.test.js +64 -41
- package/dist/src/agents/remote-invocation.test.js.map +1 -1
- package/dist/src/agents/subagent-tool-wrapper.js +1 -1
- package/dist/src/agents/subagent-tool-wrapper.js.map +1 -1
- package/dist/src/config/config.d.ts +6 -0
- package/dist/src/config/config.js +35 -6
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +4 -1
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/defaultModelConfigs.js +120 -8
- package/dist/src/config/defaultModelConfigs.js.map +1 -1
- package/dist/src/config/models.d.ts +13 -2
- package/dist/src/config/models.js +20 -3
- package/dist/src/config/models.js.map +1 -1
- package/dist/src/config/models.test.js +52 -0
- package/dist/src/config/models.test.js.map +1 -1
- package/dist/src/core/client.js +1 -1
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/contentGenerator.js +1 -1
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/geminiChat.js +2 -2
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/prompts.test.js +8 -0
- package/dist/src/core/prompts.test.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/generated/git-commit.js.map +1 -1
- package/dist/src/policy/policy-engine.test.js +3 -3
- package/dist/src/policy/policy-engine.test.js.map +1 -1
- package/dist/src/policy/types.d.ts +5 -0
- package/dist/src/policy/types.js +5 -0
- package/dist/src/policy/types.js.map +1 -1
- package/dist/src/prompts/promptProvider.js +3 -3
- package/dist/src/prompts/promptProvider.js.map +1 -1
- package/dist/src/prompts/snippets.legacy.d.ts +4 -0
- package/dist/src/prompts/snippets.legacy.js +25 -1
- package/dist/src/prompts/snippets.legacy.js.map +1 -1
- package/dist/src/routing/strategies/classifierStrategy.js +1 -1
- package/dist/src/routing/strategies/classifierStrategy.js.map +1 -1
- package/dist/src/routing/strategies/defaultStrategy.js +1 -1
- package/dist/src/routing/strategies/defaultStrategy.js.map +1 -1
- package/dist/src/routing/strategies/fallbackStrategy.js +1 -1
- package/dist/src/routing/strategies/fallbackStrategy.js.map +1 -1
- package/dist/src/routing/strategies/numericalClassifierStrategy.js +1 -1
- package/dist/src/routing/strategies/numericalClassifierStrategy.js.map +1 -1
- package/dist/src/routing/strategies/overrideStrategy.js +1 -1
- package/dist/src/routing/strategies/overrideStrategy.js.map +1 -1
- package/dist/src/services/modelConfigService.d.ts +28 -1
- package/dist/src/services/modelConfigService.js +48 -0
- package/dist/src/services/modelConfigService.js.map +1 -1
- package/dist/src/services/trackerTypes.d.ts +1 -0
- package/dist/src/services/trackerTypes.js +1 -0
- package/dist/src/services/trackerTypes.js.map +1 -1
- package/dist/src/tools/definitions/model-family-sets/default-legacy.js +8 -1
- package/dist/src/tools/definitions/model-family-sets/default-legacy.js.map +1 -1
- package/dist/src/tools/definitions/model-family-sets/gemini-3.js +8 -1
- package/dist/src/tools/definitions/model-family-sets/gemini-3.js.map +1 -1
- package/dist/src/tools/mcp-client-manager.d.ts +22 -3
- package/dist/src/tools/mcp-client-manager.js +84 -32
- package/dist/src/tools/mcp-client-manager.js.map +1 -1
- package/dist/src/tools/mcp-client-manager.test.js +76 -56
- package/dist/src/tools/mcp-client-manager.test.js.map +1 -1
- package/dist/src/tools/mcp-client.d.ts +15 -6
- package/dist/src/tools/mcp-client.js +85 -71
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +195 -88
- package/dist/src/tools/mcp-client.test.js.map +1 -1
- package/dist/src/tools/tool-registry.d.ts +2 -1
- package/dist/src/tools/tool-registry.js +12 -1
- package/dist/src/tools/tool-registry.js.map +1 -1
- package/dist/src/tools/tool-registry.test.js +15 -0
- package/dist/src/tools/tool-registry.test.js.map +1 -1
- package/dist/src/tools/tools.d.ts +1 -1
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/trackerTools.js +6 -1
- package/dist/src/tools/trackerTools.js.map +1 -1
- package/dist/src/tools/trackerTools.test.js +9 -1
- package/dist/src/tools/trackerTools.test.js.map +1 -1
- package/dist/src/tools/write-todos.js +1 -0
- package/dist/src/tools/write-todos.js.map +1 -1
- package/dist/src/tools/write-todos.test.js +4 -1
- package/dist/src/tools/write-todos.test.js.map +1 -1
- package/dist/src/utils/compatibility.d.ts +16 -0
- package/dist/src/utils/compatibility.js +58 -9
- package/dist/src/utils/compatibility.js.map +1 -1
- package/dist/src/utils/compatibility.test.js +127 -29
- package/dist/src/utils/compatibility.test.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.js +11 -19
- package/dist/src/utils/memoryDiscovery.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.test.js +15 -47
- package/dist/src/utils/memoryDiscovery.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -1
|
@@ -5,14 +5,16 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { describe, it, expect, vi, beforeEach, afterEach, } from 'vitest';
|
|
7
7
|
import { RemoteAgentInvocation } from './remote-invocation.js';
|
|
8
|
-
import {
|
|
8
|
+
import {} from './a2a-client-manager.js';
|
|
9
9
|
import { createMockMessageBus } from '../test-utils/mock-message-bus.js';
|
|
10
10
|
import { A2AAuthProviderFactory } from './auth-provider/factory.js';
|
|
11
11
|
// Mock A2AClientManager
|
|
12
12
|
vi.mock('./a2a-client-manager.js', () => ({
|
|
13
|
-
A2AClientManager: {
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
A2AClientManager: vi.fn().mockImplementation(() => ({
|
|
14
|
+
getClient: vi.fn(),
|
|
15
|
+
loadAgent: vi.fn(),
|
|
16
|
+
sendMessageStream: vi.fn(),
|
|
17
|
+
})),
|
|
16
18
|
}));
|
|
17
19
|
// Mock A2AAuthProviderFactory
|
|
18
20
|
vi.mock('./auth-provider/factory.js', () => ({
|
|
@@ -31,15 +33,30 @@ describe('RemoteAgentInvocation', () => {
|
|
|
31
33
|
inputSchema: { type: 'object' },
|
|
32
34
|
},
|
|
33
35
|
};
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
36
|
+
let mockClientManager;
|
|
37
|
+
let mockContext;
|
|
38
|
+
const mockMessageBus = createMockMessageBus();
|
|
39
|
+
const mockClient = {
|
|
37
40
|
sendMessageStream: vi.fn(),
|
|
41
|
+
getTask: vi.fn(),
|
|
42
|
+
cancelTask: vi.fn(),
|
|
38
43
|
};
|
|
39
|
-
const mockMessageBus = createMockMessageBus();
|
|
40
44
|
beforeEach(() => {
|
|
41
45
|
vi.clearAllMocks();
|
|
42
|
-
|
|
46
|
+
mockClientManager = {
|
|
47
|
+
getClient: vi.fn(),
|
|
48
|
+
loadAgent: vi.fn(),
|
|
49
|
+
sendMessageStream: vi.fn(),
|
|
50
|
+
};
|
|
51
|
+
const mockConfig = {
|
|
52
|
+
getA2AClientManager: vi.fn().mockReturnValue(mockClientManager),
|
|
53
|
+
injectionService: {
|
|
54
|
+
getLatestInjectionIndex: vi.fn().mockReturnValue(0),
|
|
55
|
+
},
|
|
56
|
+
};
|
|
57
|
+
mockContext = {
|
|
58
|
+
config: mockConfig,
|
|
59
|
+
};
|
|
43
60
|
RemoteAgentInvocation.sessionState?.clear();
|
|
44
61
|
});
|
|
45
62
|
afterEach(() => {
|
|
@@ -48,16 +65,16 @@ describe('RemoteAgentInvocation', () => {
|
|
|
48
65
|
describe('Constructor Validation', () => {
|
|
49
66
|
it('accepts valid input with string query', () => {
|
|
50
67
|
expect(() => {
|
|
51
|
-
new RemoteAgentInvocation(mockDefinition, { query: 'valid' }, mockMessageBus);
|
|
68
|
+
new RemoteAgentInvocation(mockDefinition, mockContext, { query: 'valid' }, mockMessageBus);
|
|
52
69
|
}).not.toThrow();
|
|
53
70
|
});
|
|
54
71
|
it('accepts missing query (defaults to "Get Started!")', () => {
|
|
55
72
|
expect(() => {
|
|
56
|
-
new RemoteAgentInvocation(mockDefinition, {}, mockMessageBus);
|
|
73
|
+
new RemoteAgentInvocation(mockDefinition, mockContext, {}, mockMessageBus);
|
|
57
74
|
}).not.toThrow();
|
|
58
75
|
});
|
|
59
76
|
it('uses "Get Started!" default when query is missing during execution', async () => {
|
|
60
|
-
mockClientManager.getClient.mockReturnValue(
|
|
77
|
+
mockClientManager.getClient.mockReturnValue(mockClient);
|
|
61
78
|
mockClientManager.sendMessageStream.mockImplementation(async function* () {
|
|
62
79
|
yield {
|
|
63
80
|
kind: 'message',
|
|
@@ -66,13 +83,13 @@ describe('RemoteAgentInvocation', () => {
|
|
|
66
83
|
parts: [{ kind: 'text', text: 'Hello' }],
|
|
67
84
|
};
|
|
68
85
|
});
|
|
69
|
-
const invocation = new RemoteAgentInvocation(mockDefinition, {}, mockMessageBus);
|
|
86
|
+
const invocation = new RemoteAgentInvocation(mockDefinition, mockContext, {}, mockMessageBus);
|
|
70
87
|
await invocation.execute(new AbortController().signal);
|
|
71
88
|
expect(mockClientManager.sendMessageStream).toHaveBeenCalledWith('test-agent', 'Get Started!', expect.objectContaining({ signal: expect.any(Object) }));
|
|
72
89
|
});
|
|
73
90
|
it('throws if query is not a string', () => {
|
|
74
91
|
expect(() => {
|
|
75
|
-
new RemoteAgentInvocation(mockDefinition, { query: 123 }, mockMessageBus);
|
|
92
|
+
new RemoteAgentInvocation(mockDefinition, mockContext, { query: 123 }, mockMessageBus);
|
|
76
93
|
}).toThrow("requires a string 'query' input");
|
|
77
94
|
});
|
|
78
95
|
});
|
|
@@ -87,7 +104,7 @@ describe('RemoteAgentInvocation', () => {
|
|
|
87
104
|
parts: [{ kind: 'text', text: 'Hello' }],
|
|
88
105
|
};
|
|
89
106
|
});
|
|
90
|
-
const invocation = new RemoteAgentInvocation(mockDefinition, {
|
|
107
|
+
const invocation = new RemoteAgentInvocation(mockDefinition, mockContext, {
|
|
91
108
|
query: 'hi',
|
|
92
109
|
}, mockMessageBus);
|
|
93
110
|
await invocation.execute(new AbortController().signal);
|
|
@@ -119,7 +136,7 @@ describe('RemoteAgentInvocation', () => {
|
|
|
119
136
|
parts: [{ kind: 'text', text: 'Hello' }],
|
|
120
137
|
};
|
|
121
138
|
});
|
|
122
|
-
const invocation = new RemoteAgentInvocation(authDefinition, { query: 'hi' }, mockMessageBus);
|
|
139
|
+
const invocation = new RemoteAgentInvocation(authDefinition, mockContext, { query: 'hi' }, mockMessageBus);
|
|
123
140
|
await invocation.execute(new AbortController().signal);
|
|
124
141
|
expect(A2AAuthProviderFactory.create).toHaveBeenCalledWith({
|
|
125
142
|
authConfig: mockAuth,
|
|
@@ -140,12 +157,12 @@ describe('RemoteAgentInvocation', () => {
|
|
|
140
157
|
};
|
|
141
158
|
A2AAuthProviderFactory.create.mockResolvedValue(undefined);
|
|
142
159
|
mockClientManager.getClient.mockReturnValue(undefined);
|
|
143
|
-
const invocation = new RemoteAgentInvocation(authDefinition, { query: 'hi' }, mockMessageBus);
|
|
160
|
+
const invocation = new RemoteAgentInvocation(authDefinition, mockContext, { query: 'hi' }, mockMessageBus);
|
|
144
161
|
const result = await invocation.execute(new AbortController().signal);
|
|
145
162
|
expect(result.error?.message).toContain("Failed to create auth provider for agent 'test-agent'");
|
|
146
163
|
});
|
|
147
164
|
it('should not load the agent if already present', async () => {
|
|
148
|
-
mockClientManager.getClient.mockReturnValue(
|
|
165
|
+
mockClientManager.getClient.mockReturnValue(mockClient);
|
|
149
166
|
mockClientManager.sendMessageStream.mockImplementation(async function* () {
|
|
150
167
|
yield {
|
|
151
168
|
kind: 'message',
|
|
@@ -154,14 +171,14 @@ describe('RemoteAgentInvocation', () => {
|
|
|
154
171
|
parts: [{ kind: 'text', text: 'Hello' }],
|
|
155
172
|
};
|
|
156
173
|
});
|
|
157
|
-
const invocation = new RemoteAgentInvocation(mockDefinition, {
|
|
174
|
+
const invocation = new RemoteAgentInvocation(mockDefinition, mockContext, {
|
|
158
175
|
query: 'hi',
|
|
159
176
|
}, mockMessageBus);
|
|
160
177
|
await invocation.execute(new AbortController().signal);
|
|
161
178
|
expect(mockClientManager.loadAgent).not.toHaveBeenCalled();
|
|
162
179
|
});
|
|
163
180
|
it('should persist contextId and taskId across invocations', async () => {
|
|
164
|
-
mockClientManager.getClient.mockReturnValue(
|
|
181
|
+
mockClientManager.getClient.mockReturnValue(mockClient);
|
|
165
182
|
// First call return values
|
|
166
183
|
mockClientManager.sendMessageStream.mockImplementationOnce(async function* () {
|
|
167
184
|
yield {
|
|
@@ -173,7 +190,7 @@ describe('RemoteAgentInvocation', () => {
|
|
|
173
190
|
taskId: 'task-1',
|
|
174
191
|
};
|
|
175
192
|
});
|
|
176
|
-
const invocation1 = new RemoteAgentInvocation(mockDefinition, {
|
|
193
|
+
const invocation1 = new RemoteAgentInvocation(mockDefinition, mockContext, {
|
|
177
194
|
query: 'first',
|
|
178
195
|
}, mockMessageBus);
|
|
179
196
|
// Execute first time
|
|
@@ -191,7 +208,7 @@ describe('RemoteAgentInvocation', () => {
|
|
|
191
208
|
taskId: 'task-2',
|
|
192
209
|
};
|
|
193
210
|
});
|
|
194
|
-
const invocation2 = new RemoteAgentInvocation(mockDefinition, {
|
|
211
|
+
const invocation2 = new RemoteAgentInvocation(mockDefinition, mockContext, {
|
|
195
212
|
query: 'second',
|
|
196
213
|
}, mockMessageBus);
|
|
197
214
|
const result2 = await invocation2.execute(new AbortController().signal);
|
|
@@ -208,7 +225,7 @@ describe('RemoteAgentInvocation', () => {
|
|
|
208
225
|
history: [],
|
|
209
226
|
};
|
|
210
227
|
});
|
|
211
|
-
const invocation3 = new RemoteAgentInvocation(mockDefinition, {
|
|
228
|
+
const invocation3 = new RemoteAgentInvocation(mockDefinition, mockContext, {
|
|
212
229
|
query: 'third',
|
|
213
230
|
}, mockMessageBus);
|
|
214
231
|
await invocation3.execute(new AbortController().signal);
|
|
@@ -221,14 +238,14 @@ describe('RemoteAgentInvocation', () => {
|
|
|
221
238
|
parts: [{ kind: 'text', text: 'New Task' }],
|
|
222
239
|
};
|
|
223
240
|
});
|
|
224
|
-
const invocation4 = new RemoteAgentInvocation(mockDefinition, {
|
|
241
|
+
const invocation4 = new RemoteAgentInvocation(mockDefinition, mockContext, {
|
|
225
242
|
query: 'fourth',
|
|
226
243
|
}, mockMessageBus);
|
|
227
244
|
await invocation4.execute(new AbortController().signal);
|
|
228
245
|
expect(mockClientManager.sendMessageStream).toHaveBeenLastCalledWith('test-agent', 'fourth', { contextId: 'ctx-1', taskId: undefined, signal: expect.any(Object) });
|
|
229
246
|
});
|
|
230
247
|
it('should handle streaming updates and reassemble output', async () => {
|
|
231
|
-
mockClientManager.getClient.mockReturnValue(
|
|
248
|
+
mockClientManager.getClient.mockReturnValue(mockClient);
|
|
232
249
|
mockClientManager.sendMessageStream.mockImplementation(async function* () {
|
|
233
250
|
yield {
|
|
234
251
|
kind: 'message',
|
|
@@ -244,13 +261,13 @@ describe('RemoteAgentInvocation', () => {
|
|
|
244
261
|
};
|
|
245
262
|
});
|
|
246
263
|
const updateOutput = vi.fn();
|
|
247
|
-
const invocation = new RemoteAgentInvocation(mockDefinition, { query: 'hi' }, mockMessageBus);
|
|
264
|
+
const invocation = new RemoteAgentInvocation(mockDefinition, mockContext, { query: 'hi' }, mockMessageBus);
|
|
248
265
|
await invocation.execute(new AbortController().signal, updateOutput);
|
|
249
266
|
expect(updateOutput).toHaveBeenCalledWith('Hello');
|
|
250
267
|
expect(updateOutput).toHaveBeenCalledWith('Hello\n\nHello World');
|
|
251
268
|
});
|
|
252
269
|
it('should abort when signal is aborted during streaming', async () => {
|
|
253
|
-
mockClientManager.getClient.mockReturnValue(
|
|
270
|
+
mockClientManager.getClient.mockReturnValue(mockClient);
|
|
254
271
|
const controller = new AbortController();
|
|
255
272
|
mockClientManager.sendMessageStream.mockImplementation(async function* () {
|
|
256
273
|
yield {
|
|
@@ -268,19 +285,19 @@ describe('RemoteAgentInvocation', () => {
|
|
|
268
285
|
parts: [{ kind: 'text', text: 'Partial response continued' }],
|
|
269
286
|
};
|
|
270
287
|
});
|
|
271
|
-
const invocation = new RemoteAgentInvocation(mockDefinition, { query: 'hi' }, mockMessageBus);
|
|
288
|
+
const invocation = new RemoteAgentInvocation(mockDefinition, mockContext, { query: 'hi' }, mockMessageBus);
|
|
272
289
|
const result = await invocation.execute(controller.signal);
|
|
273
290
|
expect(result.error).toBeDefined();
|
|
274
291
|
expect(result.error?.message).toContain('Operation aborted');
|
|
275
292
|
});
|
|
276
293
|
it('should handle errors gracefully', async () => {
|
|
277
|
-
mockClientManager.getClient.mockReturnValue(
|
|
294
|
+
mockClientManager.getClient.mockReturnValue(mockClient);
|
|
278
295
|
mockClientManager.sendMessageStream.mockImplementation(async function* () {
|
|
279
296
|
if (Math.random() < 0)
|
|
280
297
|
yield {};
|
|
281
298
|
throw new Error('Network error');
|
|
282
299
|
});
|
|
283
|
-
const invocation = new RemoteAgentInvocation(mockDefinition, {
|
|
300
|
+
const invocation = new RemoteAgentInvocation(mockDefinition, mockContext, {
|
|
284
301
|
query: 'hi',
|
|
285
302
|
}, mockMessageBus);
|
|
286
303
|
const result = await invocation.execute(new AbortController().signal);
|
|
@@ -289,7 +306,7 @@ describe('RemoteAgentInvocation', () => {
|
|
|
289
306
|
expect(result.returnDisplay).toContain('Network error');
|
|
290
307
|
});
|
|
291
308
|
it('should use a2a helpers for extracting text', async () => {
|
|
292
|
-
mockClientManager.getClient.mockReturnValue(
|
|
309
|
+
mockClientManager.getClient.mockReturnValue(mockClient);
|
|
293
310
|
// Mock a complex message part that needs extraction
|
|
294
311
|
mockClientManager.sendMessageStream.mockImplementation(async function* () {
|
|
295
312
|
yield {
|
|
@@ -302,7 +319,7 @@ describe('RemoteAgentInvocation', () => {
|
|
|
302
319
|
],
|
|
303
320
|
};
|
|
304
321
|
});
|
|
305
|
-
const invocation = new RemoteAgentInvocation(mockDefinition, {
|
|
322
|
+
const invocation = new RemoteAgentInvocation(mockDefinition, mockContext, {
|
|
306
323
|
query: 'hi',
|
|
307
324
|
}, mockMessageBus);
|
|
308
325
|
const result = await invocation.execute(new AbortController().signal);
|
|
@@ -310,7 +327,7 @@ describe('RemoteAgentInvocation', () => {
|
|
|
310
327
|
expect(result.returnDisplay).toContain('Extracted text');
|
|
311
328
|
});
|
|
312
329
|
it('should handle mixed response types during streaming (TaskStatusUpdateEvent + Message)', async () => {
|
|
313
|
-
mockClientManager.getClient.mockReturnValue(
|
|
330
|
+
mockClientManager.getClient.mockReturnValue(mockClient);
|
|
314
331
|
mockClientManager.sendMessageStream.mockImplementation(async function* () {
|
|
315
332
|
yield {
|
|
316
333
|
kind: 'status-update',
|
|
@@ -335,23 +352,26 @@ describe('RemoteAgentInvocation', () => {
|
|
|
335
352
|
};
|
|
336
353
|
});
|
|
337
354
|
const updateOutput = vi.fn();
|
|
338
|
-
const invocation = new RemoteAgentInvocation(mockDefinition, { query: 'hi' }, mockMessageBus);
|
|
355
|
+
const invocation = new RemoteAgentInvocation(mockDefinition, mockContext, { query: 'hi' }, mockMessageBus);
|
|
339
356
|
const result = await invocation.execute(new AbortController().signal, updateOutput);
|
|
340
357
|
expect(updateOutput).toHaveBeenCalledWith('Thinking...');
|
|
341
358
|
expect(updateOutput).toHaveBeenCalledWith('Thinking...\n\nFinal Answer');
|
|
342
359
|
expect(result.returnDisplay).toBe('Thinking...\n\nFinal Answer');
|
|
343
360
|
});
|
|
344
361
|
it('should handle artifact reassembly with append: true', async () => {
|
|
345
|
-
mockClientManager.getClient.mockReturnValue(
|
|
362
|
+
mockClientManager.getClient.mockReturnValue(mockClient);
|
|
346
363
|
mockClientManager.sendMessageStream.mockImplementation(async function* () {
|
|
347
364
|
yield {
|
|
348
365
|
kind: 'status-update',
|
|
349
366
|
taskId: 'task-1',
|
|
367
|
+
contextId: 'ctx-1',
|
|
368
|
+
final: false,
|
|
350
369
|
status: {
|
|
351
370
|
state: 'working',
|
|
352
371
|
message: {
|
|
353
372
|
kind: 'message',
|
|
354
373
|
role: 'agent',
|
|
374
|
+
messageId: 'm1',
|
|
355
375
|
parts: [{ kind: 'text', text: 'Generating...' }],
|
|
356
376
|
},
|
|
357
377
|
},
|
|
@@ -359,6 +379,7 @@ describe('RemoteAgentInvocation', () => {
|
|
|
359
379
|
yield {
|
|
360
380
|
kind: 'artifact-update',
|
|
361
381
|
taskId: 'task-1',
|
|
382
|
+
contextId: 'ctx-1',
|
|
362
383
|
append: false,
|
|
363
384
|
artifact: {
|
|
364
385
|
artifactId: 'art-1',
|
|
@@ -369,15 +390,17 @@ describe('RemoteAgentInvocation', () => {
|
|
|
369
390
|
yield {
|
|
370
391
|
kind: 'artifact-update',
|
|
371
392
|
taskId: 'task-1',
|
|
393
|
+
contextId: 'ctx-1',
|
|
372
394
|
append: true,
|
|
373
395
|
artifact: {
|
|
374
396
|
artifactId: 'art-1',
|
|
375
397
|
parts: [{ kind: 'text', text: ' Part 2' }],
|
|
376
398
|
},
|
|
377
399
|
};
|
|
400
|
+
return;
|
|
378
401
|
});
|
|
379
402
|
const updateOutput = vi.fn();
|
|
380
|
-
const invocation = new RemoteAgentInvocation(mockDefinition, { query: 'hi' }, mockMessageBus);
|
|
403
|
+
const invocation = new RemoteAgentInvocation(mockDefinition, mockContext, { query: 'hi' }, mockMessageBus);
|
|
381
404
|
await invocation.execute(new AbortController().signal, updateOutput);
|
|
382
405
|
expect(updateOutput).toHaveBeenCalledWith('Generating...');
|
|
383
406
|
expect(updateOutput).toHaveBeenCalledWith('Generating...\n\nArtifact (Result):\nPart 1');
|
|
@@ -386,7 +409,7 @@ describe('RemoteAgentInvocation', () => {
|
|
|
386
409
|
});
|
|
387
410
|
describe('Confirmations', () => {
|
|
388
411
|
it('should return info confirmation details', async () => {
|
|
389
|
-
const invocation = new RemoteAgentInvocation(mockDefinition, {
|
|
412
|
+
const invocation = new RemoteAgentInvocation(mockDefinition, mockContext, {
|
|
390
413
|
query: 'hi',
|
|
391
414
|
}, mockMessageBus);
|
|
392
415
|
// @ts-expect-error - getConfirmationDetails is protected
|
|
@@ -409,7 +432,7 @@ describe('RemoteAgentInvocation', () => {
|
|
|
409
432
|
const a2aError = new AgentConnectionError('test-agent', 'http://test-agent/card', new Error('ECONNREFUSED'));
|
|
410
433
|
mockClientManager.getClient.mockReturnValue(undefined);
|
|
411
434
|
mockClientManager.loadAgent.mockRejectedValue(a2aError);
|
|
412
|
-
const invocation = new RemoteAgentInvocation(mockDefinition, { query: 'hi' }, mockMessageBus);
|
|
435
|
+
const invocation = new RemoteAgentInvocation(mockDefinition, mockContext, { query: 'hi' }, mockMessageBus);
|
|
413
436
|
const result = await invocation.execute(new AbortController().signal);
|
|
414
437
|
expect(result.error).toBeDefined();
|
|
415
438
|
expect(result.returnDisplay).toContain(a2aError.userMessage);
|
|
@@ -417,13 +440,13 @@ describe('RemoteAgentInvocation', () => {
|
|
|
417
440
|
it('should use generic message for non-A2AAgentError errors', async () => {
|
|
418
441
|
mockClientManager.getClient.mockReturnValue(undefined);
|
|
419
442
|
mockClientManager.loadAgent.mockRejectedValue(new Error('something unexpected'));
|
|
420
|
-
const invocation = new RemoteAgentInvocation(mockDefinition, { query: 'hi' }, mockMessageBus);
|
|
443
|
+
const invocation = new RemoteAgentInvocation(mockDefinition, mockContext, { query: 'hi' }, mockMessageBus);
|
|
421
444
|
const result = await invocation.execute(new AbortController().signal);
|
|
422
445
|
expect(result.error).toBeDefined();
|
|
423
446
|
expect(result.returnDisplay).toContain('Error calling remote agent: something unexpected');
|
|
424
447
|
});
|
|
425
448
|
it('should include partial output when error occurs mid-stream', async () => {
|
|
426
|
-
mockClientManager.getClient.mockReturnValue(
|
|
449
|
+
mockClientManager.getClient.mockReturnValue(mockClient);
|
|
427
450
|
mockClientManager.sendMessageStream.mockImplementation(async function* () {
|
|
428
451
|
yield {
|
|
429
452
|
kind: 'message',
|
|
@@ -434,7 +457,7 @@ describe('RemoteAgentInvocation', () => {
|
|
|
434
457
|
// Raw errors propagate from the A2A SDK — no wrapping or classification.
|
|
435
458
|
throw new Error('connection reset');
|
|
436
459
|
});
|
|
437
|
-
const invocation = new RemoteAgentInvocation(mockDefinition, { query: 'hi' }, mockMessageBus);
|
|
460
|
+
const invocation = new RemoteAgentInvocation(mockDefinition, mockContext, { query: 'hi' }, mockMessageBus);
|
|
438
461
|
const result = await invocation.execute(new AbortController().signal);
|
|
439
462
|
expect(result.error).toBeDefined();
|
|
440
463
|
// Should contain both the partial output and the error message
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-invocation.test.js","sourceRoot":"","sources":["../../../src/agents/remote-invocation.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"remote-invocation.test.js","sourceRoot":"","sources":["../../../src/agents/remote-invocation.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,QAAQ,EACR,EAAE,EACF,MAAM,EACN,EAAE,EACF,UAAU,EACV,SAAS,GAEV,MAAM,QAAQ,CAAC;AAEhB,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAGN,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAKpE,wBAAwB;AACxB,EAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,gBAAgB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC;QAClD,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE;QAClB,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE;QAClB,iBAAiB,EAAE,EAAE,CAAC,EAAE,EAAE;KAC3B,CAAC,CAAC;CACJ,CAAC,CAAC,CAAC;AAEJ,8BAA8B;AAC9B,EAAE,CAAC,IAAI,CAAC,4BAA4B,EAAE,GAAG,EAAE,CAAC,CAAC;IAC3C,sBAAsB,EAAE;QACtB,MAAM,EAAE,EAAE,CAAC,EAAE,EAAE;KAChB;CACF,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,MAAM,cAAc,GAA0B;QAC5C,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,wBAAwB;QACtC,WAAW,EAAE,YAAY;QACzB,WAAW,EAAE,cAAc;QAC3B,WAAW,EAAE;YACX,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAChC;KACF,CAAC;IAEF,IAAI,iBAIH,CAAC;IACF,IAAI,WAA6B,CAAC;IAClC,MAAM,cAAc,GAAG,oBAAoB,EAAE,CAAC;IAE9C,MAAM,UAAU,GAAG;QACjB,iBAAiB,EAAE,EAAE,CAAC,EAAE,EAAE;QAC1B,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;QAChB,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE;KACC,CAAC;IAEvB,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;QAEnB,iBAAiB,GAAG;YAClB,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE;YAClB,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE;YAClB,iBAAiB,EAAE,EAAE,CAAC,EAAE,EAAE;SAC3B,CAAC;QAEF,MAAM,UAAU,GAAG;YACjB,mBAAmB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,iBAAiB,CAAC;YAC/D,gBAAgB,EAAE;gBAChB,uBAAuB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;aACpD;SACmB,CAAC;QAEvB,WAAW,GAAG;YACZ,MAAM,EAAE,UAAU;SACY,CAAC;QAG/B,qBAGD,CAAC,YAAY,EAAE,KAAK,EAAE,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;QACtC,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;YAC/C,MAAM,CAAC,GAAG,EAAE;gBACV,IAAI,qBAAqB,CACvB,cAAc,EACd,WAAW,EACX,EAAE,KAAK,EAAE,OAAO,EAAE,EAClB,cAAc,CACf,CAAC;YACJ,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;YAC5D,MAAM,CAAC,GAAG,EAAE;gBACV,IAAI,qBAAqB,CACvB,cAAc,EACd,WAAW,EACX,EAAE,EACF,cAAc,CACf,CAAC;YACJ,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oEAAoE,EAAE,KAAK,IAAI,EAAE;YAClF,iBAAiB,CAAC,SAAS,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACxD,iBAAiB,CAAC,iBAAiB,CAAC,kBAAkB,CACpD,KAAK,SAAS,CAAC;gBACb,MAAM;oBACJ,IAAI,EAAE,SAAS;oBACf,SAAS,EAAE,OAAO;oBAClB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;iBACzC,CAAC;YACJ,CAAC,CACF,CAAC;YAEF,MAAM,UAAU,GAAG,IAAI,qBAAqB,CAC1C,cAAc,EACd,WAAW,EACX,EAAE,EACF,cAAc,CACf,CAAC;YACF,MAAM,UAAU,CAAC,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC;YAEvD,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC,oBAAoB,CAC9D,YAAY,EACZ,cAAc,EACd,MAAM,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CACxD,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;YACzC,MAAM,CAAC,GAAG,EAAE;gBACV,IAAI,qBAAqB,CACvB,cAAc,EACd,WAAW,EACX,EAAE,KAAK,EAAE,GAAG,EAAE,EACd,cAAc,CACf,CAAC;YACJ,CAAC,CAAC,CAAC,OAAO,CAAC,iCAAiC,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,yEAAyE,EAAE,KAAK,IAAI,EAAE;YACvF,iBAAiB,CAAC,SAAS,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YACvD,iBAAiB,CAAC,iBAAiB,CAAC,kBAAkB,CACpD,KAAK,SAAS,CAAC;gBACb,MAAM;oBACJ,IAAI,EAAE,SAAS;oBACf,SAAS,EAAE,OAAO;oBAClB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;iBACzC,CAAC;YACJ,CAAC,CACF,CAAC;YAEF,MAAM,UAAU,GAAG,IAAI,qBAAqB,CAC1C,cAAc,EACd,WAAW,EACX;gBACE,KAAK,EAAE,IAAI;aACZ,EACD,cAAc,CACf,CAAC;YACF,MAAM,UAAU,CAAC,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC;YAEvD,MAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,oBAAoB,CACtD,YAAY,EACZ,wBAAwB,EACxB,SAAS,CACV,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sEAAsE,EAAE,KAAK,IAAI,EAAE;YACpF,MAAM,QAAQ,GAAG;gBACf,IAAI,EAAE,MAAe;gBACrB,MAAM,EAAE,OAAgB;gBACxB,QAAQ,EAAE,OAAO;gBACjB,QAAQ,EAAE,UAAU;aACrB,CAAC;YACF,MAAM,cAAc,GAA0B;gBAC5C,GAAG,cAAc;gBACjB,IAAI,EAAE,QAAQ;aACf,CAAC;YAEF,MAAM,WAAW,GAAG;gBAClB,IAAI,EAAE,MAAe;gBACrB,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,aAAa,EAAE,gBAAgB,EAAE,CAAC;gBACvE,sBAAsB,EAAE,EAAE,CAAC,EAAE,EAAE;aACF,CAAC;YAC/B,sBAAsB,CAAC,MAAe,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;YACvE,iBAAiB,CAAC,SAAS,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YACvD,iBAAiB,CAAC,iBAAiB,CAAC,kBAAkB,CACpD,KAAK,SAAS,CAAC;gBACb,MAAM;oBACJ,IAAI,EAAE,SAAS;oBACf,SAAS,EAAE,OAAO;oBAClB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;iBACzC,CAAC;YACJ,CAAC,CACF,CAAC;YAEF,MAAM,UAAU,GAAG,IAAI,qBAAqB,CAC1C,cAAc,EACd,WAAW,EACX,EAAE,KAAK,EAAE,IAAI,EAAE,EACf,cAAc,CACf,CAAC;YACF,MAAM,UAAU,CAAC,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC;YAEvD,MAAM,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC,oBAAoB,CAAC;gBACzD,UAAU,EAAE,QAAQ;gBACpB,SAAS,EAAE,YAAY;gBACvB,SAAS,EAAE,wBAAwB;gBACnC,YAAY,EAAE,wBAAwB;aACvC,CAAC,CAAC;YACH,MAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,oBAAoB,CACtD,YAAY,EACZ,wBAAwB,EACxB,WAAW,CACZ,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sFAAsF,EAAE,KAAK,IAAI,EAAE;YACpG,MAAM,cAAc,GAA0B;gBAC5C,GAAG,cAAc;gBACjB,IAAI,EAAE;oBACJ,IAAI,EAAE,MAAe;oBACrB,MAAM,EAAE,QAAiB;oBACzB,KAAK,EAAE,cAAc;iBACtB;aACF,CAAC;YAED,sBAAsB,CAAC,MAAe,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;YACrE,iBAAiB,CAAC,SAAS,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YAEvD,MAAM,UAAU,GAAG,IAAI,qBAAqB,CAC1C,cAAc,EACd,WAAW,EACX,EAAE,KAAK,EAAE,IAAI,EAAE,EACf,cAAc,CACf,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC;YAEtE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,SAAS,CACrC,uDAAuD,CACxD,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;YAC5D,iBAAiB,CAAC,SAAS,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACxD,iBAAiB,CAAC,iBAAiB,CAAC,kBAAkB,CACpD,KAAK,SAAS,CAAC;gBACb,MAAM;oBACJ,IAAI,EAAE,SAAS;oBACf,SAAS,EAAE,OAAO;oBAClB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;iBACzC,CAAC;YACJ,CAAC,CACF,CAAC;YAEF,MAAM,UAAU,GAAG,IAAI,qBAAqB,CAC1C,cAAc,EACd,WAAW,EACX;gBACE,KAAK,EAAE,IAAI;aACZ,EACD,cAAc,CACf,CAAC;YACF,MAAM,UAAU,CAAC,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC;YAEvD,MAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAC7D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;YACtE,iBAAiB,CAAC,SAAS,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YAExD,2BAA2B;YAC3B,iBAAiB,CAAC,iBAAiB,CAAC,sBAAsB,CACxD,KAAK,SAAS,CAAC;gBACb,MAAM;oBACJ,IAAI,EAAE,SAAS;oBACf,SAAS,EAAE,OAAO;oBAClB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;oBAC7C,SAAS,EAAE,OAAO;oBAClB,MAAM,EAAE,QAAQ;iBACjB,CAAC;YACJ,CAAC,CACF,CAAC;YAEF,MAAM,WAAW,GAAG,IAAI,qBAAqB,CAC3C,cAAc,EACd,WAAW,EACX;gBACE,KAAK,EAAE,OAAO;aACf,EACD,cAAc,CACf,CAAC;YAEF,qBAAqB;YACrB,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC;YACxE,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACjD,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC,wBAAwB,CAClE,YAAY,EACZ,OAAO,EACP,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CACxE,CAAC;YAEF,2DAA2D;YAC3D,iBAAiB,CAAC,iBAAiB,CAAC,sBAAsB,CACxD,KAAK,SAAS,CAAC;gBACb,MAAM;oBACJ,IAAI,EAAE,SAAS;oBACf,SAAS,EAAE,OAAO;oBAClB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;oBAC7C,SAAS,EAAE,OAAO;oBAClB,MAAM,EAAE,QAAQ;iBACjB,CAAC;YACJ,CAAC,CACF,CAAC;YAEF,MAAM,WAAW,GAAG,IAAI,qBAAqB,CAC3C,cAAc,EACd,WAAW,EACX;gBACE,KAAK,EAAE,QAAQ;aAChB,EACD,cAAc,CACf,CAAC;YACF,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC;YACxE,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAEjD,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC,wBAAwB,CAClE,YAAY,EACZ,QAAQ,EACR,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CACrE,CAAC;YAEF,6BAA6B;YAC7B,iBAAiB,CAAC,iBAAiB,CAAC,sBAAsB,CACxD,KAAK,SAAS,CAAC;gBACb,MAAM;oBACJ,IAAI,EAAE,MAAM;oBACZ,EAAE,EAAE,QAAQ;oBACZ,SAAS,EAAE,OAAO;oBAClB,MAAM,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE;oBAClD,SAAS,EAAE,EAAE;oBACb,OAAO,EAAE,EAAE;iBACZ,CAAC;YACJ,CAAC,CACF,CAAC;YAEF,MAAM,WAAW,GAAG,IAAI,qBAAqB,CAC3C,cAAc,EACd,WAAW,EACX;gBACE,KAAK,EAAE,OAAO;aACf,EACD,cAAc,CACf,CAAC;YACF,MAAM,WAAW,CAAC,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC;YAExD,wDAAwD;YACxD,iBAAiB,CAAC,iBAAiB,CAAC,sBAAsB,CACxD,KAAK,SAAS,CAAC;gBACb,MAAM;oBACJ,IAAI,EAAE,SAAS;oBACf,SAAS,EAAE,OAAO;oBAClB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;iBAC5C,CAAC;YACJ,CAAC,CACF,CAAC;YAEF,MAAM,WAAW,GAAG,IAAI,qBAAqB,CAC3C,cAAc,EACd,WAAW,EACX;gBACE,KAAK,EAAE,QAAQ;aAChB,EACD,cAAc,CACf,CAAC;YACF,MAAM,WAAW,CAAC,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC;YAExD,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC,wBAAwB,CAClE,YAAY,EACZ,QAAQ,EACR,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CACtE,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;YACrE,iBAAiB,CAAC,SAAS,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACxD,iBAAiB,CAAC,iBAAiB,CAAC,kBAAkB,CACpD,KAAK,SAAS,CAAC;gBACb,MAAM;oBACJ,IAAI,EAAE,SAAS;oBACf,SAAS,EAAE,OAAO;oBAClB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;iBACzC,CAAC;gBACF,MAAM;oBACJ,IAAI,EAAE,SAAS;oBACf,SAAS,EAAE,OAAO;oBAClB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;iBAC/C,CAAC;YACJ,CAAC,CACF,CAAC;YAEF,MAAM,YAAY,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7B,MAAM,UAAU,GAAG,IAAI,qBAAqB,CAC1C,cAAc,EACd,WAAW,EACX,EAAE,KAAK,EAAE,IAAI,EAAE,EACf,cAAc,CACf,CAAC;YACF,MAAM,UAAU,CAAC,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;YAErE,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;YACnD,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC,sBAAsB,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;YACpE,iBAAiB,CAAC,SAAS,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACxD,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;YACzC,iBAAiB,CAAC,iBAAiB,CAAC,kBAAkB,CACpD,KAAK,SAAS,CAAC;gBACb,MAAM;oBACJ,IAAI,EAAE,SAAS;oBACf,SAAS,EAAE,OAAO;oBAClB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;iBAC3C,CAAC;gBACF,gCAAgC;gBAChC,UAAU,CAAC,KAAK,EAAE,CAAC;gBACnB,MAAM;oBACJ,IAAI,EAAE,SAAS;oBACf,SAAS,EAAE,OAAO;oBAClB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,4BAA4B,EAAE,CAAC;iBAC9D,CAAC;YACJ,CAAC,CACF,CAAC;YAEF,MAAM,UAAU,GAAG,IAAI,qBAAqB,CAC1C,cAAc,EACd,WAAW,EACX,EAAE,KAAK,EAAE,IAAI,EAAE,EACf,cAAc,CACf,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YAE3D,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YACnC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;YAC/C,iBAAiB,CAAC,SAAS,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACxD,iBAAiB,CAAC,iBAAiB,CAAC,kBAAkB,CACpD,KAAK,SAAS,CAAC;gBACb,IAAI,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC;oBAAE,MAAM,EAAkC,CAAC;gBAChE,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;YACnC,CAAC,CACF,CAAC;YAEF,MAAM,UAAU,GAAG,IAAI,qBAAqB,CAC1C,cAAc,EACd,WAAW,EACX;gBACE,KAAK,EAAE,IAAI;aACZ,EACD,cAAc,CACf,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC;YAEtE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YACnC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;YACzD,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;YAC1D,iBAAiB,CAAC,SAAS,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACxD,oDAAoD;YACpD,iBAAiB,CAAC,iBAAiB,CAAC,kBAAkB,CACpD,KAAK,SAAS,CAAC;gBACb,MAAM;oBACJ,IAAI,EAAE,SAAS;oBACf,SAAS,EAAE,OAAO;oBAClB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE;wBACL,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,EAAE;wBACxC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;qBACvC;iBACF,CAAC;YACJ,CAAC,CACF,CAAC;YAEF,MAAM,UAAU,GAAG,IAAI,qBAAqB,CAC1C,cAAc,EACd,WAAW,EACX;gBACE,KAAK,EAAE,IAAI;aACZ,EACD,cAAc,CACf,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC;YAEtE,sEAAsE;YACtE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uFAAuF,EAAE,KAAK,IAAI,EAAE;YACrG,iBAAiB,CAAC,SAAS,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACxD,iBAAiB,CAAC,iBAAiB,CAAC,kBAAkB,CACpD,KAAK,SAAS,CAAC;gBACb,MAAM;oBACJ,IAAI,EAAE,eAAe;oBACrB,MAAM,EAAE,QAAQ;oBAChB,SAAS,EAAE,OAAO;oBAClB,KAAK,EAAE,KAAK;oBACZ,MAAM,EAAE;wBACN,KAAK,EAAE,SAAS;wBAChB,OAAO,EAAE;4BACP,IAAI,EAAE,SAAS;4BACf,IAAI,EAAE,OAAO;4BACb,SAAS,EAAE,IAAI;4BACf,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;yBAC/C;qBACF;iBACF,CAAC;gBACF,MAAM;oBACJ,IAAI,EAAE,SAAS;oBACf,SAAS,EAAE,WAAW;oBACtB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;iBAChD,CAAC;YACJ,CAAC,CACF,CAAC;YAEF,MAAM,YAAY,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7B,MAAM,UAAU,GAAG,IAAI,qBAAqB,CAC1C,cAAc,EACd,WAAW,EACX,EAAE,KAAK,EAAE,IAAI,EAAE,EACf,cAAc,CACf,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CACrC,IAAI,eAAe,EAAE,CAAC,MAAM,EAC5B,YAAY,CACb,CAAC;YAEF,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAC;YACzD,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC,6BAA6B,CAAC,CAAC;YACzE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qDAAqD,EAAE,KAAK,IAAI,EAAE;YACnE,iBAAiB,CAAC,SAAS,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACxD,iBAAiB,CAAC,iBAAiB,CAAC,kBAAkB,CACpD,KAAK,SAAS,CAAC;gBACb,MAAM;oBACJ,IAAI,EAAE,eAAe;oBACrB,MAAM,EAAE,QAAQ;oBAChB,SAAS,EAAE,OAAO;oBAClB,KAAK,EAAE,KAAK;oBACZ,MAAM,EAAE;wBACN,KAAK,EAAE,SAAS;wBAChB,OAAO,EAAE;4BACP,IAAI,EAAE,SAAS;4BACf,IAAI,EAAE,OAAO;4BACb,SAAS,EAAE,IAAI;4BACf,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;yBACjD;qBACF;iBACF,CAAC;gBACF,MAAM;oBACJ,IAAI,EAAE,iBAAiB;oBACvB,MAAM,EAAE,QAAQ;oBAChB,SAAS,EAAE,OAAO;oBAClB,MAAM,EAAE,KAAK;oBACb,QAAQ,EAAE;wBACR,UAAU,EAAE,OAAO;wBACnB,IAAI,EAAE,QAAQ;wBACd,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;qBAC1C;iBACF,CAAC;gBACF,MAAM;oBACJ,IAAI,EAAE,iBAAiB;oBACvB,MAAM,EAAE,QAAQ;oBAChB,SAAS,EAAE,OAAO;oBAClB,MAAM,EAAE,IAAI;oBACZ,QAAQ,EAAE;wBACR,UAAU,EAAE,OAAO;wBACnB,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;qBAC3C;iBACF,CAAC;gBACF,OAAO;YACT,CAAC,CACF,CAAC;YAEF,MAAM,YAAY,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7B,MAAM,UAAU,GAAG,IAAI,qBAAqB,CAC1C,cAAc,EACd,WAAW,EACX,EAAE,KAAK,EAAE,IAAI,EAAE,EACf,cAAc,CACf,CAAC;YACF,MAAM,UAAU,CAAC,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;YAErE,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;YAC3D,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,6CAA6C,CAC9C,CAAC;YACF,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,oDAAoD,CACrD,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;YACvD,MAAM,UAAU,GAAG,IAAI,qBAAqB,CAC1C,cAAc,EACd,WAAW,EACX;gBACE,KAAK,EAAE,IAAI;aACZ,EACD,cAAc,CACf,CAAC;YACF,yDAAyD;YACzD,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,sBAAsB,CAC1D,IAAI,eAAe,EAAE,CAAC,MAAM,CAC7B,CAAC;YAEF,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrC,IACE,YAAY;gBACZ,OAAO,YAAY,KAAK,QAAQ;gBAChC,YAAY,CAAC,IAAI,KAAK,MAAM,EAC5B,CAAC;gBACD,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;gBACnD,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,4BAA4B,CAAC,CAAC;YACtE,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;YAC9D,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC9B,EAAE,CAAC,4DAA4D,EAAE,KAAK,IAAI,EAAE;YAC1E,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAC;YACjE,MAAM,QAAQ,GAAG,IAAI,oBAAoB,CACvC,YAAY,EACZ,wBAAwB,EACxB,IAAI,KAAK,CAAC,cAAc,CAAC,CAC1B,CAAC;YAEF,iBAAiB,CAAC,SAAS,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YACvD,iBAAiB,CAAC,SAAS,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YAExD,MAAM,UAAU,GAAG,IAAI,qBAAqB,CAC1C,cAAc,EACd,WAAW,EACX,EAAE,KAAK,EAAE,IAAI,EAAE,EACf,cAAc,CACf,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC;YAEtE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YACnC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;YACvE,iBAAiB,CAAC,SAAS,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YACvD,iBAAiB,CAAC,SAAS,CAAC,iBAAiB,CAC3C,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAClC,CAAC;YAEF,MAAM,UAAU,GAAG,IAAI,qBAAqB,CAC1C,cAAc,EACd,WAAW,EACX,EAAE,KAAK,EAAE,IAAI,EAAE,EACf,cAAc,CACf,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC;YAEtE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YACnC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CACpC,kDAAkD,CACnD,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4DAA4D,EAAE,KAAK,IAAI,EAAE;YAC1E,iBAAiB,CAAC,SAAS,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACxD,iBAAiB,CAAC,iBAAiB,CAAC,kBAAkB,CACpD,KAAK,SAAS,CAAC;gBACb,MAAM;oBACJ,IAAI,EAAE,SAAS;oBACf,SAAS,EAAE,OAAO;oBAClB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;iBACpD,CAAC;gBACF,yEAAyE;gBACzE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;YACtC,CAAC,CACF,CAAC;YAEF,MAAM,UAAU,GAAG,IAAI,qBAAqB,CAC1C,cAAc,EACd,WAAW,EACX,EAAE,KAAK,EAAE,IAAI,EAAE,EACf,cAAc,CACf,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC;YAEtE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YACnC,+DAA+D;YAC/D,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;YAC3D,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -46,7 +46,7 @@ export class SubagentToolWrapper extends BaseDeclarativeTool {
|
|
|
46
46
|
const definition = this.definition;
|
|
47
47
|
const effectiveMessageBus = messageBus;
|
|
48
48
|
if (definition.kind === 'remote') {
|
|
49
|
-
return new RemoteAgentInvocation(definition, params, effectiveMessageBus, _toolName, _toolDisplayName);
|
|
49
|
+
return new RemoteAgentInvocation(definition, this.context, params, effectiveMessageBus, _toolName, _toolDisplayName);
|
|
50
50
|
}
|
|
51
51
|
// Special handling for browser agent - needs async MCP setup
|
|
52
52
|
if (definition.name === BROWSER_AGENT_NAME) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-tool-wrapper.js","sourceRoot":"","sources":["../../../src/agents/subagent-tool-wrapper.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,mBAAmB,EACnB,IAAI,GAGL,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAyB,MAAM,iCAAiC,CAAC;AAExE,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAGzE;;;GAGG;AACH,MAAM,OAAO,mBAAoB,SAAQ,mBAGxC;IAYoB;IACA;IAZnB;;;;;;;;;OASG;IACH,YACmB,UAA2B,EAC3B,OAAyB,EAC1C,UAAsB;QAEtB,KAAK,CACH,UAAU,CAAC,IAAI,EACf,UAAU,CAAC,WAAW,IAAI,UAAU,CAAC,IAAI,EACzC,UAAU,CAAC,WAAW,EACtB,IAAI,CAAC,KAAK,EACV,UAAU,CAAC,WAAW,CAAC,WAAW,EAClC,UAAU;QACV,sBAAsB,CAAC,IAAI;QAC3B,qBAAqB,CAAC,IAAI,CAC3B,CAAC;QAbe,eAAU,GAAV,UAAU,CAAiB;QAC3B,YAAO,GAAP,OAAO,CAAkB;IAa5C,CAAC;IAED;;;;;;;;OAQG;IACO,gBAAgB,CACxB,MAAmB,EACnB,UAAsB,EACtB,SAAkB,EAClB,gBAAyB;QAEzB,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,MAAM,mBAAmB,GAAG,UAAU,CAAC;QAEvC,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACjC,OAAO,IAAI,qBAAqB,CAC9B,UAAU,EACV,MAAM,EACN,mBAAmB,EACnB,SAAS,EACT,gBAAgB,CACjB,CAAC;QACJ,CAAC;QAED,6DAA6D;QAC7D,IAAI,UAAU,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;YAC3C,OAAO,IAAI,sBAAsB,CAC/B,IAAI,CAAC,OAAO,EACZ,MAAM,EACN,mBAAmB,EACnB,SAAS,EACT,gBAAgB,CACjB,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,uBAAuB,CAChC,UAAU,EACV,IAAI,CAAC,OAAO,EACZ,MAAM,EACN,mBAAmB,EACnB,SAAS,EACT,gBAAgB,CACjB,CAAC;IACJ,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"subagent-tool-wrapper.js","sourceRoot":"","sources":["../../../src/agents/subagent-tool-wrapper.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,mBAAmB,EACnB,IAAI,GAGL,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAyB,MAAM,iCAAiC,CAAC;AAExE,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAGzE;;;GAGG;AACH,MAAM,OAAO,mBAAoB,SAAQ,mBAGxC;IAYoB;IACA;IAZnB;;;;;;;;;OASG;IACH,YACmB,UAA2B,EAC3B,OAAyB,EAC1C,UAAsB;QAEtB,KAAK,CACH,UAAU,CAAC,IAAI,EACf,UAAU,CAAC,WAAW,IAAI,UAAU,CAAC,IAAI,EACzC,UAAU,CAAC,WAAW,EACtB,IAAI,CAAC,KAAK,EACV,UAAU,CAAC,WAAW,CAAC,WAAW,EAClC,UAAU;QACV,sBAAsB,CAAC,IAAI;QAC3B,qBAAqB,CAAC,IAAI,CAC3B,CAAC;QAbe,eAAU,GAAV,UAAU,CAAiB;QAC3B,YAAO,GAAP,OAAO,CAAkB;IAa5C,CAAC;IAED;;;;;;;;OAQG;IACO,gBAAgB,CACxB,MAAmB,EACnB,UAAsB,EACtB,SAAkB,EAClB,gBAAyB;QAEzB,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,MAAM,mBAAmB,GAAG,UAAU,CAAC;QAEvC,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACjC,OAAO,IAAI,qBAAqB,CAC9B,UAAU,EACV,IAAI,CAAC,OAAO,EACZ,MAAM,EACN,mBAAmB,EACnB,SAAS,EACT,gBAAgB,CACjB,CAAC;QACJ,CAAC;QAED,6DAA6D;QAC7D,IAAI,UAAU,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;YAC3C,OAAO,IAAI,sBAAsB,CAC/B,IAAI,CAAC,OAAO,EACZ,MAAM,EACN,mBAAmB,EACnB,SAAS,EACT,gBAAgB,CACjB,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,uBAAuB,CAChC,UAAU,EACV,IAAI,CAAC,OAAO,EACZ,MAAM,EACN,mBAAmB,EACnB,SAAS,EACT,gBAAgB,CACjB,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -258,6 +258,7 @@ export interface ExtensionInstallMetadata {
|
|
|
258
258
|
import { DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, type FileFilteringOptions } from './constants.js';
|
|
259
259
|
import { type ExtensionLoader } from '../utils/extensionLoader.js';
|
|
260
260
|
import { McpClientManager } from '../tools/mcp-client-manager.js';
|
|
261
|
+
import { A2AClientManager } from '../agents/a2a-client-manager.js';
|
|
261
262
|
import { type McpContext } from '../tools/mcp-client.js';
|
|
262
263
|
import type { EnvironmentSanitizationConfig } from '../services/environmentSanitization.js';
|
|
263
264
|
export type { FileFilteringOptions };
|
|
@@ -374,6 +375,7 @@ export interface ConfigParameters {
|
|
|
374
375
|
debugMode: boolean;
|
|
375
376
|
question?: string;
|
|
376
377
|
coreTools?: string[];
|
|
378
|
+
mainAgentTools?: string[];
|
|
377
379
|
/** @deprecated Use Policy Engine instead */
|
|
378
380
|
allowedTools?: string[];
|
|
379
381
|
/** @deprecated Use Policy Engine instead */
|
|
@@ -505,6 +507,7 @@ export interface ConfigParameters {
|
|
|
505
507
|
export declare class Config implements McpContext, AgentLoopContext {
|
|
506
508
|
private _toolRegistry;
|
|
507
509
|
private mcpClientManager?;
|
|
510
|
+
private readonly a2aClientManager?;
|
|
508
511
|
private allowedMcpServers;
|
|
509
512
|
private blockedMcpServers;
|
|
510
513
|
private allowedEnvironmentVariables;
|
|
@@ -531,6 +534,7 @@ export declare class Config implements McpContext, AgentLoopContext {
|
|
|
531
534
|
private readonly question;
|
|
532
535
|
readonly enableConseca: boolean;
|
|
533
536
|
private readonly coreTools;
|
|
537
|
+
private readonly mainAgentTools;
|
|
534
538
|
/** @deprecated Use Policy Engine instead */
|
|
535
539
|
private readonly allowedTools;
|
|
536
540
|
/** @deprecated Use Policy Engine instead */
|
|
@@ -770,6 +774,7 @@ export declare class Config implements McpContext, AgentLoopContext {
|
|
|
770
774
|
resetTime?: string;
|
|
771
775
|
} | undefined;
|
|
772
776
|
getCoreTools(): string[] | undefined;
|
|
777
|
+
getMainAgentTools(): string[] | undefined;
|
|
773
778
|
getAllowedTools(): string[] | undefined;
|
|
774
779
|
/**
|
|
775
780
|
* All the excluded tools from static configuration, loaded extensions, or
|
|
@@ -792,6 +797,7 @@ export declare class Config implements McpContext, AgentLoopContext {
|
|
|
792
797
|
getExtensionsEnabled(): boolean;
|
|
793
798
|
getExtensionRegistryURI(): string | undefined;
|
|
794
799
|
getMcpClientManager(): McpClientManager | undefined;
|
|
800
|
+
getA2AClientManager(): A2AClientManager | undefined;
|
|
795
801
|
setUserInteractedWithMcp(): void;
|
|
796
802
|
/** @deprecated Use getMcpClientManager().getLastError() directly */
|
|
797
803
|
getLastMcpError(serverName: string): string | undefined;
|
|
@@ -36,7 +36,7 @@ import { createSandboxManager, } from '../services/sandboxManager.js';
|
|
|
36
36
|
import { initializeTelemetry, DEFAULT_TELEMETRY_TARGET, DEFAULT_OTLP_ENDPOINT, uiTelemetryService, } from '../telemetry/index.js';
|
|
37
37
|
import { coreEvents, CoreEvent } from '../utils/events.js';
|
|
38
38
|
import { tokenLimit } from '../core/tokenLimits.js';
|
|
39
|
-
import { DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_MODEL_AUTO, isAutoModel, isPreviewModel, PREVIEW_GEMINI_FLASH_MODEL, PREVIEW_GEMINI_MODEL, PREVIEW_GEMINI_MODEL_AUTO, resolveModel, } from './models.js';
|
|
39
|
+
import { DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_MODEL_AUTO, isAutoModel, isPreviewModel, isGemini2Model, PREVIEW_GEMINI_FLASH_MODEL, PREVIEW_GEMINI_MODEL, PREVIEW_GEMINI_MODEL_AUTO, resolveModel, } from './models.js';
|
|
40
40
|
import { shouldAttemptBrowserLaunch } from '../utils/browser.js';
|
|
41
41
|
import { ideContextStore } from '../ide/ideContext.js';
|
|
42
42
|
import { WriteTodosTool } from '../tools/write-todos.js';
|
|
@@ -83,6 +83,7 @@ import { DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS,
|
|
|
83
83
|
import { DEFAULT_TOOL_PROTECTION_THRESHOLD, DEFAULT_MIN_PRUNABLE_TOKENS_THRESHOLD, DEFAULT_PROTECT_LATEST_TURN, } from '../services/toolOutputMaskingService.js';
|
|
84
84
|
import { SimpleExtensionLoader, } from '../utils/extensionLoader.js';
|
|
85
85
|
import { McpClientManager } from '../tools/mcp-client-manager.js';
|
|
86
|
+
import { A2AClientManager } from '../agents/a2a-client-manager.js';
|
|
86
87
|
import {} from '../tools/mcp-client.js';
|
|
87
88
|
import { getErrorMessage } from '../utils/errors.js';
|
|
88
89
|
export { DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, };
|
|
@@ -185,6 +186,7 @@ export const ConfigSchema = z.object({
|
|
|
185
186
|
export class Config {
|
|
186
187
|
_toolRegistry;
|
|
187
188
|
mcpClientManager;
|
|
189
|
+
a2aClientManager;
|
|
188
190
|
allowedMcpServers;
|
|
189
191
|
blockedMcpServers;
|
|
190
192
|
allowedEnvironmentVariables;
|
|
@@ -211,6 +213,7 @@ export class Config {
|
|
|
211
213
|
question;
|
|
212
214
|
enableConseca;
|
|
213
215
|
coreTools;
|
|
216
|
+
mainAgentTools;
|
|
214
217
|
/** @deprecated Use Policy Engine instead */
|
|
215
218
|
allowedTools;
|
|
216
219
|
/** @deprecated Use Policy Engine instead */
|
|
@@ -383,6 +386,7 @@ export class Config {
|
|
|
383
386
|
this.debugMode = params.debugMode;
|
|
384
387
|
this.question = params.question;
|
|
385
388
|
this.coreTools = params.coreTools;
|
|
389
|
+
this.mainAgentTools = params.mainAgentTools;
|
|
386
390
|
this.allowedTools = params.allowedTools;
|
|
387
391
|
this.excludeTools = params.excludeTools;
|
|
388
392
|
this.toolDiscoveryCommand = params.toolDiscoveryCommand;
|
|
@@ -463,6 +467,14 @@ export class Config {
|
|
|
463
467
|
...DEFAULT_MODEL_CONFIGS.modelDefinitions,
|
|
464
468
|
...modelConfigServiceConfig.modelDefinitions,
|
|
465
469
|
};
|
|
470
|
+
const mergedModelIdResolutions = {
|
|
471
|
+
...DEFAULT_MODEL_CONFIGS.modelIdResolutions,
|
|
472
|
+
...modelConfigServiceConfig.modelIdResolutions,
|
|
473
|
+
};
|
|
474
|
+
const mergedClassifierIdResolutions = {
|
|
475
|
+
...DEFAULT_MODEL_CONFIGS.classifierIdResolutions,
|
|
476
|
+
...modelConfigServiceConfig.classifierIdResolutions,
|
|
477
|
+
};
|
|
466
478
|
modelConfigServiceConfig = {
|
|
467
479
|
// Preserve other user settings like customAliases
|
|
468
480
|
...modelConfigServiceConfig,
|
|
@@ -471,6 +483,8 @@ export class Config {
|
|
|
471
483
|
overrides: modelConfigServiceConfig.overrides ?? DEFAULT_MODEL_CONFIGS.overrides,
|
|
472
484
|
// Use the merged model definitions
|
|
473
485
|
modelDefinitions: mergedModelDefinitions,
|
|
486
|
+
modelIdResolutions: mergedModelIdResolutions,
|
|
487
|
+
classifierIdResolutions: mergedClassifierIdResolutions,
|
|
474
488
|
};
|
|
475
489
|
}
|
|
476
490
|
this.modelConfigService = new ModelConfigService(modelConfigServiceConfig ?? DEFAULT_MODEL_CONFIGS);
|
|
@@ -526,9 +540,11 @@ export class Config {
|
|
|
526
540
|
this.truncateToolOutputThreshold =
|
|
527
541
|
params.truncateToolOutputThreshold ??
|
|
528
542
|
DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD;
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
543
|
+
const isGemini2 = isGemini2Model(this.model);
|
|
544
|
+
this.useWriteTodos =
|
|
545
|
+
isGemini2 && !isPreviewModel(this.model, this) && !this.trackerEnabled
|
|
546
|
+
? (params.useWriteTodos ?? true)
|
|
547
|
+
: false;
|
|
532
548
|
this.workspacePoliciesDir = params.workspacePoliciesDir;
|
|
533
549
|
this.enableHooksUI = params.enableHooksUI ?? true;
|
|
534
550
|
this.enableHooks = params.enableHooks ?? true;
|
|
@@ -618,6 +634,7 @@ export class Config {
|
|
|
618
634
|
}
|
|
619
635
|
this._geminiClient = new GeminiClient(this);
|
|
620
636
|
this._sandboxManager = createSandboxManager(params.toolSandboxing ?? false, this.targetDir);
|
|
637
|
+
this.a2aClientManager = new A2AClientManager(this);
|
|
621
638
|
this.shellExecutionConfig.sandboxManager = this._sandboxManager;
|
|
622
639
|
this.modelRouterService = new ModelRouterService(this);
|
|
623
640
|
}
|
|
@@ -671,7 +688,12 @@ export class Config {
|
|
|
671
688
|
coreEvents.on(CoreEvent.AgentsRefreshed, this.onAgentsRefreshed);
|
|
672
689
|
this._toolRegistry = await this.createToolRegistry();
|
|
673
690
|
discoverToolsHandle?.end();
|
|
674
|
-
this.mcpClientManager = new McpClientManager(this.clientVersion, this
|
|
691
|
+
this.mcpClientManager = new McpClientManager(this.clientVersion, this, this.eventEmitter);
|
|
692
|
+
this.mcpClientManager.setMainRegistries({
|
|
693
|
+
toolRegistry: this._toolRegistry,
|
|
694
|
+
promptRegistry: this.promptRegistry,
|
|
695
|
+
resourceRegistry: this.resourceRegistry,
|
|
696
|
+
});
|
|
675
697
|
// We do not await this promise so that the CLI can start up even if
|
|
676
698
|
// MCP servers are slow to connect.
|
|
677
699
|
this.mcpInitializationPromise = Promise.allSettled([
|
|
@@ -1154,6 +1176,9 @@ export class Config {
|
|
|
1154
1176
|
getCoreTools() {
|
|
1155
1177
|
return this.coreTools;
|
|
1156
1178
|
}
|
|
1179
|
+
getMainAgentTools() {
|
|
1180
|
+
return this.mainAgentTools;
|
|
1181
|
+
}
|
|
1157
1182
|
getAllowedTools() {
|
|
1158
1183
|
return this.allowedTools;
|
|
1159
1184
|
}
|
|
@@ -1212,6 +1237,9 @@ export class Config {
|
|
|
1212
1237
|
getMcpClientManager() {
|
|
1213
1238
|
return this.mcpClientManager;
|
|
1214
1239
|
}
|
|
1240
|
+
getA2AClientManager() {
|
|
1241
|
+
return this.a2aClientManager;
|
|
1242
|
+
}
|
|
1215
1243
|
setUserInteractedWithMcp() {
|
|
1216
1244
|
this.mcpClientManager?.setUserInteractedWithMcp();
|
|
1217
1245
|
}
|
|
@@ -2045,7 +2073,8 @@ export class Config {
|
|
|
2045
2073
|
!browserConfig.customConfig?.headless);
|
|
2046
2074
|
}
|
|
2047
2075
|
async createToolRegistry() {
|
|
2048
|
-
const registry = new ToolRegistry(this, this.messageBus
|
|
2076
|
+
const registry = new ToolRegistry(this, this.messageBus,
|
|
2077
|
+
/* isMainRegistry= */ true);
|
|
2049
2078
|
// helper to create & register core tools that are enabled
|
|
2050
2079
|
const maybeRegister = (toolClass, registerFn) => {
|
|
2051
2080
|
const className = toolClass.name;
|