@theia/ai-chat 1.76.0-next.16 → 1.76.0-next.23
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/lib/browser/agent-delegation-tool.d.ts +6 -0
- package/lib/browser/agent-delegation-tool.d.ts.map +1 -1
- package/lib/browser/agent-delegation-tool.js +171 -92
- package/lib/browser/agent-delegation-tool.js.map +1 -1
- package/lib/browser/agent-delegation-tool.spec.js +170 -7
- package/lib/browser/agent-delegation-tool.spec.js.map +1 -1
- package/package.json +9 -9
- package/src/browser/agent-delegation-tool.spec.ts +237 -7
- package/src/browser/agent-delegation-tool.ts +191 -109
|
@@ -16,6 +16,12 @@ export declare class AgentDelegationTool implements ToolProvider {
|
|
|
16
16
|
invocation: ChatRequestInvocation;
|
|
17
17
|
} | undefined;
|
|
18
18
|
private delegateToAgent;
|
|
19
|
+
/**
|
|
20
|
+
* Makes the given task context the session's task context, replacing a previously set one.
|
|
21
|
+
* `addVariables` deduplicates on variable id *and* argument, so adding a different task context
|
|
22
|
+
* id would otherwise leave the session with both in its system prompt.
|
|
23
|
+
*/
|
|
24
|
+
private setTaskContext;
|
|
19
25
|
/**
|
|
20
26
|
* Sets up all event bubbling from a delegated child session to the parent session:
|
|
21
27
|
* - Interaction forwarding: child interactionNeeded events are forwarded to the parent response
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-delegation-tool.d.ts","sourceRoot":"","sources":["../../src/browser/agent-delegation-tool.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAuD,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAChH,OAAO,EAAc,OAAO,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAEH,gBAAgB,
|
|
1
|
+
{"version":3,"file":"agent-delegation-tool.d.ts","sourceRoot":"","sources":["../../src/browser/agent-delegation-tool.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAuD,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAChH,OAAO,EAAc,OAAO,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAEH,gBAAgB,EAMhB,WAAW,EAQX,qBAAqB,EAGxB,MAAM,WAAW,CAAC;AAGnB,qBACa,mBAAoB,YAAW,YAAY;IACpD,MAAM,CAAC,EAAE,SAAgC;IAEzC,SAAS,CAAC,QAAQ,CAAC,kBAAkB;gBAA6B,MAAM;oBAAc,qBAAqB;OAAM;IAGjH,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;IAG/D,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,WAAW,CAAC;IAGrD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,OAAO,IAAI,WAAW;IA8CtB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,qBAAqB,CAAA;KAAE,GAAG,SAAS;YAItF,eAAe;IAuN7B;;;;OAIG;IACH,OAAO,CAAC,cAAc;IAatB;;;;OAIG;IACH,OAAO,CAAC,yBAAyB;CAgCpC"}
|
|
@@ -34,9 +34,12 @@ let AgentDelegationTool = class AgentDelegationTool {
|
|
|
34
34
|
id: AgentDelegationTool_1.ID,
|
|
35
35
|
name: AgentDelegationTool_1.ID,
|
|
36
36
|
description: 'Delegate a task or question to a specific AI agent. IMPORTANT: When you delegate a task or question to a specific AI agent using this tool, ' +
|
|
37
|
-
'remember that each sub-agent operates solely within its specialized capabilities and tools and
|
|
38
|
-
' or external systems. Therefore, it is crucial to provide all necessary context and detailed
|
|
39
|
-
'and effective task completion. ' +
|
|
37
|
+
'remember that each sub-agent operates solely within its specialized capabilities and tools and, unless you resume a previous delegation via sessionId, ' +
|
|
38
|
+
'does not have access to previous conversation context or external systems. Therefore, it is crucial to provide all necessary context and detailed ' +
|
|
39
|
+
'information directly within your request to ensure accurate and effective task completion. ' +
|
|
40
|
+
'Each result ends with a "[delegation sessionId: <id>]" line. To send a follow-up request to the same agent with its previous conversation retained ' +
|
|
41
|
+
'(e.g. to request fixes after reviewing its result), pass that id as sessionId. Prefer resuming for follow-ups on the same task; ' +
|
|
42
|
+
'start a fresh session (omit sessionId) for unrelated tasks, as a resumed session grows with every round. ' +
|
|
40
43
|
'You may optionally pass a taskContextId to make a specific task context (e.g. a plan) available to the delegated agent via its system prompt.',
|
|
41
44
|
parameters: {
|
|
42
45
|
type: 'object',
|
|
@@ -53,6 +56,12 @@ let AgentDelegationTool = class AgentDelegationTool {
|
|
|
53
56
|
type: 'string',
|
|
54
57
|
description: 'Optional task context ID to make available to the delegated agent. The agent will see the task context in its system prompt.',
|
|
55
58
|
},
|
|
59
|
+
sessionId: {
|
|
60
|
+
type: 'string',
|
|
61
|
+
description: 'Optional ID of a previous delegation session to continue, as reported in the "[delegation sessionId: <id>]" line of an earlier result. ' +
|
|
62
|
+
'The delegated agent keeps its previous conversation context, so you do not need to repeat context you already sent it. ' +
|
|
63
|
+
'Only a session that you delegated yourself can be resumed, and the agentId must match the original delegation.',
|
|
64
|
+
},
|
|
56
65
|
},
|
|
57
66
|
required: ['agentId', 'prompt'],
|
|
58
67
|
},
|
|
@@ -71,7 +80,7 @@ let AgentDelegationTool = class AgentDelegationTool {
|
|
|
71
80
|
}
|
|
72
81
|
try {
|
|
73
82
|
const args = JSON.parse(arg_string);
|
|
74
|
-
const { agentId, prompt, taskContextId } = args;
|
|
83
|
+
const { agentId, prompt, taskContextId, sessionId } = args;
|
|
75
84
|
if (!agentId || !prompt) {
|
|
76
85
|
const errorMsg = 'Both agentId and prompt parameters are required.';
|
|
77
86
|
this.logger.error(errorMsg, { agentId, prompt });
|
|
@@ -87,109 +96,162 @@ let AgentDelegationTool = class AgentDelegationTool {
|
|
|
87
96
|
this.logger.error(errorMsg);
|
|
88
97
|
return errorMsg;
|
|
89
98
|
}
|
|
90
|
-
let
|
|
99
|
+
let session;
|
|
91
100
|
let childModelDisposable;
|
|
92
|
-
|
|
101
|
+
if (sessionId) {
|
|
93
102
|
const chatService = this.getChatService();
|
|
94
|
-
//
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
// delegation hierarchy, not just a flat list under the root.
|
|
104
|
-
const parentId = ctx.request.session.id;
|
|
105
|
-
newSession.parentSessionId = parentId;
|
|
106
|
-
newSession.model.parentSessionId = parentId;
|
|
107
|
-
if (taskContextId) {
|
|
108
|
-
newSession.model.context.addVariables({
|
|
109
|
-
variable: task_context_variable_1.TASK_CONTEXT_VARIABLE,
|
|
110
|
-
arg: taskContextId
|
|
111
|
-
});
|
|
103
|
+
// Restore from storage if necessary: delegated sessions are auto-saved, so after a reload the
|
|
104
|
+
// delegating session's history still carries the id while the session itself is no longer in memory.
|
|
105
|
+
const existingSession = await chatService.getOrRestoreSession(sessionId);
|
|
106
|
+
if (!existingSession) {
|
|
107
|
+
const errorMsg = `Delegation session '${sessionId}' not found. It may have been deleted. ` +
|
|
108
|
+
'Send the request again without sessionId to start a fresh session — the agent will not have any prior context.';
|
|
109
|
+
// warn, not error: a stale session id is expected in a normal agentic loop (e.g. the user deleted the session)
|
|
110
|
+
this.logger.warn(errorMsg);
|
|
111
|
+
return errorMsg;
|
|
112
112
|
}
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
113
|
+
if (existingSession.parentSessionId !== ctx.request.session.id) {
|
|
114
|
+
// Without this, any session id would be accepted, including an unrelated top-level user chat,
|
|
115
|
+
// and the delegated request would be injected into it.
|
|
116
|
+
const errorMsg = `Delegation session '${sessionId}' was not delegated by this session and cannot be resumed here. ` +
|
|
117
|
+
'Only pass a sessionId reported by one of your own earlier delegations, or omit it to start a fresh session.';
|
|
118
|
+
this.logger.error(errorMsg);
|
|
119
|
+
return errorMsg;
|
|
116
120
|
}
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
return errorMsg;
|
|
124
|
-
}
|
|
125
|
-
// Send the request
|
|
126
|
-
const chatRequest = {
|
|
127
|
-
text: `@${agentId} ${prompt}`,
|
|
128
|
-
};
|
|
129
|
-
let response;
|
|
130
|
-
try {
|
|
131
|
-
if (ctx.cancellationToken?.isCancellationRequested) {
|
|
132
|
-
return 'Operation cancelled by user';
|
|
121
|
+
if (common_1.ChatSessionStatus.isInProgress(existingSession.model.status)) {
|
|
122
|
+
const errorMsg = `Delegation session '${sessionId}' is still processing a previous request. ` +
|
|
123
|
+
'Wait for its result before sending a follow-up, or omit sessionId to start a fresh session.';
|
|
124
|
+
// warn, not error: expected when the caller issues parallel requests against the same session
|
|
125
|
+
this.logger.warn(errorMsg);
|
|
126
|
+
return errorMsg;
|
|
133
127
|
}
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
(await response?.requestCompleted).cancel();
|
|
140
|
-
}
|
|
141
|
-
});
|
|
128
|
+
if (existingSession.pinnedAgent && existingSession.pinnedAgent.id !== agentId) {
|
|
129
|
+
const errorMsg = `Delegation session '${sessionId}' belongs to agent '${existingSession.pinnedAgent.id}', not '${agentId}'. ` +
|
|
130
|
+
'Pass the matching agentId, or omit sessionId to start a fresh session.';
|
|
131
|
+
this.logger.error(errorMsg);
|
|
132
|
+
return errorMsg;
|
|
142
133
|
}
|
|
134
|
+
// Deliberately keep rootSessionId/parentSessionId as set at creation time; a resumed
|
|
135
|
+
// session stays attached to its original delegation hierarchy.
|
|
136
|
+
if (taskContextId) {
|
|
137
|
+
this.setTaskContext(existingSession.model.context, taskContextId);
|
|
138
|
+
}
|
|
139
|
+
session = existingSession;
|
|
140
|
+
// Re-establish bubbling for this request; the previous disposable was disposed when the
|
|
141
|
+
// original delegation completed, and the parent request/response are new objects now.
|
|
142
|
+
childModelDisposable = this.setupChildSessionBubbling(existingSession.model, ctx.request.session, ctx.response);
|
|
143
143
|
}
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
this.logger.error(errorMsg, sendError);
|
|
147
|
-
return errorMsg;
|
|
148
|
-
}
|
|
149
|
-
if (response) {
|
|
150
|
-
// Store the invocation in the registry so the renderer can access it
|
|
151
|
-
if (ctx.toolCallId) {
|
|
152
|
-
this.pendingDelegations.set(ctx.toolCallId, {
|
|
153
|
-
prompt,
|
|
154
|
-
invocation: response
|
|
155
|
-
});
|
|
156
|
-
// Clean up when the delegated session is deleted
|
|
144
|
+
else {
|
|
145
|
+
try {
|
|
157
146
|
const chatService = this.getChatService();
|
|
158
|
-
|
|
159
|
-
const
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
147
|
+
// Store the current active session to restore it after delegation
|
|
148
|
+
const currentActiveSession = chatService.getActiveSession();
|
|
149
|
+
const newSession = chatService.createSession(undefined, { focus: false }, agent);
|
|
150
|
+
// Set root session ID to enable task context sharing across delegation chains
|
|
151
|
+
// Root is either the current root (for nested delegation) or current session (for first-level delegation)
|
|
152
|
+
const rootId = ctx.rootSessionId || ctx.request.session.id;
|
|
153
|
+
newSession.rootSessionId = rootId;
|
|
154
|
+
newSession.model.rootSessionId = rootId;
|
|
155
|
+
// Track the immediate parent (the delegating session) so the UI can render the full
|
|
156
|
+
// delegation hierarchy, not just a flat list under the root.
|
|
157
|
+
const parentId = ctx.request.session.id;
|
|
158
|
+
newSession.parentSessionId = parentId;
|
|
159
|
+
newSession.model.parentSessionId = parentId;
|
|
160
|
+
if (taskContextId) {
|
|
161
|
+
newSession.model.context.addVariables({
|
|
162
|
+
variable: task_context_variable_1.TASK_CONTEXT_VARIABLE,
|
|
163
|
+
arg: taskContextId
|
|
164
|
+
});
|
|
165
|
+
}
|
|
166
|
+
// Immediately restore the original active session to avoid confusing the user
|
|
167
|
+
if (currentActiveSession) {
|
|
168
|
+
chatService.setActiveSession(currentActiveSession.id, { focus: false });
|
|
169
|
+
}
|
|
170
|
+
// Setup bubbling of child session events to parent session
|
|
171
|
+
childModelDisposable = this.setupChildSessionBubbling(newSession.model, ctx.request.session, ctx.response);
|
|
172
|
+
session = newSession;
|
|
165
173
|
}
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
const stringResult = filteredContent
|
|
171
|
-
.map(c => common_1.ChatResponseContent.hasAsString(c) ? c.asString() : undefined)
|
|
172
|
-
.filter((text) => text !== undefined && text !== '')
|
|
173
|
-
.join('\n\n');
|
|
174
|
-
// Clean up the parent-child link after completion (event bubbling is no longer needed)
|
|
175
|
-
childModelDisposable?.dispose();
|
|
176
|
-
// Return the raw text to the top-level Agent, as a tool result
|
|
177
|
-
return stringResult;
|
|
174
|
+
catch (sessionError) {
|
|
175
|
+
const errorMsg = `Failed to create chat session for agent '${agentId}': ${sessionError instanceof Error ? sessionError.message : sessionError}`;
|
|
176
|
+
this.logger.error(errorMsg, sessionError);
|
|
177
|
+
return errorMsg;
|
|
178
178
|
}
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
179
|
+
}
|
|
180
|
+
// Send the request. The `finally` releases the event bubbling on every outcome: a resumed
|
|
181
|
+
// session is long-lived, so leaking a listener per failed round would forward its events
|
|
182
|
+
// into stale parent responses.
|
|
183
|
+
try {
|
|
184
|
+
const chatRequest = {
|
|
185
|
+
text: `@${agentId} ${prompt}`,
|
|
186
|
+
};
|
|
187
|
+
let response;
|
|
188
|
+
try {
|
|
189
|
+
if (ctx.cancellationToken?.isCancellationRequested) {
|
|
182
190
|
return 'Operation cancelled by user';
|
|
183
191
|
}
|
|
184
|
-
const
|
|
185
|
-
|
|
192
|
+
const chatService = this.getChatService();
|
|
193
|
+
response = await chatService.sendRequest(session.id, chatRequest);
|
|
194
|
+
if (ctx.cancellationToken) {
|
|
195
|
+
ctx.cancellationToken.onCancellationRequested(async () => {
|
|
196
|
+
if (response) {
|
|
197
|
+
(await response?.requestCompleted).cancel();
|
|
198
|
+
}
|
|
199
|
+
});
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
catch (sendError) {
|
|
203
|
+
const errorMsg = `Failed to send request to agent '${agentId}': ${sendError instanceof Error ? sendError.message : sendError}`;
|
|
204
|
+
this.logger.error(errorMsg, sendError);
|
|
205
|
+
return errorMsg;
|
|
206
|
+
}
|
|
207
|
+
if (response) {
|
|
208
|
+
// Store the invocation in the registry so the renderer can access it
|
|
209
|
+
if (ctx.toolCallId) {
|
|
210
|
+
this.pendingDelegations.set(ctx.toolCallId, {
|
|
211
|
+
prompt,
|
|
212
|
+
invocation: response
|
|
213
|
+
});
|
|
214
|
+
// Clean up when the delegated session is deleted
|
|
215
|
+
const chatService = this.getChatService();
|
|
216
|
+
const toolCallId = ctx.toolCallId;
|
|
217
|
+
const sessionEventListener = chatService.onSessionEvent(event => {
|
|
218
|
+
if (event.type === 'deleted' && event.sessionId === session.id) {
|
|
219
|
+
this.pendingDelegations.delete(toolCallId);
|
|
220
|
+
sessionEventListener.dispose();
|
|
221
|
+
}
|
|
222
|
+
});
|
|
223
|
+
}
|
|
224
|
+
try {
|
|
225
|
+
// Wait for completion to return the final result as tool output
|
|
226
|
+
const result = await response.responseCompleted;
|
|
227
|
+
const filteredContent = result.response.content.filter(c => !common_1.ThinkingChatResponseContent.is(c) && !common_1.ToolCallChatResponseContent.is(c));
|
|
228
|
+
const stringResult = filteredContent
|
|
229
|
+
.map(c => common_1.ChatResponseContent.hasAsString(c) ? c.asString() : undefined)
|
|
230
|
+
.filter((text) => text !== undefined && text !== '')
|
|
231
|
+
.join('\n\n');
|
|
232
|
+
// Return the raw text to the top-level Agent, as a tool result. The session id
|
|
233
|
+
// allows the caller to send follow-up requests into the same session.
|
|
234
|
+
const sessionIdSuffix = `[delegation sessionId: ${session.id}]`;
|
|
235
|
+
return stringResult ? `${stringResult}\n\n${sessionIdSuffix}` : sessionIdSuffix;
|
|
236
|
+
}
|
|
237
|
+
catch (completionError) {
|
|
238
|
+
if (completionError instanceof Error &&
|
|
239
|
+
completionError.message.includes('cancelled')) {
|
|
240
|
+
return 'Operation cancelled by user';
|
|
241
|
+
}
|
|
242
|
+
const errorMsg = `Failed to complete response from agent '${agentId}': ${completionError instanceof Error ? completionError.message : completionError}`;
|
|
243
|
+
this.logger.error(errorMsg, completionError);
|
|
244
|
+
return errorMsg;
|
|
245
|
+
}
|
|
246
|
+
}
|
|
247
|
+
else {
|
|
248
|
+
const errorMsg = `Delegation to agent '${agentId}' has failed: no response returned.`;
|
|
249
|
+
this.logger.error(errorMsg);
|
|
186
250
|
return errorMsg;
|
|
187
251
|
}
|
|
188
252
|
}
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
this.logger.error(errorMsg);
|
|
192
|
-
return errorMsg;
|
|
253
|
+
finally {
|
|
254
|
+
childModelDisposable?.dispose();
|
|
193
255
|
}
|
|
194
256
|
}
|
|
195
257
|
catch (error) {
|
|
@@ -199,6 +261,23 @@ let AgentDelegationTool = class AgentDelegationTool {
|
|
|
199
261
|
});
|
|
200
262
|
}
|
|
201
263
|
}
|
|
264
|
+
/**
|
|
265
|
+
* Makes the given task context the session's task context, replacing a previously set one.
|
|
266
|
+
* `addVariables` deduplicates on variable id *and* argument, so adding a different task context
|
|
267
|
+
* id would otherwise leave the session with both in its system prompt.
|
|
268
|
+
*/
|
|
269
|
+
setTaskContext(context, taskContextId) {
|
|
270
|
+
const staleIndices = context.getVariables().reduce((indices, variable, index) => {
|
|
271
|
+
if (variable.variable.id === task_context_variable_1.TASK_CONTEXT_VARIABLE.id && variable.arg !== taskContextId) {
|
|
272
|
+
indices.push(index);
|
|
273
|
+
}
|
|
274
|
+
return indices;
|
|
275
|
+
}, []);
|
|
276
|
+
if (staleIndices.length > 0) {
|
|
277
|
+
context.deleteVariables(...staleIndices);
|
|
278
|
+
}
|
|
279
|
+
context.addVariables({ variable: task_context_variable_1.TASK_CONTEXT_VARIABLE, arg: taskContextId });
|
|
280
|
+
}
|
|
202
281
|
/**
|
|
203
282
|
* Sets up all event bubbling from a delegated child session to the parent session:
|
|
204
283
|
* - Interaction forwarding: child interactionNeeded events are forwarded to the parent response
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-delegation-tool.js","sourceRoot":"","sources":["../../src/browser/agent-delegation-tool.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;;AAEhF,4DAAyE;AACzE,4CAAgH;AAChH,sCAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"agent-delegation-tool.js","sourceRoot":"","sources":["../../src/browser/agent-delegation-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,18 +26,22 @@ const chat_agent_service_1 = require("../common/chat-agent-service");
|
|
|
26
26
|
const agent_delegation_tool_1 = require("./agent-delegation-tool");
|
|
27
27
|
const task_context_variable_1 = require("./task-context-variable");
|
|
28
28
|
disableJSDOM();
|
|
29
|
-
|
|
30
|
-
|
|
29
|
+
function makeStubLogger() {
|
|
30
|
+
return { error: sinon.stub(), warn: sinon.stub(), info: sinon.stub(), debug: sinon.stub() };
|
|
31
|
+
}
|
|
32
|
+
function makeAgentDelegationTool(chatAgentService, chatService, logger = makeStubLogger()) {
|
|
31
33
|
const tool = new agent_delegation_tool_1.AgentDelegationTool();
|
|
32
34
|
Object.defineProperty(tool, 'getChatAgentService', { value: () => chatAgentService });
|
|
33
35
|
Object.defineProperty(tool, 'getChatService', { value: () => chatService });
|
|
36
|
+
Object.defineProperty(tool, 'logger', { value: logger });
|
|
34
37
|
return tool;
|
|
35
38
|
}
|
|
36
39
|
// --- Helper factories ---
|
|
37
40
|
function makeContextManager() {
|
|
38
41
|
return {
|
|
39
42
|
addVariables: sinon.stub(),
|
|
40
|
-
getVariables: sinon.stub().returns([])
|
|
43
|
+
getVariables: sinon.stub().returns([]),
|
|
44
|
+
deleteVariables: sinon.stub()
|
|
41
45
|
};
|
|
42
46
|
}
|
|
43
47
|
function makeChangeSet() {
|
|
@@ -78,6 +82,23 @@ function makeChatContext() {
|
|
|
78
82
|
response: {}
|
|
79
83
|
};
|
|
80
84
|
}
|
|
85
|
+
/** A session previously delegated by the calling session (see {@link makeParentSession}). */
|
|
86
|
+
function makeExistingSession(contextManager = makeContextManager()) {
|
|
87
|
+
return {
|
|
88
|
+
id: 'existing-session-id',
|
|
89
|
+
pinnedAgent: { id: 'test-agent', name: 'Test Agent' },
|
|
90
|
+
rootSessionId: 'original-root-id',
|
|
91
|
+
parentSessionId: 'parent-session-id',
|
|
92
|
+
model: {
|
|
93
|
+
status: 'idle',
|
|
94
|
+
context: contextManager,
|
|
95
|
+
changeSet: makeChangeSet(),
|
|
96
|
+
onDidChange: sinon.stub().returns({ dispose: sinon.stub() }),
|
|
97
|
+
rootSessionId: 'original-root-id',
|
|
98
|
+
parentSessionId: 'parent-session-id'
|
|
99
|
+
}
|
|
100
|
+
};
|
|
101
|
+
}
|
|
81
102
|
function makeChatService(newSession, responseContent) {
|
|
82
103
|
const content = responseContent ?? [{ kind: 'text', content: 'agent response', asString: () => 'agent response' }];
|
|
83
104
|
const responseCompleted = Promise.resolve({
|
|
@@ -152,7 +173,7 @@ describe('AgentDelegationTool', () => {
|
|
|
152
173
|
const ctx = makeChatContext();
|
|
153
174
|
const argString = JSON.stringify({ agentId: 'test-agent', prompt: 'do something' });
|
|
154
175
|
const result = await tool.getTool().handler(argString, ctx);
|
|
155
|
-
(0, chai_1.expect)(result).to.equal('final answer');
|
|
176
|
+
(0, chai_1.expect)(result).to.equal('final answer\n\n[delegation sessionId: new-session-id]');
|
|
156
177
|
(0, chai_1.expect)(result).to.not.include('thinking');
|
|
157
178
|
});
|
|
158
179
|
it('excludes tool call content from the tool result', async () => {
|
|
@@ -165,9 +186,9 @@ describe('AgentDelegationTool', () => {
|
|
|
165
186
|
const ctx = makeChatContext();
|
|
166
187
|
const argString = JSON.stringify({ agentId: 'test-agent', prompt: 'do something' });
|
|
167
188
|
const result = await tool.getTool().handler(argString, ctx);
|
|
168
|
-
(0, chai_1.expect)(result).to.equal('final answer');
|
|
189
|
+
(0, chai_1.expect)(result).to.equal('final answer\n\n[delegation sessionId: new-session-id]');
|
|
169
190
|
});
|
|
170
|
-
it('returns
|
|
191
|
+
it('returns only the session id marker when all content is thinking', async () => {
|
|
171
192
|
const thinkingContent = new common_1.ThinkingChatResponseContentImpl('internal', 'sig');
|
|
172
193
|
const newSession = makeNewSession();
|
|
173
194
|
const agentService = makeChatAgentService();
|
|
@@ -176,7 +197,149 @@ describe('AgentDelegationTool', () => {
|
|
|
176
197
|
const ctx = makeChatContext();
|
|
177
198
|
const argString = JSON.stringify({ agentId: 'test-agent', prompt: 'do something' });
|
|
178
199
|
const result = await tool.getTool().handler(argString, ctx);
|
|
179
|
-
(0, chai_1.expect)(result).to.equal('');
|
|
200
|
+
(0, chai_1.expect)(result).to.equal('[delegation sessionId: new-session-id]');
|
|
201
|
+
});
|
|
202
|
+
});
|
|
203
|
+
describe('delegateToAgent() — delegation session id in result', () => {
|
|
204
|
+
it('appends the delegation session id to the tool result', async () => {
|
|
205
|
+
const newSession = makeNewSession();
|
|
206
|
+
const agentService = makeChatAgentService();
|
|
207
|
+
const chatService = makeChatService(newSession);
|
|
208
|
+
const tool = makeAgentDelegationTool(agentService, chatService);
|
|
209
|
+
const ctx = makeChatContext();
|
|
210
|
+
const argString = JSON.stringify({ agentId: 'test-agent', prompt: 'do something' });
|
|
211
|
+
const result = await tool.getTool().handler(argString, ctx);
|
|
212
|
+
(0, chai_1.expect)(result).to.equal('agent response\n\n[delegation sessionId: new-session-id]');
|
|
213
|
+
});
|
|
214
|
+
});
|
|
215
|
+
describe('delegateToAgent() — sessionId parameter (resume)', () => {
|
|
216
|
+
let contextManager;
|
|
217
|
+
let existingSession;
|
|
218
|
+
let chatService;
|
|
219
|
+
let tool;
|
|
220
|
+
let logger;
|
|
221
|
+
let ctx;
|
|
222
|
+
beforeEach(() => {
|
|
223
|
+
contextManager = makeContextManager();
|
|
224
|
+
existingSession = makeExistingSession(contextManager);
|
|
225
|
+
const newSession = makeNewSession();
|
|
226
|
+
const agentService = makeChatAgentService();
|
|
227
|
+
chatService = makeChatService(newSession);
|
|
228
|
+
chatService.getSession.withArgs('existing-session-id').returns(existingSession);
|
|
229
|
+
chatService.getOrRestoreSession.withArgs('existing-session-id').resolves(existingSession);
|
|
230
|
+
logger = makeStubLogger();
|
|
231
|
+
tool = makeAgentDelegationTool(agentService, chatService, logger);
|
|
232
|
+
ctx = makeChatContext();
|
|
233
|
+
});
|
|
234
|
+
it('sends the follow-up request into the existing session instead of creating a new one', async () => {
|
|
235
|
+
const argString = JSON.stringify({ agentId: 'test-agent', prompt: 'fix the findings', sessionId: 'existing-session-id' });
|
|
236
|
+
const result = await tool.getTool().handler(argString, ctx);
|
|
237
|
+
(0, chai_1.expect)(chatService.createSession.called).to.be.false;
|
|
238
|
+
const sendRequest = chatService.sendRequest;
|
|
239
|
+
(0, chai_1.expect)(sendRequest.calledOnce).to.be.true;
|
|
240
|
+
(0, chai_1.expect)(sendRequest.firstCall.args[0]).to.equal('existing-session-id');
|
|
241
|
+
(0, chai_1.expect)(result).to.equal('agent response\n\n[delegation sessionId: existing-session-id]');
|
|
242
|
+
});
|
|
243
|
+
it('re-establishes event bubbling from the resumed session to the parent', async () => {
|
|
244
|
+
const argString = JSON.stringify({ agentId: 'test-agent', prompt: 'fix the findings', sessionId: 'existing-session-id' });
|
|
245
|
+
await tool.getTool().handler(argString, ctx);
|
|
246
|
+
(0, chai_1.expect)(existingSession.model.onDidChange.calledOnce).to.be.true;
|
|
247
|
+
(0, chai_1.expect)(existingSession.model.changeSet.onDidChange.calledOnce).to.be.true;
|
|
248
|
+
});
|
|
249
|
+
it('does not modify rootSessionId or parentSessionId of the resumed session', async () => {
|
|
250
|
+
const argString = JSON.stringify({ agentId: 'test-agent', prompt: 'fix the findings', sessionId: 'existing-session-id' });
|
|
251
|
+
await tool.getTool().handler(argString, ctx);
|
|
252
|
+
(0, chai_1.expect)(existingSession.rootSessionId).to.equal('original-root-id');
|
|
253
|
+
(0, chai_1.expect)(existingSession.parentSessionId).to.equal('parent-session-id');
|
|
254
|
+
(0, chai_1.expect)(existingSession.model.rootSessionId).to.equal('original-root-id');
|
|
255
|
+
(0, chai_1.expect)(existingSession.model.parentSessionId).to.equal('parent-session-id');
|
|
256
|
+
});
|
|
257
|
+
it('adds the task context variable to the resumed session when taskContextId is provided', async () => {
|
|
258
|
+
const argString = JSON.stringify({
|
|
259
|
+
agentId: 'test-agent', prompt: 'fix the findings', sessionId: 'existing-session-id', taskContextId: 'follow-up-ctx-id'
|
|
260
|
+
});
|
|
261
|
+
await tool.getTool().handler(argString, ctx);
|
|
262
|
+
(0, chai_1.expect)(contextManager.addVariables.calledOnce).to.be.true;
|
|
263
|
+
const callArg = contextManager.addVariables.firstCall.args[0];
|
|
264
|
+
(0, chai_1.expect)(callArg.variable).to.equal(task_context_variable_1.TASK_CONTEXT_VARIABLE);
|
|
265
|
+
(0, chai_1.expect)(callArg.arg).to.equal('follow-up-ctx-id');
|
|
266
|
+
});
|
|
267
|
+
it('restores a delegation session that is persisted but no longer in memory', async () => {
|
|
268
|
+
// e.g. after a page reload: the orchestrator history still carries the session id, but only storage has the session
|
|
269
|
+
chatService.getSession.withArgs('existing-session-id').returns(undefined);
|
|
270
|
+
const argString = JSON.stringify({ agentId: 'test-agent', prompt: 'fix the findings', sessionId: 'existing-session-id' });
|
|
271
|
+
const result = await tool.getTool().handler(argString, ctx);
|
|
272
|
+
const sendRequest = chatService.sendRequest;
|
|
273
|
+
(0, chai_1.expect)(sendRequest.calledOnce).to.be.true;
|
|
274
|
+
(0, chai_1.expect)(sendRequest.firstCall.args[0]).to.equal('existing-session-id');
|
|
275
|
+
(0, chai_1.expect)(result).to.equal('agent response\n\n[delegation sessionId: existing-session-id]');
|
|
276
|
+
});
|
|
277
|
+
it('replaces a previous task context when a different taskContextId is provided', async () => {
|
|
278
|
+
contextManager.getVariables.returns([{ variable: task_context_variable_1.TASK_CONTEXT_VARIABLE, arg: 'stale-ctx-id' }]);
|
|
279
|
+
const argString = JSON.stringify({
|
|
280
|
+
agentId: 'test-agent', prompt: 'fix the findings', sessionId: 'existing-session-id', taskContextId: 'new-ctx-id'
|
|
281
|
+
});
|
|
282
|
+
await tool.getTool().handler(argString, ctx);
|
|
283
|
+
(0, chai_1.expect)(contextManager.deleteVariables.calledOnceWithExactly(0)).to.be.true;
|
|
284
|
+
const callArg = contextManager.addVariables.firstCall.args[0];
|
|
285
|
+
(0, chai_1.expect)(callArg.arg).to.equal('new-ctx-id');
|
|
286
|
+
});
|
|
287
|
+
it('keeps the existing task context when the same taskContextId is provided again', async () => {
|
|
288
|
+
contextManager.getVariables.returns([{ variable: task_context_variable_1.TASK_CONTEXT_VARIABLE, arg: 'same-ctx-id' }]);
|
|
289
|
+
const argString = JSON.stringify({
|
|
290
|
+
agentId: 'test-agent', prompt: 'fix the findings', sessionId: 'existing-session-id', taskContextId: 'same-ctx-id'
|
|
291
|
+
});
|
|
292
|
+
await tool.getTool().handler(argString, ctx);
|
|
293
|
+
(0, chai_1.expect)(contextManager.deleteVariables.called).to.be.false;
|
|
294
|
+
});
|
|
295
|
+
it('disposes the event bubbling when the delegated request fails', async () => {
|
|
296
|
+
chatService.sendRequest.rejects(new Error('provider unavailable'));
|
|
297
|
+
const argString = JSON.stringify({ agentId: 'test-agent', prompt: 'fix the findings', sessionId: 'existing-session-id' });
|
|
298
|
+
await tool.getTool().handler(argString, ctx);
|
|
299
|
+
(0, chai_1.expect)(existingSession.model.onDidChange.firstCall.returnValue.dispose.called).to.be.true;
|
|
300
|
+
(0, chai_1.expect)(existingSession.model.changeSet.onDidChange.firstCall.returnValue.dispose.called).to.be.true;
|
|
301
|
+
});
|
|
302
|
+
it('returns an error when the session was delegated by a different session', async () => {
|
|
303
|
+
existingSession.parentSessionId = 'someone-elses-session-id';
|
|
304
|
+
const argString = JSON.stringify({ agentId: 'test-agent', prompt: 'fix the findings', sessionId: 'existing-session-id' });
|
|
305
|
+
const result = await tool.getTool().handler(argString, ctx);
|
|
306
|
+
(0, chai_1.expect)(result).to.include('was not delegated by this session');
|
|
307
|
+
(0, chai_1.expect)(chatService.sendRequest.called).to.be.false;
|
|
308
|
+
});
|
|
309
|
+
it('returns an error when the session is not a delegated session at all', async () => {
|
|
310
|
+
// e.g. the id of a normal top-level user chat
|
|
311
|
+
existingSession.parentSessionId = undefined;
|
|
312
|
+
const argString = JSON.stringify({ agentId: 'test-agent', prompt: 'fix the findings', sessionId: 'existing-session-id' });
|
|
313
|
+
const result = await tool.getTool().handler(argString, ctx);
|
|
314
|
+
(0, chai_1.expect)(result).to.include('was not delegated by this session');
|
|
315
|
+
(0, chai_1.expect)(chatService.sendRequest.called).to.be.false;
|
|
316
|
+
});
|
|
317
|
+
it('returns an error when the sessionId is unknown', async () => {
|
|
318
|
+
const argString = JSON.stringify({ agentId: 'test-agent', prompt: 'fix the findings', sessionId: 'unknown-session-id' });
|
|
319
|
+
const result = await tool.getTool().handler(argString, ctx);
|
|
320
|
+
(0, chai_1.expect)(result).to.include('not found');
|
|
321
|
+
(0, chai_1.expect)(chatService.sendRequest.called).to.be.false;
|
|
322
|
+
(0, chai_1.expect)(chatService.createSession.called).to.be.false;
|
|
323
|
+
(0, chai_1.expect)(logger.warn.calledOnce).to.be.true;
|
|
324
|
+
(0, chai_1.expect)(logger.error.called).to.be.false;
|
|
325
|
+
});
|
|
326
|
+
it('returns an error when the resumed session is still processing a request', async () => {
|
|
327
|
+
existingSession.model.status = 'running';
|
|
328
|
+
const argString = JSON.stringify({ agentId: 'test-agent', prompt: 'fix the findings', sessionId: 'existing-session-id' });
|
|
329
|
+
const result = await tool.getTool().handler(argString, ctx);
|
|
330
|
+
(0, chai_1.expect)(result).to.include('still processing');
|
|
331
|
+
(0, chai_1.expect)(chatService.sendRequest.called).to.be.false;
|
|
332
|
+
(0, chai_1.expect)(logger.warn.calledOnce).to.be.true;
|
|
333
|
+
(0, chai_1.expect)(logger.error.called).to.be.false;
|
|
334
|
+
});
|
|
335
|
+
it('returns an error when agentId does not match the pinned agent of the session', async () => {
|
|
336
|
+
existingSession.pinnedAgent = { id: 'other-agent', name: 'Other Agent' };
|
|
337
|
+
const argString = JSON.stringify({ agentId: 'test-agent', prompt: 'fix the findings', sessionId: 'existing-session-id' });
|
|
338
|
+
const result = await tool.getTool().handler(argString, ctx);
|
|
339
|
+
(0, chai_1.expect)(result).to.include("belongs to agent 'other-agent'");
|
|
340
|
+
(0, chai_1.expect)(chatService.sendRequest.called).to.be.false;
|
|
341
|
+
(0, chai_1.expect)(logger.error.calledOnce).to.be.true;
|
|
342
|
+
(0, chai_1.expect)(logger.warn.called).to.be.false;
|
|
180
343
|
});
|
|
181
344
|
});
|
|
182
345
|
describe('delegateToAgent() — session persistence', () => {
|