@qduc/term2 0.11.0 → 0.11.1
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/agent.d.ts +11 -0
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +54 -18
- package/dist/agent.js.map +1 -1
- package/dist/components/layout/BackgroundTasksPanel.d.ts.map +1 -1
- package/dist/components/layout/BackgroundTasksPanel.js +35 -16
- package/dist/components/layout/BackgroundTasksPanel.js.map +1 -1
- package/dist/components/message/CommandMessage.js +4 -2
- package/dist/components/message/CommandMessage.js.map +1 -1
- package/dist/components/message/command-message-helpers.d.ts +4 -4
- package/dist/hooks/conversation-ui-reducer.d.ts +5 -0
- package/dist/hooks/conversation-ui-reducer.d.ts.map +1 -1
- package/dist/hooks/conversation-ui-reducer.js +8 -0
- package/dist/hooks/conversation-ui-reducer.js.map +1 -1
- package/dist/hooks/use-conversation.d.ts.map +1 -1
- package/dist/hooks/use-conversation.js +1 -0
- package/dist/hooks/use-conversation.js.map +1 -1
- package/dist/lib/agent-configuration.d.ts.map +1 -1
- package/dist/lib/agent-configuration.js +3 -0
- package/dist/lib/agent-configuration.js.map +1 -1
- package/dist/lib/agent-factory.d.ts +11 -0
- package/dist/lib/agent-factory.d.ts.map +1 -1
- package/dist/lib/agent-factory.js +3 -0
- package/dist/lib/agent-factory.js.map +1 -1
- package/dist/lib/chained-input-filter.d.ts +20 -0
- package/dist/lib/chained-input-filter.d.ts.map +1 -1
- package/dist/lib/chained-input-filter.js +75 -0
- package/dist/lib/chained-input-filter.js.map +1 -1
- package/dist/lib/subagent-bridge.d.ts +20 -1
- package/dist/lib/subagent-bridge.d.ts.map +1 -1
- package/dist/lib/subagent-bridge.js +26 -0
- package/dist/lib/subagent-bridge.js.map +1 -1
- package/dist/prompts/anthropic.md +6 -55
- package/dist/prompts/async-subagent-delegation.d.ts +2 -1
- package/dist/prompts/async-subagent-delegation.d.ts.map +1 -1
- package/dist/prompts/async-subagent-delegation.js +20 -6
- package/dist/prompts/async-subagent-delegation.js.map +1 -1
- package/dist/prompts/async-subagent-delegation.ts +26 -6
- package/dist/prompts/gpt-5.6.md +49 -0
- package/dist/prompts/kimi.md +25 -63
- package/dist/prompts/orchestrator-prompt.test.ts +77 -0
- package/dist/prompts/orchestrator.md +15 -1
- package/dist/prompts/prompt-constructor.d.ts +1 -0
- package/dist/prompts/prompt-constructor.d.ts.map +1 -1
- package/dist/prompts/prompt-constructor.js +6 -2
- package/dist/prompts/prompt-constructor.js.map +1 -1
- package/dist/prompts/prompt-constructor.test.ts +22 -1
- package/dist/prompts/prompt-constructor.ts +9 -1
- package/dist/prompts/prompt-profiles.d.ts.map +1 -1
- package/dist/prompts/prompt-profiles.js +5 -0
- package/dist/prompts/prompt-profiles.js.map +1 -1
- package/dist/prompts/prompt-profiles.test.ts +20 -0
- package/dist/prompts/prompt-profiles.ts +5 -0
- package/dist/prompts/search-via-shell.d.ts.map +1 -1
- package/dist/prompts/search-via-shell.js +8 -25
- package/dist/prompts/search-via-shell.js.map +1 -1
- package/dist/prompts/search-via-shell.test.ts +18 -0
- package/dist/prompts/search-via-shell.ts +8 -25
- package/dist/prompts/subagent-delegation.test.ts +15 -0
- package/dist/prompts/subagents/researcher.md +6 -0
- package/dist/prompts/subagents/worker-prompt.test.ts +35 -0
- package/dist/prompts/subagents/worker.md +8 -0
- package/dist/services/conversation/conversation-adapter.d.ts +11 -3
- package/dist/services/conversation/conversation-adapter.d.ts.map +1 -1
- package/dist/services/conversation/conversation-adapter.js +123 -31
- package/dist/services/conversation/conversation-adapter.js.map +1 -1
- package/dist/services/conversation/conversation-events.d.ts +25 -1
- package/dist/services/conversation/conversation-events.d.ts.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.d.ts.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.js +141 -26
- package/dist/services/conversation/conversation-orchestrator.js.map +1 -1
- package/dist/services/conversation/conversation-orchestrator.types.d.ts +2 -0
- package/dist/services/conversation/conversation-orchestrator.types.d.ts.map +1 -1
- package/dist/services/conversation/conversation-service.d.ts +3 -0
- package/dist/services/conversation/conversation-service.d.ts.map +1 -1
- package/dist/services/conversation/conversation-service.js +4 -0
- package/dist/services/conversation/conversation-service.js.map +1 -1
- package/dist/services/logging/conversation-log-events.d.ts +9 -1
- package/dist/services/logging/conversation-log-events.d.ts.map +1 -1
- package/dist/services/logging/conversation-log-events.js.map +1 -1
- package/dist/services/logging/conversation-log-writer.d.ts +1 -0
- package/dist/services/logging/conversation-log-writer.d.ts.map +1 -1
- package/dist/services/logging/conversation-log-writer.js +1 -1
- package/dist/services/logging/conversation-log-writer.js.map +1 -1
- package/dist/services/logging/conversation-logger.d.ts.map +1 -1
- package/dist/services/logging/conversation-logger.js +10 -0
- package/dist/services/logging/conversation-logger.js.map +1 -1
- package/dist/services/queue/queue-controller.d.ts +1 -0
- package/dist/services/queue/queue-controller.d.ts.map +1 -1
- package/dist/services/queue/queue-controller.js +7 -4
- package/dist/services/queue/queue-controller.js.map +1 -1
- package/dist/services/retry/retry-classifier.d.ts.map +1 -1
- package/dist/services/retry/retry-classifier.js +4 -2
- package/dist/services/retry/retry-classifier.js.map +1 -1
- package/dist/services/subagents/execution-runner.d.ts +3 -3
- package/dist/services/subagents/execution-runner.d.ts.map +1 -1
- package/dist/services/subagents/execution-runner.js +96 -7
- package/dist/services/subagents/execution-runner.js.map +1 -1
- package/dist/services/subagents/mentor-runner.d.ts.map +1 -1
- package/dist/services/subagents/mentor-runner.js +24 -5
- package/dist/services/subagents/mentor-runner.js.map +1 -1
- package/dist/services/subagents/runtime.d.ts.map +1 -1
- package/dist/services/subagents/runtime.js +17 -7
- package/dist/services/subagents/runtime.js.map +1 -1
- package/dist/services/subagents/subagent-async-registry.d.ts +30 -2
- package/dist/services/subagents/subagent-async-registry.d.ts.map +1 -1
- package/dist/services/subagents/subagent-async-registry.js +314 -41
- package/dist/services/subagents/subagent-async-registry.js.map +1 -1
- package/dist/services/subagents/subagent-manager.d.ts +15 -1
- package/dist/services/subagents/subagent-manager.d.ts.map +1 -1
- package/dist/services/subagents/subagent-manager.js +16 -0
- package/dist/services/subagents/subagent-manager.js.map +1 -1
- package/dist/services/subagents/subagent-notification-store.d.ts +40 -22
- package/dist/services/subagents/subagent-notification-store.d.ts.map +1 -1
- package/dist/services/subagents/subagent-notification-store.js +81 -39
- package/dist/services/subagents/subagent-notification-store.js.map +1 -1
- package/dist/services/subagents/subagent-run-control.d.ts +41 -0
- package/dist/services/subagents/subagent-run-control.d.ts.map +1 -0
- package/dist/services/subagents/subagent-run-control.js +166 -0
- package/dist/services/subagents/subagent-run-control.js.map +1 -0
- package/dist/services/subagents/tool-policy.d.ts +24 -4
- package/dist/services/subagents/tool-policy.d.ts.map +1 -1
- package/dist/services/subagents/tool-policy.js +134 -14
- package/dist/services/subagents/tool-policy.js.map +1 -1
- package/dist/services/subagents/types.d.ts +93 -0
- package/dist/services/subagents/types.d.ts.map +1 -1
- package/dist/tools/agent/ask-orchestrator.d.ts +11 -0
- package/dist/tools/agent/ask-orchestrator.d.ts.map +1 -0
- package/dist/tools/agent/ask-orchestrator.js +39 -0
- package/dist/tools/agent/ask-orchestrator.js.map +1 -0
- package/dist/tools/agent/run-subagent-async.d.ts +43 -1
- package/dist/tools/agent/run-subagent-async.d.ts.map +1 -1
- package/dist/tools/agent/run-subagent-async.js +230 -7
- package/dist/tools/agent/run-subagent-async.js.map +1 -1
- package/dist/tools/file/code-context.d.ts +1 -0
- package/dist/tools/file/code-context.d.ts.map +1 -1
- package/dist/tools/file/code-context.js +4 -4
- package/dist/tools/file/code-context.js.map +1 -1
- package/dist/tools/file/grep.d.ts +1 -0
- package/dist/tools/file/grep.d.ts.map +1 -1
- package/dist/tools/file/grep.js +16 -10
- package/dist/tools/file/grep.js.map +1 -1
- package/dist/utils/conversation/conversation-event-handler.d.ts.map +1 -1
- package/dist/utils/conversation/conversation-event-handler.js +6 -3
- package/dist/utils/conversation/conversation-event-handler.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import { Agent } from '@openai/agents';
|
|
2
|
+
import { randomBytes } from 'node:crypto';
|
|
3
|
+
import { mkdtemp, writeFile } from 'node:fs/promises';
|
|
4
|
+
import os from 'node:os';
|
|
5
|
+
import path from 'node:path';
|
|
2
6
|
import { SubagentSession } from './subagent-session.js';
|
|
3
7
|
import { MAX_SUBAGENT_MODEL_RETRIES } from '../retry/conversation-retry-policy.js';
|
|
4
8
|
import { isAbortLike, aggregateToolUsage, safeEmit } from './utils.js';
|
|
@@ -6,6 +10,7 @@ import { normalizeAgentRunUsage, extractUsage } from '../../utils/ai/token-usage
|
|
|
6
10
|
import { buildInstructions, resolveSubagentSearchViaShell } from './role-loader.js';
|
|
7
11
|
import { createSessionRuntime } from '../session/session-composition.js';
|
|
8
12
|
import { AcquiredChildSlot } from '../agent-runtime/execution-budget.js';
|
|
13
|
+
const MAX_PEEK_TEXT_LENGTH = 200;
|
|
9
14
|
export class ExecutionSubagentRunner {
|
|
10
15
|
#logger;
|
|
11
16
|
#settings;
|
|
@@ -26,12 +31,12 @@ export class ExecutionSubagentRunner {
|
|
|
26
31
|
this.#skillsService = deps.skillsService;
|
|
27
32
|
}
|
|
28
33
|
async run(agentId, request, definition) {
|
|
29
|
-
return this.#execute(agentId, request, definition, new SubagentSession(agentId, request.role), undefined, request.signal, undefined);
|
|
34
|
+
return this.#execute(agentId, request, definition, new SubagentSession(agentId, request.role), undefined, request.signal, undefined, undefined, request.task);
|
|
30
35
|
}
|
|
31
|
-
async runInSession(agentId, request, definition, session, providedChildSlot, signal, onEventOverride) {
|
|
32
|
-
return this.#execute(agentId, request, definition, session, providedChildSlot, signal, onEventOverride);
|
|
36
|
+
async runInSession(agentId, request, definition, session, providedChildSlot, signal, onEventOverride, segmentControl, input = request.task) {
|
|
37
|
+
return this.#execute(agentId, request, definition, session, providedChildSlot, signal, onEventOverride, segmentControl, input);
|
|
33
38
|
}
|
|
34
|
-
async #execute(agentId, request, definition, session, providedChildSlot, signal, onEventOverride) {
|
|
39
|
+
async #execute(agentId, request, definition, session, providedChildSlot, signal, onEventOverride, segmentControl, input) {
|
|
35
40
|
if (!this.#createClient) {
|
|
36
41
|
throw new Error('SubagentManager: createClient factory not provided');
|
|
37
42
|
}
|
|
@@ -58,13 +63,19 @@ export class ExecutionSubagentRunner {
|
|
|
58
63
|
}
|
|
59
64
|
const toolCounts = new Map();
|
|
60
65
|
const filesChanged = [];
|
|
66
|
+
const diffDeltas = new Map();
|
|
67
|
+
const validationCapture = {};
|
|
61
68
|
const searchViaShell = resolveSubagentSearchViaShell(this.#settings, definition.model, definition.canRunShell);
|
|
62
|
-
const toolDefinitions = this.#toolFactory.buildToolDefinitions(definition, filesChanged, request.task, searchViaShell);
|
|
69
|
+
const toolDefinitions = this.#toolFactory.buildToolDefinitions(definition, filesChanged, request.task, searchViaShell, false, diffDeltas, validationCapture, segmentControl ? (question) => segmentControl.askOrchestrator(question) : undefined);
|
|
63
70
|
const providerId = definition.provider;
|
|
64
71
|
const tools = this.#toolFactory.buildAgentTools(toolDefinitions, {
|
|
65
72
|
providerId,
|
|
66
73
|
onToolStart: (name) => {
|
|
67
74
|
toolCounts.set(name, (toolCounts.get(name) ?? 0) + 1);
|
|
75
|
+
segmentControl?.onToolStart();
|
|
76
|
+
},
|
|
77
|
+
onToolComplete: () => {
|
|
78
|
+
segmentControl?.onToolComplete();
|
|
68
79
|
},
|
|
69
80
|
});
|
|
70
81
|
const modelSettings = {
|
|
@@ -108,19 +119,37 @@ export class ExecutionSubagentRunner {
|
|
|
108
119
|
runtime.state.importState(initialState);
|
|
109
120
|
}
|
|
110
121
|
const onEvent = onEventOverride ?? this.#onEvent;
|
|
111
|
-
const userTurn = { text:
|
|
122
|
+
const userTurn = { text: input, images: [] };
|
|
112
123
|
let finalText = '';
|
|
113
124
|
let usage = undefined;
|
|
114
125
|
let error;
|
|
115
126
|
let subagentStatus = 'completed';
|
|
116
127
|
let loopProcessedError = false;
|
|
128
|
+
let currentText = '';
|
|
117
129
|
try {
|
|
118
130
|
for await (const event of runtime.turns.start(userTurn, {
|
|
119
131
|
signal,
|
|
120
132
|
maxModelRetries: MAX_SUBAGENT_MODEL_RETRIES,
|
|
121
133
|
})) {
|
|
122
134
|
switch (event.type) {
|
|
135
|
+
case 'text_delta':
|
|
136
|
+
currentText = `${currentText}${event.delta}`.slice(0, MAX_PEEK_TEXT_LENGTH);
|
|
137
|
+
safeEmit(this.#logger, onEvent, {
|
|
138
|
+
type: 'subagent_streaming_text',
|
|
139
|
+
agentId,
|
|
140
|
+
text: currentText,
|
|
141
|
+
});
|
|
142
|
+
break;
|
|
123
143
|
case 'tool_started':
|
|
144
|
+
if (currentText.trim()) {
|
|
145
|
+
safeEmit(this.#logger, onEvent, {
|
|
146
|
+
type: 'subagent_text_turn',
|
|
147
|
+
agentId,
|
|
148
|
+
role: request.role,
|
|
149
|
+
text: currentText,
|
|
150
|
+
});
|
|
151
|
+
currentText = '';
|
|
152
|
+
}
|
|
124
153
|
if (event.toolName) {
|
|
125
154
|
safeEmit(this.#logger, onEvent, {
|
|
126
155
|
type: 'subagent_tool_started',
|
|
@@ -141,6 +170,15 @@ export class ExecutionSubagentRunner {
|
|
|
141
170
|
});
|
|
142
171
|
break;
|
|
143
172
|
case 'final':
|
|
173
|
+
if (currentText.trim()) {
|
|
174
|
+
safeEmit(this.#logger, onEvent, {
|
|
175
|
+
type: 'subagent_text_turn',
|
|
176
|
+
agentId,
|
|
177
|
+
role: request.role,
|
|
178
|
+
text: currentText,
|
|
179
|
+
});
|
|
180
|
+
currentText = '';
|
|
181
|
+
}
|
|
144
182
|
finalText = event.finalText;
|
|
145
183
|
if (event.usage)
|
|
146
184
|
usage = event.usage;
|
|
@@ -155,6 +193,7 @@ export class ExecutionSubagentRunner {
|
|
|
155
193
|
subagentStatus = isAbortLike(event.message, event) ? 'cancelled' : 'failed';
|
|
156
194
|
break;
|
|
157
195
|
case 'retry':
|
|
196
|
+
currentText = '';
|
|
158
197
|
safeEmit(this.#logger, onEvent, {
|
|
159
198
|
type: 'retry',
|
|
160
199
|
toolName: event.toolName,
|
|
@@ -201,6 +240,8 @@ export class ExecutionSubagentRunner {
|
|
|
201
240
|
childSlot?.release();
|
|
202
241
|
runtime.dispose();
|
|
203
242
|
}
|
|
243
|
+
const diffStat = buildDiffStat(filesChanged, diffDeltas);
|
|
244
|
+
const validation = validationCapture.value;
|
|
204
245
|
if (error) {
|
|
205
246
|
return {
|
|
206
247
|
agentId,
|
|
@@ -211,17 +252,65 @@ export class ExecutionSubagentRunner {
|
|
|
211
252
|
toolsUsed: aggregateToolUsage(toolCounts),
|
|
212
253
|
error: error.message,
|
|
213
254
|
...(usage ? { usage } : {}),
|
|
255
|
+
...(diffStat.length > 0 ? { diffStat } : {}),
|
|
256
|
+
...(validation ? { validation } : {}),
|
|
214
257
|
};
|
|
215
258
|
}
|
|
259
|
+
const resultText = await truncateResultText(finalText);
|
|
216
260
|
return {
|
|
217
261
|
agentId,
|
|
218
262
|
role: request.role,
|
|
219
263
|
status: 'completed',
|
|
220
|
-
|
|
264
|
+
...resultText,
|
|
221
265
|
filesChanged: [...new Set(filesChanged)],
|
|
222
266
|
toolsUsed: aggregateToolUsage(toolCounts),
|
|
223
267
|
...(usage ? { usage } : {}),
|
|
268
|
+
...(diffStat.length > 0 ? { diffStat } : {}),
|
|
269
|
+
...(validation ? { validation } : {}),
|
|
224
270
|
};
|
|
225
271
|
}
|
|
226
272
|
}
|
|
273
|
+
function buildDiffStat(filesChanged, diffDeltas) {
|
|
274
|
+
const seen = new Set();
|
|
275
|
+
const entries = [];
|
|
276
|
+
for (const file of filesChanged) {
|
|
277
|
+
if (seen.has(file))
|
|
278
|
+
continue;
|
|
279
|
+
seen.add(file);
|
|
280
|
+
const delta = diffDeltas.get(file) ?? diffDeltas.get(resolveSafe(file));
|
|
281
|
+
entries.push({
|
|
282
|
+
path: file,
|
|
283
|
+
added: delta?.added ?? 0,
|
|
284
|
+
deleted: delta?.deleted ?? 0,
|
|
285
|
+
});
|
|
286
|
+
}
|
|
287
|
+
return entries;
|
|
288
|
+
}
|
|
289
|
+
function resolveSafe(p) {
|
|
290
|
+
try {
|
|
291
|
+
return path.resolve(p);
|
|
292
|
+
}
|
|
293
|
+
catch {
|
|
294
|
+
return p;
|
|
295
|
+
}
|
|
296
|
+
}
|
|
297
|
+
const MAX_FINAL_TEXT_CHARS = 40_000;
|
|
298
|
+
let subagentResultTempDirPromise;
|
|
299
|
+
async function truncateResultText(text) {
|
|
300
|
+
if (text.length <= MAX_FINAL_TEXT_CHARS)
|
|
301
|
+
return { finalText: text };
|
|
302
|
+
const artifactPath = await saveSubagentResultArtifact(text);
|
|
303
|
+
return {
|
|
304
|
+
finalText: text.slice(0, MAX_FINAL_TEXT_CHARS) + `\n...(truncated)\nFull subagent result saved to \`${artifactPath}\``,
|
|
305
|
+
finalTextTruncated: true,
|
|
306
|
+
finalTextArtifactPath: artifactPath,
|
|
307
|
+
};
|
|
308
|
+
}
|
|
309
|
+
async function saveSubagentResultArtifact(text) {
|
|
310
|
+
subagentResultTempDirPromise ??= mkdtemp(path.join(os.tmpdir(), 'term2-subagent-result-'));
|
|
311
|
+
const tempDir = await subagentResultTempDirPromise;
|
|
312
|
+
const artifactPath = path.join(tempDir, `result-${randomBytes(3).toString('hex')}.md`);
|
|
313
|
+
await writeFile(artifactPath, text, 'utf8');
|
|
314
|
+
return artifactPath;
|
|
315
|
+
}
|
|
227
316
|
//# sourceMappingURL=execution-runner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-runner.js","sourceRoot":"","sources":["../../../source/services/subagents/execution-runner.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"execution-runner.js","sourceRoot":"","sources":["../../../source/services/subagents/execution-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mentor-runner.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/mentor-runner.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAC1G,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAMxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAEhF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAE5E,qBAAa,YAAY;;IAOvB,YAAY,IAAI,EAAE;QAChB,MAAM,EAAE,eAAe,CAAC;QACxB,QAAQ,EAAE,gBAAgB,CAAC;QAC3B,qBAAqB,EAAE,sBAAsB,CAAC;QAC9C,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;QAC7C,OAAO,CAAC,EAAE,eAAe,CAAC;KAC3B,EAMA;IAED,KAAK,IAAI,IAAI,CAEZ;IAEK,GAAG,CACP,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,WAAW,EACpB,OAAO,CAAC,EAAE,eAAe,EACzB,eAAe,CAAC,EAAE,eAAe,GAChC,OAAO,CAAC,cAAc,CAAC,CA+
|
|
1
|
+
{"version":3,"file":"mentor-runner.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/mentor-runner.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAC1G,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAMxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAEhF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAE5E,qBAAa,YAAY;;IAOvB,YAAY,IAAI,EAAE;QAChB,MAAM,EAAE,eAAe,CAAC;QACxB,QAAQ,EAAE,gBAAgB,CAAC;QAC3B,qBAAqB,EAAE,sBAAsB,CAAC;QAC9C,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;QAC7C,OAAO,CAAC,EAAE,eAAe,CAAC;KAC3B,EAMA;IAED,KAAK,IAAI,IAAI,CAEZ;IAEK,GAAG,CACP,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,WAAW,EACpB,OAAO,CAAC,EAAE,eAAe,EACzB,eAAe,CAAC,EAAE,eAAe,GAChC,OAAO,CAAC,cAAc,CAAC,CA+CzB;IAEK,YAAY,CAChB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,cAAc,CAAC,CAEzB;CAiFF"}
|
|
@@ -5,7 +5,7 @@ import { SubagentSession } from './subagent-session.js';
|
|
|
5
5
|
import { loadRoleDefinition, resolvePrompt, PROMPTS_DIR } from './role-loader.js';
|
|
6
6
|
import { getEnvInfo, getAgentsInstructions } from '../../agent.js';
|
|
7
7
|
import { getProvider } from '../../providers/index.js';
|
|
8
|
-
import { runWithProvider, extractFinalText } from './utils.js';
|
|
8
|
+
import { runWithProvider, extractFinalText, isAbortLike } from './utils.js';
|
|
9
9
|
import { normalizeAgentRunUsage, extractUsage } from '../../utils/ai/token-usage.js';
|
|
10
10
|
import { AcquiredChildSlot } from '../agent-runtime/execution-budget.js';
|
|
11
11
|
export class MentorRunner {
|
|
@@ -47,10 +47,29 @@ export class MentorRunner {
|
|
|
47
47
|
if (session)
|
|
48
48
|
this.#mentorSession = session;
|
|
49
49
|
try {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
50
|
+
try {
|
|
51
|
+
const result = await this.#runWithSession(agentId, task, signal);
|
|
52
|
+
if (slot && result.usage)
|
|
53
|
+
childBudget.recordUsage(result.usage);
|
|
54
|
+
return result;
|
|
55
|
+
}
|
|
56
|
+
catch (error) {
|
|
57
|
+
if (!signal?.aborted && !isAbortLike(error?.message, error))
|
|
58
|
+
throw error;
|
|
59
|
+
const usage = normalizeAgentRunUsage(error?.state?.usage) ?? extractUsage(error);
|
|
60
|
+
if (slot && usage)
|
|
61
|
+
childBudget.recordUsage(usage);
|
|
62
|
+
return {
|
|
63
|
+
agentId,
|
|
64
|
+
role: 'mentor',
|
|
65
|
+
status: 'cancelled',
|
|
66
|
+
finalText: '',
|
|
67
|
+
filesChanged: [],
|
|
68
|
+
toolsUsed: [],
|
|
69
|
+
error: error?.message ?? 'The subagent run was aborted.',
|
|
70
|
+
...(usage ? { usage } : {}),
|
|
71
|
+
};
|
|
72
|
+
}
|
|
54
73
|
}
|
|
55
74
|
finally {
|
|
56
75
|
slot?.release();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mentor-runner.js","sourceRoot":"","sources":["../../../source/services/subagents/mentor-runner.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAIzC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"mentor-runner.js","sourceRoot":"","sources":["../../../source/services/subagents/mentor-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAC1G,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAC1F,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAuB,MAAM,oBAAoB,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAIrE,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,qBAAqB,EAAE,sBAAsB,CAAC;IAC9C,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC7C,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,YAAY,CAAC,EAAE,sBAAsB,CAAC,cAAc,CAAC,CAAC;IACtD,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B;AAED,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,kBAAkB,CAAC;IAC/B,WAAW,EAAE,mBAAmB,CAAC;IACjC,YAAY,EAAE,oBAAoB,CAAC;IACnC,eAAe,EAAE,uBAAuB,CAAC;IACzC,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,qBAAqB,CAAC;CACtC;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,mBAAmB,GAAG,eAAe,CA+
|
|
1
|
+
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAC1G,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAC1F,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAuB,MAAM,oBAAoB,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAIrE,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,qBAAqB,EAAE,sBAAsB,CAAC;IAC9C,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC7C,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,YAAY,CAAC,EAAE,sBAAsB,CAAC,cAAc,CAAC,CAAC;IACtD,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B;AAED,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,kBAAkB,CAAC;IAC/B,WAAW,EAAE,mBAAmB,CAAC;IACjC,YAAY,EAAE,oBAAoB,CAAC;IACnC,eAAe,EAAE,uBAAuB,CAAC;IACzC,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,qBAAqB,CAAC;CACtC;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,mBAAmB,GAAG,eAAe,CA+FhF"}
|
|
@@ -6,6 +6,16 @@ import { SubagentAsyncRegistry } from './subagent-async-registry.js';
|
|
|
6
6
|
import { SubagentSession } from './subagent-session.js';
|
|
7
7
|
import { loadRoleDefinition } from './role-loader.js';
|
|
8
8
|
export function createSubagentRuntime(deps) {
|
|
9
|
+
// Peek (get_subagent_status): route subagent_tool_started events into the
|
|
10
|
+
// registry so it can capture live per-run progress. The registry is assigned
|
|
11
|
+
// after the runners below (its `run` callback references them), so the
|
|
12
|
+
// optional chaining keeps this safe until then. Events fire only during
|
|
13
|
+
// execution, which always happens after the registry is assigned.
|
|
14
|
+
let asyncRegistry;
|
|
15
|
+
const onEventWithPeek = (event) => {
|
|
16
|
+
deps.onEvent?.(event);
|
|
17
|
+
asyncRegistry?.handleSubagentEvent(event);
|
|
18
|
+
};
|
|
9
19
|
const toolPolicy = new SubagentToolPolicy({
|
|
10
20
|
settings: deps.settings,
|
|
11
21
|
logger: deps.logger,
|
|
@@ -27,7 +37,7 @@ export function createSubagentRuntime(deps) {
|
|
|
27
37
|
sessionContextService: deps.sessionContextService,
|
|
28
38
|
executionContext: deps.executionContext,
|
|
29
39
|
toolFactory,
|
|
30
|
-
onEvent:
|
|
40
|
+
onEvent: onEventWithPeek,
|
|
31
41
|
roleToolCache,
|
|
32
42
|
skillsService: deps.skillsService,
|
|
33
43
|
});
|
|
@@ -38,7 +48,7 @@ export function createSubagentRuntime(deps) {
|
|
|
38
48
|
executionContext: deps.executionContext,
|
|
39
49
|
createClient: deps.createClient,
|
|
40
50
|
toolFactory,
|
|
41
|
-
onEvent:
|
|
51
|
+
onEvent: onEventWithPeek,
|
|
42
52
|
skillsService: deps.skillsService,
|
|
43
53
|
});
|
|
44
54
|
const mentorSession = new SubagentSession('mentor', 'mentor');
|
|
@@ -47,17 +57,17 @@ export function createSubagentRuntime(deps) {
|
|
|
47
57
|
settings: deps.settings,
|
|
48
58
|
sessionContextService: deps.sessionContextService,
|
|
49
59
|
executionContext: deps.executionContext,
|
|
50
|
-
onEvent:
|
|
60
|
+
onEvent: onEventWithPeek,
|
|
51
61
|
session: mentorSession,
|
|
52
62
|
});
|
|
53
|
-
|
|
63
|
+
asyncRegistry = new SubagentAsyncRegistry({
|
|
54
64
|
logger: deps.logger,
|
|
55
|
-
run: async ({ request, runId, session, signal }) => {
|
|
65
|
+
run: async ({ request, runId, session, signal, input, control }) => {
|
|
56
66
|
if (request.role === 'mentor') {
|
|
57
|
-
return mentorRunner.run(runId,
|
|
67
|
+
return mentorRunner.run(runId, input, signal, session, request.executionBudget);
|
|
58
68
|
}
|
|
59
69
|
const definition = loadRoleDefinition(request.role, deps.settings);
|
|
60
|
-
return executionRunner.runInSession(runId, { ...request, signal }, { ...definition, ...(request.executionBudget ? { executionBudget: request.executionBudget } : {}) }, session);
|
|
70
|
+
return executionRunner.runInSession(runId, { ...request, signal }, { ...definition, ...(request.executionBudget ? { executionBudget: request.executionBudget } : {}) }, session, undefined, signal, undefined, control, input);
|
|
61
71
|
},
|
|
62
72
|
onEvent: deps.onEvent,
|
|
63
73
|
ttlMs: deps.settings.get('subagent.asyncSessionTtlMs') ?? 30 * 60 * 1000,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../source/services/subagents/runtime.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAuB,MAAM,oBAAoB,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGlD,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAsBtD,MAAM,UAAU,qBAAqB,CAAC,IAAyB;IAC7D,MAAM,UAAU,GAAG,IAAI,kBAAkB,CAAC;QACxC,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;QACjD,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,WAAW,EAAE,IAAI,CAAC,WAAW;KAC9B,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,IAAI,mBAAmB,CAAC;QAC1C,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,UAAU;QACV,aAAa,EAAE,IAAI,CAAC,aAAa;KAClC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,IAAI,GAAG,EAAyC,CAAC;IAEvE,MAAM,YAAY,GAAG,IAAI,oBAAoB,CAAC;QAC5C,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;QACjD,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,WAAW;QACX,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../source/services/subagents/runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import type { ILoggingService } from '../service-interfaces.js';
|
|
2
2
|
import type { ConversationEvent } from '../conversation/conversation-events.js';
|
|
3
|
-
import type { SubagentRequest, SubagentResult, SubagentRunHandle } from './types.js';
|
|
3
|
+
import type { SubagentRequest, SubagentResult, SubagentRunHandle, SubagentRunStatus, SubagentSegmentControl, SubagentCancelAcknowledgement, SubagentSteerAcknowledgement } from './types.js';
|
|
4
4
|
import { SubagentSession } from './subagent-session.js';
|
|
5
|
-
export
|
|
5
|
+
export declare const SUBAGENT_RUN_NAME_PATTERN: RegExp;
|
|
6
|
+
export type SubagentRegistryErrorCode = 'not_found' | 'role_mismatch' | 'not_continuable' | 'already_active' | 'worker_blocked' | 'evicted' | 'invalid_name' | 'name_in_use';
|
|
6
7
|
export declare class SubagentRegistryError extends Error {
|
|
7
8
|
readonly code: SubagentRegistryErrorCode;
|
|
8
9
|
constructor(code: SubagentRegistryErrorCode, message: string);
|
|
@@ -14,11 +15,15 @@ export interface SubagentAsyncRegistryDeps {
|
|
|
14
15
|
runId: string;
|
|
15
16
|
session: SubagentSession;
|
|
16
17
|
signal: AbortSignal;
|
|
18
|
+
/** A fresh user-turn input for this segment, never SDK RunState reuse. */
|
|
19
|
+
input: string;
|
|
20
|
+
control: SubagentSegmentControl;
|
|
17
21
|
}) => Promise<SubagentResult>;
|
|
18
22
|
onEvent?: (event: ConversationEvent) => void;
|
|
19
23
|
now?: () => number;
|
|
20
24
|
ttlMs?: number;
|
|
21
25
|
messageCap?: number;
|
|
26
|
+
createRunId?: () => string;
|
|
22
27
|
sessionForRole?: (role: string) => SubagentSession | undefined;
|
|
23
28
|
setInterval?: (callback: () => void, delay: number) => ReturnType<typeof setInterval>;
|
|
24
29
|
clearInterval?: (timer: ReturnType<typeof setInterval>) => void;
|
|
@@ -29,8 +34,31 @@ export declare class SubagentAsyncRegistry {
|
|
|
29
34
|
constructor(deps: SubagentAsyncRegistryDeps);
|
|
30
35
|
startRun(request: SubagentRequest, _legacyParentSignal?: AbortSignal): SubagentRunHandle;
|
|
31
36
|
hasActiveRunForRole(role: string): boolean;
|
|
37
|
+
/**
|
|
38
|
+
* Non-blocking progress snapshot for one run, or all non-evicted runs when
|
|
39
|
+
* `runId` is omitted. Never awaits a run promise and never carries
|
|
40
|
+
* completion detail — that stays on `get_subagent_result`.
|
|
41
|
+
*/
|
|
42
|
+
getRunStatus(runId?: string): SubagentRunStatus | SubagentRunStatus[];
|
|
43
|
+
/**
|
|
44
|
+
* Receive a conversation event and update the owning run's peek progress.
|
|
45
|
+
* No-op for events whose `agentId` is not a run this registry owns (sync /
|
|
46
|
+
* nested subagent events are ignored here). This is the only path by which
|
|
47
|
+
* the registry learns `subagent_tool_started` mid-run.
|
|
48
|
+
*/
|
|
49
|
+
handleSubagentEvent(event: ConversationEvent): void;
|
|
32
50
|
getResult(runId: string, signal?: AbortSignal): Promise<SubagentResult>;
|
|
33
51
|
abortRun(runId: string): void;
|
|
52
|
+
/**
|
|
53
|
+
* Non-blocking public cancellation addressed by canonical runId first, then
|
|
54
|
+
* its active name. `abortRun` remains the internal user-stop compatibility API.
|
|
55
|
+
*/
|
|
56
|
+
cancelRun(target: string): SubagentCancelAcknowledgement;
|
|
57
|
+
/**
|
|
58
|
+
* Queue bounded steering for an active execution run without awaiting its result.
|
|
59
|
+
* Canonical active run ids are resolved before active names.
|
|
60
|
+
*/
|
|
61
|
+
sendMessage(target: string, guidance: string, replyTo?: string): SubagentSteerAcknowledgement;
|
|
34
62
|
cancelAllRuns(): void;
|
|
35
63
|
reset(): void;
|
|
36
64
|
dispose(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-async-registry.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/subagent-async-registry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"subagent-async-registry.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/subagent-async-registry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAEhF,OAAO,KAAK,EAEV,eAAe,EACf,cAAc,EACd,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EACtB,6BAA6B,EAC7B,4BAA4B,EAE7B,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,eAAO,MAAM,yBAAyB,QAA4B,CAAC;AAWnE,MAAM,MAAM,yBAAyB,GACjC,WAAW,GACX,eAAe,GACf,iBAAiB,GACjB,gBAAgB,GAChB,gBAAgB,GAChB,SAAS,GACT,cAAc,GACd,aAAa,CAAC;AAElB,qBAAa,qBAAsB,SAAQ,KAAK;IAC9C,QAAQ,CAAC,IAAI,EAAE,yBAAyB,CAAC;IACzC,YAAY,IAAI,EAAE,yBAAyB,EAAE,OAAO,EAAE,MAAM,EAI3D;CACF;AAqCD,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,eAAe,CAAC;IACxB,GAAG,EAAE,CAAC,MAAM,EAAE;QACZ,OAAO,EAAE,eAAe,CAAC;QACzB,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,eAAe,CAAC;QACzB,MAAM,EAAE,WAAW,CAAC;QACpB,0EAA0E;QAC1E,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,sBAAsB,CAAC;KACjC,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IAC9B,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC7C,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,eAAe,GAAG,SAAS,CAAC;IAC/D,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,KAAK,EAAE,MAAM,KAAK,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;IACtF,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,KAAK,IAAI,CAAC;CACjE;AAED,yFAAyF;AACzF,qBAAa,qBAAqB;;IAkBhC,YAAY,IAAI,EAAE,yBAAyB,EAe1C;IAED,QAAQ,CAAC,OAAO,EAAE,eAAe,EAAE,mBAAmB,CAAC,EAAE,WAAW,GAAG,iBAAiB,CAgGvF;IAED,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEzC;IAED;;;;OAIG;IACH,YAAY,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,iBAAiB,GAAG,iBAAiB,EAAE,CAoBpE;IA+BD;;;;;OAKG;IACH,mBAAmB,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI,CAiClD;IAED,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAatE;IAED,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAG5B;IAED;;;OAGG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,6BAA6B,CAKvD;IAED;;;OAGG;IACH,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,4BAA4B,CA4B5F;IAED,aAAa,IAAI,IAAI,CAEpB;IAQD,KAAK,IAAI,IAAI,CAOZ;IAED,OAAO,IAAI,IAAI,CAKd;IAgBD,YAAY,IAAI,IAAI,CAEnB;CAqJF"}
|