sema-core 2.0.10 → 2.0.11
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/core/Conversation.d.ts.map +1 -1
- package/dist/core/Conversation.js +30 -9
- package/dist/core/Conversation.js.map +1 -1
- package/dist/core/SemaEngine.js +2 -2
- package/dist/core/SemaEngine.js.map +1 -1
- package/dist/events/types.d.ts +12 -0
- package/dist/events/types.d.ts.map +1 -1
- package/dist/manager/ConfManager.d.ts.map +1 -1
- package/dist/manager/ConfManager.js +2 -1
- package/dist/manager/ConfManager.js.map +1 -1
- package/dist/manager/CronManager.d.ts.map +1 -1
- package/dist/manager/CronManager.js +7 -2
- package/dist/manager/CronManager.js.map +1 -1
- package/dist/manager/PermissionManager.d.ts.map +1 -1
- package/dist/manager/PermissionManager.js +11 -2
- package/dist/manager/PermissionManager.js.map +1 -1
- package/dist/manager/StateManager.d.ts +15 -0
- package/dist/manager/StateManager.d.ts.map +1 -1
- package/dist/manager/StateManager.js +59 -0
- package/dist/manager/StateManager.js.map +1 -1
- package/dist/prompt/compact.d.ts +7 -0
- package/dist/prompt/compact.d.ts.map +1 -1
- package/dist/prompt/compact.js +17 -0
- package/dist/prompt/compact.js.map +1 -1
- package/dist/prompt/tool.d.ts +2 -0
- package/dist/prompt/tool.d.ts.map +1 -1
- package/dist/prompt/tool.js +15 -1
- package/dist/prompt/tool.js.map +1 -1
- package/dist/services/commands/runCommand.js +6 -3
- package/dist/services/commands/runCommand.js.map +1 -1
- package/dist/tools/LoadTools.d.ts +46 -0
- package/dist/tools/LoadTools.d.ts.map +1 -0
- package/dist/tools/LoadTools.js +168 -0
- package/dist/tools/LoadTools.js.map +1 -0
- package/dist/tools/SearchTools.d.ts +53 -0
- package/dist/tools/SearchTools.d.ts.map +1 -0
- package/dist/tools/SearchTools.js +127 -0
- package/dist/tools/SearchTools.js.map +1 -0
- package/dist/tools/SubAgent.d.ts.map +1 -1
- package/dist/tools/SubAgent.js +6 -22
- package/dist/tools/SubAgent.js.map +1 -1
- package/dist/tools/base/subagentTools.d.ts +13 -0
- package/dist/tools/base/subagentTools.d.ts.map +1 -0
- package/dist/tools/base/subagentTools.js +107 -0
- package/dist/tools/base/subagentTools.js.map +1 -0
- package/dist/tools/base/tools.d.ts +6 -1
- package/dist/tools/base/tools.d.ts.map +1 -1
- package/dist/tools/base/tools.js +107 -4
- package/dist/tools/base/tools.js.map +1 -1
- package/dist/types/agent.d.ts +2 -0
- package/dist/types/agent.d.ts.map +1 -1
- package/dist/types/index.d.ts +4 -1
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js +1 -0
- package/dist/types/index.js.map +1 -1
- package/dist/types/message.d.ts +2 -2
- package/dist/types/message.d.ts.map +1 -1
- package/dist/util/compact.d.ts +23 -1
- package/dist/util/compact.d.ts.map +1 -1
- package/dist/util/compact.js +54 -6
- package/dist/util/compact.js.map +1 -1
- package/dist/util/microcompact.d.ts +38 -0
- package/dist/util/microcompact.d.ts.map +1 -0
- package/dist/util/microcompact.js +194 -0
- package/dist/util/microcompact.js.map +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1,168 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.LoadTools = void 0;
|
|
4
|
+
exports.createSubagentLoadTools = createSubagentLoadTools;
|
|
5
|
+
const zod_1 = require("zod");
|
|
6
|
+
const tool_1 = require("../prompt/tool");
|
|
7
|
+
const StateManager_1 = require("../manager/StateManager");
|
|
8
|
+
const tools_1 = require("./base/tools");
|
|
9
|
+
const TOOL_NAME = tool_1.TOOL_NAME_LOAD_TOOLS;
|
|
10
|
+
const toolParams = zod_1.z.strictObject({
|
|
11
|
+
tool_names: zod_1.z.array(zod_1.z.string()).min(1).max(10).describe('Exact tool names to load, as listed in the tool description. Built-in tools: the name as-is; MCP tools: the full name mcp__{server}__{tool}.'),
|
|
12
|
+
});
|
|
13
|
+
// 可加载名单排版:延迟内置工具名 + 各 MCP server 的工具原名(全名 = mcp__{server}__{tool})
|
|
14
|
+
function formatScopeOverview(deferred) {
|
|
15
|
+
const builtinNames = [];
|
|
16
|
+
const mcpByServer = new Map();
|
|
17
|
+
for (const tool of deferred) {
|
|
18
|
+
if (tool.name.startsWith('mcp__')) {
|
|
19
|
+
const parts = tool.name.split('__');
|
|
20
|
+
const server = parts[1] || 'unknown';
|
|
21
|
+
const origName = parts.length >= 3 ? parts.slice(2).join('__') : tool.name;
|
|
22
|
+
if (!mcpByServer.has(server))
|
|
23
|
+
mcpByServer.set(server, []);
|
|
24
|
+
mcpByServer.get(server).push(origName);
|
|
25
|
+
}
|
|
26
|
+
else {
|
|
27
|
+
builtinNames.push(tool.name);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
const lines = [];
|
|
31
|
+
if (builtinNames.length > 0) {
|
|
32
|
+
lines.push(`Deferred built-in tools: ${builtinNames.join(', ')}`);
|
|
33
|
+
}
|
|
34
|
+
if (mcpByServer.size > 0) {
|
|
35
|
+
lines.push('MCP server tools (full name = mcp__{server}__{tool}):');
|
|
36
|
+
for (const [server, names] of mcpByServer) {
|
|
37
|
+
lines.push(`- ${server}: ${names.join(', ')}`);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
return lines.join('\n');
|
|
41
|
+
}
|
|
42
|
+
// 主代理视角的可加载名单(会话级延迟池)
|
|
43
|
+
function buildScopeOverview() {
|
|
44
|
+
return formatScopeOverview((0, tools_1.getDeferredTools)());
|
|
45
|
+
}
|
|
46
|
+
function buildDescription(scopeOverview) {
|
|
47
|
+
return [
|
|
48
|
+
'Load deferred tools that are not yet in your tool list. ',
|
|
49
|
+
'Loaded tools are appended to your available tools and can be called starting from the next turn. ',
|
|
50
|
+
'Tools already in your list never need loading.\n\n',
|
|
51
|
+
'Pick names from the list below. Built-in tools: use the name as-is. ',
|
|
52
|
+
'MCP tools: use the full name mcp__{server}__{tool}.\n\n',
|
|
53
|
+
scopeOverview,
|
|
54
|
+
].join('');
|
|
55
|
+
}
|
|
56
|
+
// 逐名校验:延迟池中存在 → 加载;已在工具列表(默认集或已加载) → 提示直接调用;否则回报未找到
|
|
57
|
+
function classifyAndLoad(toolNames, ctx) {
|
|
58
|
+
const toLoad = [];
|
|
59
|
+
const alreadyAvailable = [];
|
|
60
|
+
const notFound = [];
|
|
61
|
+
const seen = new Set();
|
|
62
|
+
for (const raw of toolNames) {
|
|
63
|
+
const name = raw.trim();
|
|
64
|
+
if (!name || seen.has(name))
|
|
65
|
+
continue;
|
|
66
|
+
seen.add(name);
|
|
67
|
+
if (ctx.deferredByName.has(name)) {
|
|
68
|
+
if (ctx.loadedBefore.has(name)) {
|
|
69
|
+
alreadyAvailable.push(name);
|
|
70
|
+
}
|
|
71
|
+
else {
|
|
72
|
+
toLoad.push(name);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
else if (ctx.availableNames.has(name)) {
|
|
76
|
+
alreadyAvailable.push(name);
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
notFound.push(name);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
const addedNames = toLoad.length > 0 ? ctx.addLoaded(toLoad) : [];
|
|
83
|
+
return {
|
|
84
|
+
loaded: toLoad,
|
|
85
|
+
alreadyAvailable,
|
|
86
|
+
notFound,
|
|
87
|
+
...(notFound.length > 0 && toLoad.length === 0 && alreadyAvailable.length === 0
|
|
88
|
+
? { scope: ctx.scopeOverview() }
|
|
89
|
+
: {}),
|
|
90
|
+
// 仅有真实新增时才触发工具集重建,避免空转
|
|
91
|
+
...(addedNames.length > 0 ? { controlSignal: { rebuildContext: { reason: 'tools_loaded' } } } : {}),
|
|
92
|
+
};
|
|
93
|
+
}
|
|
94
|
+
exports.LoadTools = {
|
|
95
|
+
name: TOOL_NAME,
|
|
96
|
+
description() {
|
|
97
|
+
return buildDescription(buildScopeOverview());
|
|
98
|
+
},
|
|
99
|
+
toolParams,
|
|
100
|
+
isSafe() {
|
|
101
|
+
return true;
|
|
102
|
+
},
|
|
103
|
+
getDisplayTitle(input) {
|
|
104
|
+
return input?.tool_names?.length ? `${TOOL_NAME}: "${input.tool_names.join(', ')}"` : TOOL_NAME;
|
|
105
|
+
},
|
|
106
|
+
async *call({ tool_names }, agentContext) {
|
|
107
|
+
const runtime = (0, StateManager_1.getStateManager)().session(agentContext.sessionId);
|
|
108
|
+
const data = classifyAndLoad(tool_names, {
|
|
109
|
+
deferredByName: new Map((0, tools_1.getDeferredTools)().map(tool => [tool.name, tool])),
|
|
110
|
+
availableNames: new Set((0, tools_1.getToolSearchDefaultNames)()),
|
|
111
|
+
loadedBefore: new Set(runtime.getLoadedToolNames()),
|
|
112
|
+
addLoaded: names => runtime.addLoadedTools(names),
|
|
113
|
+
scopeOverview: buildScopeOverview,
|
|
114
|
+
});
|
|
115
|
+
yield {
|
|
116
|
+
type: 'result',
|
|
117
|
+
data,
|
|
118
|
+
resultForAssistant: this.genResultForAssistant(data),
|
|
119
|
+
};
|
|
120
|
+
},
|
|
121
|
+
genResultForAssistant(output) {
|
|
122
|
+
const parts = [];
|
|
123
|
+
if (output.loaded.length > 0) {
|
|
124
|
+
parts.push(`Loaded ${output.loaded.length} tool(s), available starting from the next turn: ${output.loaded.join(', ')}`);
|
|
125
|
+
}
|
|
126
|
+
if (output.alreadyAvailable.length > 0) {
|
|
127
|
+
parts.push(`Already in your tool list (call directly): ${output.alreadyAvailable.join(', ')}`);
|
|
128
|
+
}
|
|
129
|
+
if (output.notFound.length > 0) {
|
|
130
|
+
parts.push(`Not found (use exact names from the ${TOOL_NAME} description): ${output.notFound.join(', ')}`);
|
|
131
|
+
}
|
|
132
|
+
if (output.scope) {
|
|
133
|
+
parts.push('Loadable tools:');
|
|
134
|
+
parts.push(output.scope);
|
|
135
|
+
}
|
|
136
|
+
return parts.join('\n');
|
|
137
|
+
},
|
|
138
|
+
};
|
|
139
|
+
// 子代理专用 load_tools 包装实例:以子代理视角计算延迟池,加载状态存 agent 级、随子代理结束清理
|
|
140
|
+
function createSubagentLoadTools(opts) {
|
|
141
|
+
const staticNames = new Set(opts.staticToolNames);
|
|
142
|
+
const agentState = () => (0, StateManager_1.getStateManager)().session(opts.sessionId).forAgent(opts.agentId);
|
|
143
|
+
const scopeOverview = () => {
|
|
144
|
+
const loaded = new Set(agentState().getLoadedToolNames());
|
|
145
|
+
return formatScopeOverview(opts.getDeferredPool().filter(tool => !loaded.has(tool.name)));
|
|
146
|
+
};
|
|
147
|
+
return {
|
|
148
|
+
...exports.LoadTools,
|
|
149
|
+
description() {
|
|
150
|
+
return buildDescription(scopeOverview());
|
|
151
|
+
},
|
|
152
|
+
async *call({ tool_names }, _agentContext) {
|
|
153
|
+
const data = classifyAndLoad(tool_names, {
|
|
154
|
+
deferredByName: new Map(opts.getDeferredPool().map(tool => [tool.name, tool])),
|
|
155
|
+
availableNames: staticNames,
|
|
156
|
+
loadedBefore: new Set(agentState().getLoadedToolNames()),
|
|
157
|
+
addLoaded: names => agentState().addLoadedTools(names),
|
|
158
|
+
scopeOverview,
|
|
159
|
+
});
|
|
160
|
+
yield {
|
|
161
|
+
type: 'result',
|
|
162
|
+
data,
|
|
163
|
+
resultForAssistant: exports.LoadTools.genResultForAssistant(data),
|
|
164
|
+
};
|
|
165
|
+
},
|
|
166
|
+
};
|
|
167
|
+
}
|
|
168
|
+
//# sourceMappingURL=LoadTools.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"LoadTools.js","sourceRoot":"","sources":["../../src/tools/LoadTools.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import { ToolControlSignal } from '../types/message';
|
|
3
|
+
declare const toolParams: z.ZodObject<{
|
|
4
|
+
query: z.ZodString;
|
|
5
|
+
server: z.ZodOptional<z.ZodString>;
|
|
6
|
+
max_results: z.ZodOptional<z.ZodNumber>;
|
|
7
|
+
}, "strict", z.ZodTypeAny, {
|
|
8
|
+
query: string;
|
|
9
|
+
max_results?: number | undefined;
|
|
10
|
+
server?: string | undefined;
|
|
11
|
+
}, {
|
|
12
|
+
query: string;
|
|
13
|
+
max_results?: number | undefined;
|
|
14
|
+
server?: string | undefined;
|
|
15
|
+
}>;
|
|
16
|
+
type LoadedInfo = {
|
|
17
|
+
name: string;
|
|
18
|
+
description: string;
|
|
19
|
+
};
|
|
20
|
+
type ToolRes = {
|
|
21
|
+
loaded: LoadedInfo[];
|
|
22
|
+
alreadyAvailable: string[];
|
|
23
|
+
matchedTotal: number;
|
|
24
|
+
scope?: string;
|
|
25
|
+
controlSignal?: ToolControlSignal;
|
|
26
|
+
};
|
|
27
|
+
export declare const SearchTools: {
|
|
28
|
+
name: string;
|
|
29
|
+
description(): string;
|
|
30
|
+
toolParams: z.ZodObject<{
|
|
31
|
+
query: z.ZodString;
|
|
32
|
+
server: z.ZodOptional<z.ZodString>;
|
|
33
|
+
max_results: z.ZodOptional<z.ZodNumber>;
|
|
34
|
+
}, "strict", z.ZodTypeAny, {
|
|
35
|
+
query: string;
|
|
36
|
+
max_results?: number | undefined;
|
|
37
|
+
server?: string | undefined;
|
|
38
|
+
}, {
|
|
39
|
+
query: string;
|
|
40
|
+
max_results?: number | undefined;
|
|
41
|
+
server?: string | undefined;
|
|
42
|
+
}>;
|
|
43
|
+
isSafe(): true;
|
|
44
|
+
getDisplayTitle(input?: z.infer<typeof toolParams>): string;
|
|
45
|
+
call({ query, server, max_results }: z.infer<typeof toolParams>, agentContext: any): AsyncGenerator<{
|
|
46
|
+
type: "result";
|
|
47
|
+
data: ToolRes;
|
|
48
|
+
resultForAssistant: string | (import("@anthropic-ai/sdk/resources").TextBlockParam | import("@anthropic-ai/sdk/resources").ImageBlockParam)[] | undefined;
|
|
49
|
+
}, void, unknown>;
|
|
50
|
+
genResultForAssistant(output: ToolRes): string;
|
|
51
|
+
};
|
|
52
|
+
export {};
|
|
53
|
+
//# sourceMappingURL=SearchTools.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SearchTools.d.ts","sourceRoot":"","sources":["../../src/tools/SearchTools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAOpD,QAAA,MAAM,UAAU;;;;;;;;;;;;EAId,CAAA;AAEF,KAAK,UAAU,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAA;AAEvD,KAAK,OAAO,GAAG;IACb,MAAM,EAAE,UAAU,EAAE,CAAA;IACpB,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,YAAY,EAAE,MAAM,CAAA;IACpB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,iBAAiB,CAAA;CAClC,CAAA;AAoCD,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;4BAcE,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC;yCAGN,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,gBAAgB,GAAG;;;;;kCA+C3D,OAAO,GAAG,MAAM;CAkBJ,CAAA"}
|
|
@@ -0,0 +1,127 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SearchTools = void 0;
|
|
4
|
+
const zod_1 = require("zod");
|
|
5
|
+
const tool_1 = require("../prompt/tool");
|
|
6
|
+
const StateManager_1 = require("../manager/StateManager");
|
|
7
|
+
const tools_1 = require("./base/tools");
|
|
8
|
+
const TOOL_NAME = tool_1.TOOL_NAME_SEARCH_TOOLS;
|
|
9
|
+
const toolParams = zod_1.z.strictObject({
|
|
10
|
+
query: zod_1.z.string().describe('Keywords to match against tool names and descriptions (space-separated, OR semantics). An exact tool name also works.'),
|
|
11
|
+
server: zod_1.z.string().optional().describe('Restrict the search to one MCP server, e.g. "figma"'),
|
|
12
|
+
max_results: zod_1.z.number().optional().describe('Max number of tools to load, default 5, max 10'),
|
|
13
|
+
});
|
|
14
|
+
// 延迟池概览:延迟的内置工具名 + 各 MCP server 工具数
|
|
15
|
+
function buildScopeOverview() {
|
|
16
|
+
const deferred = (0, tools_1.getDeferredTools)();
|
|
17
|
+
const builtinNames = [];
|
|
18
|
+
const mcpCounts = new Map();
|
|
19
|
+
for (const tool of deferred) {
|
|
20
|
+
if (tool.name.startsWith('mcp__')) {
|
|
21
|
+
const server = tool.name.split('__')[1] || 'unknown';
|
|
22
|
+
mcpCounts.set(server, (mcpCounts.get(server) || 0) + 1);
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
builtinNames.push(tool.name);
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
const lines = [];
|
|
29
|
+
if (builtinNames.length > 0) {
|
|
30
|
+
lines.push(`Deferred built-in tools (load by exact name or keyword): ${builtinNames.join(', ')}`);
|
|
31
|
+
}
|
|
32
|
+
if (mcpCounts.size > 0) {
|
|
33
|
+
lines.push('Searchable MCP servers:');
|
|
34
|
+
for (const [server, count] of mcpCounts) {
|
|
35
|
+
lines.push(`- ${server} (${count} tools)`);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
return lines.join('\n');
|
|
39
|
+
}
|
|
40
|
+
// 描述摘要:取首行并截断,避免结果撑大上下文
|
|
41
|
+
function summarizeDescription(tool) {
|
|
42
|
+
const desc = (0, tools_1.getToolDescription)(tool);
|
|
43
|
+
const firstLine = desc.split('\n')[0] || '';
|
|
44
|
+
return firstLine.length > 200 ? firstLine.slice(0, 200) + '...' : firstLine;
|
|
45
|
+
}
|
|
46
|
+
exports.SearchTools = {
|
|
47
|
+
name: TOOL_NAME,
|
|
48
|
+
description() {
|
|
49
|
+
return [
|
|
50
|
+
'Search and load deferred tools that are not yet in your tool list. ',
|
|
51
|
+
'Matched tools are appended to your available tools and can be called starting from the next turn. ',
|
|
52
|
+
'Tools already in your list never need searching.\n\n',
|
|
53
|
+
buildScopeOverview(),
|
|
54
|
+
].join('');
|
|
55
|
+
},
|
|
56
|
+
toolParams,
|
|
57
|
+
isSafe() {
|
|
58
|
+
return true;
|
|
59
|
+
},
|
|
60
|
+
getDisplayTitle(input) {
|
|
61
|
+
return input?.query ? `${TOOL_NAME}: "${input.query}"` : TOOL_NAME;
|
|
62
|
+
},
|
|
63
|
+
async *call({ query, server, max_results }, agentContext) {
|
|
64
|
+
const runtime = (0, StateManager_1.getStateManager)().session(agentContext.sessionId);
|
|
65
|
+
const limit = Math.max(1, Math.min(max_results ?? 5, 10));
|
|
66
|
+
let candidates = (0, tools_1.getDeferredTools)();
|
|
67
|
+
if (server) {
|
|
68
|
+
const prefix = `mcp__${server.replace(/:/g, '_')}__`;
|
|
69
|
+
candidates = candidates.filter(tool => tool.name.startsWith(prefix));
|
|
70
|
+
}
|
|
71
|
+
const tokens = query.toLowerCase().split(/\s+/).filter(Boolean);
|
|
72
|
+
const scored = candidates
|
|
73
|
+
.map(tool => {
|
|
74
|
+
const name = tool.name.toLowerCase();
|
|
75
|
+
const desc = (0, tools_1.getToolDescription)(tool).toLowerCase();
|
|
76
|
+
let score = 0;
|
|
77
|
+
for (const token of tokens) {
|
|
78
|
+
if (name === token)
|
|
79
|
+
score += 100;
|
|
80
|
+
else if (name.includes(token))
|
|
81
|
+
score += 10;
|
|
82
|
+
if (desc.includes(token))
|
|
83
|
+
score += 1;
|
|
84
|
+
}
|
|
85
|
+
return { tool, score };
|
|
86
|
+
})
|
|
87
|
+
.filter(item => item.score > 0)
|
|
88
|
+
.sort((a, b) => b.score - a.score);
|
|
89
|
+
const matched = scored.slice(0, limit).map(item => item.tool);
|
|
90
|
+
const loadedBefore = new Set(runtime.getLoadedToolNames());
|
|
91
|
+
const fresh = matched.filter(tool => !loadedBefore.has(tool.name));
|
|
92
|
+
const alreadyAvailable = matched.filter(tool => loadedBefore.has(tool.name)).map(tool => tool.name);
|
|
93
|
+
const addedNames = fresh.length > 0 ? runtime.addLoadedTools(fresh.map(tool => tool.name)) : [];
|
|
94
|
+
const data = {
|
|
95
|
+
loaded: fresh.map(tool => ({ name: tool.name, description: summarizeDescription(tool) })),
|
|
96
|
+
alreadyAvailable,
|
|
97
|
+
matchedTotal: scored.length,
|
|
98
|
+
...(matched.length === 0 ? { scope: buildScopeOverview() } : {}),
|
|
99
|
+
// 仅有真实新增时才触发工具集重建,避免空转
|
|
100
|
+
...(addedNames.length > 0 ? { controlSignal: { rebuildContext: { reason: 'tools_loaded' } } } : {}),
|
|
101
|
+
};
|
|
102
|
+
yield {
|
|
103
|
+
type: 'result',
|
|
104
|
+
data,
|
|
105
|
+
resultForAssistant: this.genResultForAssistant(data),
|
|
106
|
+
};
|
|
107
|
+
},
|
|
108
|
+
genResultForAssistant(output) {
|
|
109
|
+
const parts = [];
|
|
110
|
+
if (output.loaded.length > 0) {
|
|
111
|
+
parts.push(`Loaded ${output.loaded.length} tool(s), available starting from the next turn:`);
|
|
112
|
+
parts.push(...output.loaded.map(item => `- ${item.name}: ${item.description}`));
|
|
113
|
+
}
|
|
114
|
+
if (output.alreadyAvailable.length > 0) {
|
|
115
|
+
parts.push(`Already in your tool list (call directly): ${output.alreadyAvailable.join(', ')}`);
|
|
116
|
+
}
|
|
117
|
+
if (output.loaded.length === 0 && output.alreadyAvailable.length === 0) {
|
|
118
|
+
parts.push('No tools matched the query. Try broader keywords or a different server.');
|
|
119
|
+
if (output.scope) {
|
|
120
|
+
parts.push('Searchable scope:');
|
|
121
|
+
parts.push(output.scope);
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
return parts.join('\n');
|
|
125
|
+
},
|
|
126
|
+
};
|
|
127
|
+
//# sourceMappingURL=SearchTools.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SearchTools.js","sourceRoot":"","sources":["../../src/tools/SearchTools.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubAgent.d.ts","sourceRoot":"","sources":["../../src/tools/SubAgent.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;
|
|
1
|
+
{"version":3,"file":"SubAgent.d.ts","sourceRoot":"","sources":["../../src/tools/SubAgent.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAyBvB,QAAA,MAAM,UAAU;;;;;;;;;;;;;;;EAKd,CAAA;AAEF,KAAK,OAAO,GAAG;IACb,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0DAwBsD,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,gBAAgB,GAAG;;;;;;;;;kCA4TxF,OAAO;CAGK,CAAA"}
|
package/dist/tools/SubAgent.js
CHANGED
|
@@ -39,8 +39,7 @@ const zod_1 = require("zod");
|
|
|
39
39
|
const nanoid_1 = require("nanoid");
|
|
40
40
|
const subAgent_1 = require("../prompt/tools/subAgent");
|
|
41
41
|
const agents_1 = require("../prompt/agents");
|
|
42
|
-
const
|
|
43
|
-
const MCPManager_1 = require("../services/mcp/MCPManager");
|
|
42
|
+
const subagentTools_1 = require("./base/subagentTools");
|
|
44
43
|
const Conversation_1 = require("../core/Conversation");
|
|
45
44
|
const message_1 = require("../util/message");
|
|
46
45
|
const agentsManager_1 = require("../services/agents/agentsManager");
|
|
@@ -107,26 +106,9 @@ exports.SubAgent = {
|
|
|
107
106
|
(0, log_1.logDebug)(`Starting ${agentConfig.name} agent with instructions: ${instructions}`);
|
|
108
107
|
// 3. 准备子代理的系统提示(包含 agentConfig.prompt + notes + env + gitStatus)
|
|
109
108
|
const systemPromptContent = await (0, genSystemPrompt_1.buildAgentSystemPrompt)(agentConfig.prompt);
|
|
110
|
-
// 4.
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
subagentTools = (0, tools_1.getAvailableBuiltinTools)().filter(t => !tools_1.SUBAGENT_EXCLUDED_TOOLS.has(t.name));
|
|
114
|
-
}
|
|
115
|
-
else {
|
|
116
|
-
subagentTools = (0, tools_1.getAvailableBuiltinTools)(agentConfig.tools).filter(t => !tools_1.SUBAGENT_EXCLUDED_TOOLS.has(t.name));
|
|
117
|
-
}
|
|
118
|
-
// 子代理的 run_shell 工具不支持后台执行:omit background,模型不可见此字段
|
|
119
|
-
subagentTools = subagentTools.map(t => {
|
|
120
|
-
if (t.name === tool_1.TOOL_NAME_RUN_SHELL) {
|
|
121
|
-
return { ...t, toolParams: t.toolParams.omit({ background: true }) };
|
|
122
|
-
}
|
|
123
|
-
return t;
|
|
124
|
-
});
|
|
125
|
-
// 加入 MCP 工具
|
|
126
|
-
const mcpTools = (0, MCPManager_1.getMCPManager)().getMCPTools();
|
|
127
|
-
if (mcpTools.length > 0) {
|
|
128
|
-
subagentTools = [...subagentTools, ...mcpTools];
|
|
129
|
-
}
|
|
109
|
+
// 4. 获取子代理允许使用的工具(排除嵌套与任务管理工具;core 级 useTools 约束、
|
|
110
|
+
// MCP 按声明匹配、工具搜索模式下的 load_tools 注入均在 buildSubagentToolset 内处理)
|
|
111
|
+
const { tools: subagentTools, rebuildTools } = (0, subagentTools_1.buildSubagentToolset)(agentConfig, sessionId, taskId);
|
|
130
112
|
(0, log_1.logDebug)(`Subagent ${agentConfig.name} has ${subagentTools.length} tools available`);
|
|
131
113
|
// 5. 创建用户消息(包含 rules 信息)
|
|
132
114
|
const additionalReminders = [];
|
|
@@ -150,6 +132,7 @@ exports.SubAgent = {
|
|
|
150
132
|
agentId: taskId,
|
|
151
133
|
abortController: bgAbortController,
|
|
152
134
|
tools: subagentTools,
|
|
135
|
+
rebuildTools,
|
|
153
136
|
model: agentModel,
|
|
154
137
|
};
|
|
155
138
|
const bgResultMessages = [];
|
|
@@ -227,6 +210,7 @@ exports.SubAgent = {
|
|
|
227
210
|
agentId: taskId,
|
|
228
211
|
abortController: subAbortController,
|
|
229
212
|
tools: subagentTools,
|
|
213
|
+
rebuildTools,
|
|
230
214
|
model: agentConfig.model === 'quick' ? 'quick' : 'main'
|
|
231
215
|
};
|
|
232
216
|
// 9. 注册前台任务到 TaskManager 和 StateManager
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubAgent.js","sourceRoot":"","sources":["../../src/tools/SubAgent.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAwB;AAExB,6BAAuB;AACvB,mCAA+B;AAE/B,uDAAqE;AACrE,6CAAgE;AAChE,wCAAgF;AAChF,2DAA0D;AAC1D,uDAA4C;AAG5C,6CAA8C;AAC9C,oEAAmE;AACnE,0DAAyD;AACzD,uDAAmD;AAEnD,qCAAgD;AAChD,4CAAwD;AACxD,mDAAkF;AAClF,wEAA2E;AAC3E,4EAA6E;AAC7E,wDAAuD;AACvD,wDAAuD;AACvD,yCAAyE;AAEzE,MAAM,SAAS,GAAG,0BAAmB,CAAA;AAErC,MAAM,UAAU,GAAG,OAAC,CAAC,YAAY,CAAC;IAChC,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,8DAA8D,CAAC;IAC1F,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,iDAAiD,CAAC;IACpF,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,+CAA+C,CAAC;IAC9G,UAAU,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,iCAAiC,CAAC;CAC/E,CAAC,CAAA;AAQW,QAAA,QAAQ,GAAG;IACtB,IAAI,EAAE,SAAS;IACf,WAAW;QACT,OAAO,IAAA,qCAA0B,GAAE,CAAA;IACrC,CAAC;IACD,UAAU;IACV,MAAM;QACJ,uBAAuB;QACvB,OAAO,KAAK,CAAA;IACd,CAAC;IACD,kBAAkB;QAChB,0BAA0B;QAC1B,OAAO,IAAI,CAAA;IACb,CAAC;IACD,oBAAoB,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE;QACxC,OAAO;YACL,KAAK,EAAE,GAAG,SAAS,EAAE;YACrB,OAAO,EAAE,EAAE;YACX,OAAO,EAAE,EAAE;SACZ,CAAA;IACH,CAAC;IACD,eAAe,CAAC,KAAK;QACnB,OAAO,KAAK,EAAE,KAAK,IAAI,SAAS,CAAA;IAClC,CAAC;IACD,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,UAAU,GAAG,SAAS,EAAE,UAAU,EAA8B,EAAE,YAAiB;QACpH,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QACxB,MAAM,MAAM,GAAG,IAAA,eAAM,GAAE,CAAA;QACvB,MAAM,QAAQ,GAAG,IAAA,yBAAW,GAAE,CAAA;QAC9B,MAAM,SAAS,GAAW,YAAY,CAAC,SAAS,CAAA;QAChD,MAAM,OAAO,GAAG,IAAA,8BAAe,GAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QAEpD,IAAI,CAAC;YACH,uBAAuB;YACvB,MAAM,WAAW,GAAG,MAAM,IAAA,gCAAgB,GAAE,CAAC,aAAa,EAAE,CAAA;YAC5D,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAClC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,UAAU,CAAC,WAAW,EAAE,CAC/D,CAAA;YAED,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,MAAM,QAAQ,GAAG,6BAA6B,UAAU,iBAAiB,sCAA6B,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAA;gBACpI,MAAM;oBACJ,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE;oBACjF,kBAAkB,EAAE,QAAQ;iBAC7B,CAAA;gBACD,OAAM;YACR,CAAC;YAED,IAAA,cAAQ,EAAC,YAAY,WAAW,CAAC,IAAI,6BAA6B,YAAY,EAAE,CAAC,CAAA;YAEjF,iEAAiE;YACjE,MAAM,mBAAmB,GAAG,MAAM,IAAA,wCAAsB,EAAC,WAAW,CAAC,MAAM,CAAC,CAAA;YAE5E,oCAAoC;YACpC,IAAI,aAAqB,CAAA;YACzB,IAAI,CAAC,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK,KAAK,GAAG,EAAE,CAAC;gBACpD,aAAa,GAAG,IAAA,gCAAwB,GAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,+BAAuB,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;YAC9F,CAAC;iBAAM,CAAC;gBACN,aAAa,GAAG,IAAA,gCAAwB,EAAC,WAAW,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,+BAAuB,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;YAC/G,CAAC;YAED,oDAAoD;YACpD,aAAa,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;gBACpC,IAAI,CAAC,CAAC,IAAI,KAAK,0BAAmB,EAAE,CAAC;oBACnC,OAAO,EAAE,GAAG,CAAC,EAAE,UAAU,EAAG,CAAC,CAAC,UAAkB,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,EAAE,CAAA;gBAC/E,CAAC;gBACD,OAAO,CAAC,CAAA;YACV,CAAC,CAAC,CAAA;YAEF,YAAY;YACZ,MAAM,QAAQ,GAAG,IAAA,0BAAa,GAAE,CAAC,WAAW,EAAE,CAAA;YAC9C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,aAAa,GAAG,CAAC,GAAG,aAAa,EAAE,GAAG,QAAQ,CAAC,CAAA;YACjD,CAAC;YAED,IAAA,cAAQ,EAAC,YAAY,WAAW,CAAC,IAAI,QAAQ,aAAa,CAAC,MAAM,kBAAkB,CAAC,CAAA;YAEpF,yBAAyB;YACzB,MAAM,mBAAmB,GAAkC,EAAE,CAAA;YAE7D,cAAc;YACd,MAAM,cAAc,GAAG,IAAA,0CAAsB,GAAE,CAAA;YAC/C,mBAAmB,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,CAAA;YAE3C,MAAM,WAAW,GAAG,IAAA,sBAAY,EAAC;gBAC/B,GAAG,mBAAmB;gBACtB,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,YAAY,EAAE;aAC9C,CAAC,CAAA;YAEF,MAAM,iBAAiB,GAAG,IAAA,4BAAc,GAAE,CAAC,aAAa,EAAE,EAAE,sBAAsB,IAAI,KAAK,CAAA;YAE3F,6CAA6C;YAC7C,IAAI,UAAU,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACrC,MAAM,WAAW,GAAG,IAAA,4BAAc,GAAE,CAAA;gBACpC,MAAM,SAAS,GAAG,YAAY,EAAE,gBAAgB,IAAI,EAAE,CAAA;gBACtD,MAAM,UAAU,GAAqB,WAAW,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAA;gBAErF,QAAQ,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,IAAI,EAA+B,EAAE,SAAS,CAAC,CAAA;gBAE1J,WAAW,CAAC,cAAc,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,iBAAiB,EAAE,EAAE;oBAC1F,MAAM,SAAS,GAAiB;wBAC9B,SAAS;wBACT,OAAO,EAAE,MAAM;wBACf,eAAe,EAAE,iBAAiB;wBAClC,KAAK,EAAE,aAAa;wBACpB,KAAK,EAAE,UAAU;qBAClB,CAAA;oBACD,MAAM,gBAAgB,GAAU,EAAE,CAAA;oBAClC,IAAI,CAAC;wBACH,IAAI,KAAK,EAAE,MAAM,OAAO,IAAI,IAAA,oBAAK,EAAC,CAAC,WAAW,CAAC,EAAE,mBAAmB,EAAE,SAAS,CAAC,EAAE,CAAC;4BACjF,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;wBAChC,CAAC;wBACD,MAAM,aAAa,GAAG,iBAAiB,CAAC,MAAM,CAAC,OAAO,CAAA;wBACtD,MAAM,KAAK,GAAG,IAAA,2BAAc,EAAC,gBAAgB,EAAE,KAAK,CAAC,CAAA;wBACrD,MAAM,OAAO,GAAG,IAAA,0BAAa,EAAC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,CAAA;wBACjF,QAAQ,CAAC,IAAI,CAAC,gBAAgB,EAAE;4BAC9B,MAAM;4BACN,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW;4BACnD,OAAO,EAAE,OAAO;yBACU,EAAE,SAAS,CAAC,CAAA;wBACxC,OAAO;4BACL,MAAM,EAAE,IAAA,2BAAc,EAAC,gBAAgB,CAAC;4BACxC,KAAK,EAAE;gCACL,WAAW,EAAE,KAAK,CAAC,WAAW;gCAC9B,QAAQ,EAAE,KAAK,CAAC,YAAY;gCAC5B,UAAU,EAAE,KAAK,CAAC,UAAU;6BAC7B;yBACF,CAAA;oBACH,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,MAAM,aAAa,GAAG,IAAA,+BAAsB,EAAC,KAAK,CAAC,IAAI,iBAAiB,CAAC,MAAM,CAAC,OAAO,CAAA;wBACvF,MAAM,KAAK,GAAG,IAAA,2BAAc,EAAC,gBAAgB,EAAE,KAAK,CAAC,CAAA;wBACrD,MAAM,OAAO,GAAG,aAAa;4BAC3B,CAAC,CAAC,IAAA,0BAAa,EAAC,KAAK,EAAE,aAAa,CAAC;4BACrC,CAAC,CAAC,UAAU,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAA;wBACtE,QAAQ,CAAC,IAAI,CAAC,gBAAgB,EAAE;4BAC9B,MAAM;4BACN,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ;4BAChD,OAAO,EAAE,OAAO;yBACU,EAAE,SAAS,CAAC,CAAA;wBACxC,MAAM,KAAK,CAAA;oBACb,CAAC;4BAAS,CAAC;wBACT,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAA;oBAC1C,CAAC;gBACH,CAAC,EAAE,WAAW,CAAC,IAAI,CAAC,CAAA;gBAEpB,MAAM,SAAS,GAAG,uCAAuC,MAAM,qPAAqP,CAAA;gBACpT,MAAM;oBACJ,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,EAAE,SAAS,EAAE,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE;oBACxF,kBAAkB,EAAE,SAAS;iBAC9B,CAAA;gBACD,OAAM;YACR,CAAC;YAED,iCAAiC;YACjC,MAAM,qBAAqB,GAAG,OAAO,CAAC,sBAAsB,CAAA;YAE5D,IAAI,CAAC,qBAAqB,EAAE,CAAC;gBAC3B,MAAM,QAAQ,GAAG,6DAA6D,CAAA;gBAC9E,MAAM;oBACJ,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE;oBACjF,kBAAkB,EAAE,QAAQ;iBAC7B,CAAA;gBACD,OAAM;YACR,CAAC;YAED,MAAM,kBAAkB,GAAG,IAAI,eAAe,EAAE,CAAA;YAEhD,2BAA2B;YAC3B,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAA;YACpD,qBAAqB,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAA;YACnE,MAAM,WAAW,GAAG,GAAG,EAAE;gBACvB,qBAAqB,CAAC,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAA;YACxE,CAAC,CAAA;YAED,2BAA2B;YAC3B,IAAI,qBAAqB,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBACzC,kBAAkB,CAAC,KAAK,EAAE,CAAA;YAC5B,CAAC;YAED,sCAAsC;YACtC,MAAM,eAAe,GAAiB;gBACpC,SAAS;gBACT,OAAO,EAAE,MAAM;gBACf,eAAe,EAAE,kBAAkB;gBACnC,KAAK,EAAE,aAAa;gBACpB,KAAK,EAAE,WAAW,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM;aACxD,CAAA;YAED,wCAAwC;YACxC,MAAM,WAAW,GAAG,IAAA,4BAAc,GAAE,CAAA;YACpC,MAAM,SAAS,GAAG,YAAY,EAAE,gBAAgB,IAAI,EAAE,CAAA;YACtD,WAAW,CAAC,uBAAuB,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAE,WAAW,EAAE,WAAW,CAAC,IAAI,CAAC,CAAA;YAC3H,OAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAA;YAElC,6BAA6B;YAC7B,QAAQ,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,KAAK,EAA+B,EAAE,SAAS,CAAC,CAAA;YAE3J,kCAAkC;YAClC,MAAM,cAAc,GAAU,EAAE,CAAA;YAEhC,MAAM,gBAAgB,GAAG,CAAC,KAAK,IAAI,EAAE;gBACnC,IAAI,CAAC;oBACH,IAAI,KAAK,EAAE,MAAM,OAAO,IAAI,IAAA,oBAAK,EAAC,CAAC,WAAW,CAAC,EAAE,mBAAmB,EAAE,eAAe,CAAC,EAAE,CAAC;wBACvF,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;oBAC9B,CAAC;oBAED,MAAM,aAAa,GAAG,kBAAkB,CAAC,MAAM,CAAC,OAAO,CAAA;oBACvD,MAAM,KAAK,GAAG,IAAA,2BAAc,EAAC,cAAc,EAAE,KAAK,CAAC,CAAA;oBACnD,MAAM,OAAO,GAAG,IAAA,0BAAa,EAAC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,CAAA;oBAEjF,QAAQ,CAAC,IAAI,CAAC,gBAAgB,EAAE;wBAC9B,MAAM;wBACN,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW;wBACnD,OAAO,EAAE,OAAO;qBACU,EAAE,SAAS,CAAC,CAAA;oBAExC,OAAO;wBACL,MAAM,EAAE,IAAA,2BAAc,EAAC,cAAc,CAAC;wBACtC,KAAK,EAAE;4BACL,WAAW,EAAE,KAAK,CAAC,WAAW;4BAC9B,QAAQ,EAAE,KAAK,CAAC,YAAY;4BAC5B,UAAU,EAAE,KAAK,CAAC,UAAU;yBAC7B;qBACF,CAAA;gBACH,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,aAAa,GAAG,IAAA,+BAAsB,EAAC,KAAK,CAAC,IAAI,kBAAkB,CAAC,MAAM,CAAC,OAAO,CAAA;oBACxF,MAAM,KAAK,GAAG,IAAA,2BAAc,EAAC,cAAc,EAAE,KAAK,CAAC,CAAA;oBACnD,MAAM,OAAO,GAAG,aAAa;wBAC3B,CAAC,CAAC,IAAA,0BAAa,EAAC,KAAK,EAAE,aAAa,CAAC;wBACrC,CAAC,CAAC,UAAU,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAA;oBAEtE,QAAQ,CAAC,IAAI,CAAC,gBAAgB,EAAE;wBAC9B,MAAM;wBACN,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ;wBAChD,OAAO,EAAE,OAAO;qBACU,EAAE,SAAS,CAAC,CAAA;oBAExC,MAAM,KAAK,CAAA;gBACb,CAAC;wBAAS,CAAC;oBACT,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAA;oBACxC,OAAO,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAA;gBACvC,CAAC;YACH,CAAC,CAAC,EAAE,CAAA;YAEJ,kDAAkD;YAClD,IAAI,eAAe,GAAwB,IAAI,CAAA;YAC/C,MAAM,cAAc,GAAG,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;gBACjD,eAAe,GAAG,OAAO,CAAA;YAC3B,CAAC,CAAC,CAAA;YACF,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACvB,WAAW,CAAC,kBAAkB,CAAC,MAAM,EAAE,eAAgB,CAAC,CAAA;YAC1D,CAAC;YAED,oCAAoC;YACpC,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,IAAI,CAC7C,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,WAAoB,EAAE,GAAG,EAAE,CAAC,EAC5C,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,OAAgB,EAAE,GAAG,EAAE,CAAC,CACzC,CAAA;YAED,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;gBACpC,iBAAiB;gBACjB,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,aAAsB,EAAE,CAAC,CAAC;aAC9D,CAAC,CAAA;YAEF,mBAAmB;YACnB,IAAI,UAAU,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBACpC,MAAM,EAAE,GAAG,EAAE,GAAG,UAAU,CAAA;gBAC1B,WAAW,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,CAAA;gBAE1D,MAAM,MAAM,GAAY;oBACtB,SAAS,EAAE,WAAW,CAAC,IAAI;oBAC3B,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;iBAC/B,CAAA;gBACD,MAAM;oBACJ,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,MAAM;oBACZ,kBAAkB,EAAE,GAAG,CAAC,MAAM;iBAC/B,CAAA;YACH,CAAC;iBAAM,IAAI,UAAU,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBACvC,MAAM,EAAE,GAAG,EAAE,GAAG,UAAU,CAAA;gBAC1B,MAAM,aAAa,GAAG,IAAA,+BAAsB,EAAC,GAAG,CAAC,IAAI,kBAAkB,CAAC,MAAM,CAAC,OAAO,CAAA;gBACtF,MAAM,KAAK,GAAG,IAAA,2BAAc,EAAC,cAAc,EAAE,KAAK,CAAC,CAAA;gBAEnD,WAAW,CAAC,YAAY,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;gBAEvD,IAAI,aAAa,EAAE,CAAC;oBAClB,MAAM,OAAO,GAAG,IAAA,0BAAa,EAAC,KAAK,EAAE,aAAa,CAAC,CAAA;oBACnD,IAAA,cAAQ,EAAC,YAAY,WAAW,CAAC,IAAI,kBAAkB,CAAC,CAAA;oBACxD,MAAM;wBACJ,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,EAAE,SAAS,EAAE,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE;wBACtF,kBAAkB,EAAE,OAAO;qBAC5B,CAAA;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,QAAQ,GAAG,oBAAoB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAA;oBACvF,IAAA,cAAQ,EAAC,QAAQ,CAAC,CAAA;oBAClB,MAAM;wBACJ,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,EAAE,SAAS,EAAE,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE;wBACvF,kBAAkB,EAAE,QAAQ;qBAC7B,CAAA;gBACH,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,qCAAqC;gBACrC,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;gBAC1C,IAAI,MAAM,EAAE,CAAC;oBACX,MAAM,CAAC,QAAQ,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;wBAClD,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;4BAChC,IAAI,CAAC;gCAAC,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;4BAAC,CAAC;4BAAC,MAAM,CAAC,CAAA,CAAC;4BACrE,WAAW,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;wBAC1E,CAAC;6BAAM,CAAC;4BACN,MAAM,SAAS,GAAG,kBAAkB,CAAC,MAAM,CAAC,OAAO,CAAA;4BACnD,MAAM,GAAG,GAAG,SAAS;gCACnB,CAAC,CAAC,qBAAqB;gCACvB,CAAC,CAAC,iBAAiB,MAAM,CAAC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAA;4BAC7F,IAAI,CAAC,MAAM,CAAC,MAAM;gCAAE,MAAM,CAAC,MAAM,GAAG,GAAG,CAAA;4BACvC,IAAI,CAAC;gCAAC,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;4BAAC,CAAC;4BAAC,MAAM,CAAC,CAAA,CAAC;4BACxD,WAAW,CAAC,YAAY,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;wBACrD,CAAC;oBACH,CAAC,CAAC,CAAA;gBACJ,CAAC;gBAED,MAAM,WAAW,GAAG,wCAAwC,MAAM,kFAAkF,CAAA;gBACpJ,MAAM;oBACJ,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,EAAE,SAAS,EAAE,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE;oBAC1F,kBAAkB,EAAE,WAAW;iBAChC,CAAA;YACH,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,cAAc;YACd,MAAM,QAAQ,GAAG,gBAAgB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAA;YACzF,IAAA,cAAQ,EAAC,QAAQ,CAAC,CAAA;YAElB,kBAAkB;YAClB,MAAM,aAAa,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YAC9C,aAAa,CAAC,aAAa,EAAE,CAAA;YAE7B,SAAS;YACT,MAAM,YAAY,GAAqB;gBACrC,MAAM;gBACN,MAAM,EAAE,QAAQ;gBAChB,OAAO,EAAE,QAAQ;aAClB,CAAA;YACD,QAAQ,CAAC,IAAI,CAAC,gBAAgB,EAAE,YAAY,EAAE,SAAS,CAAC,CAAA;YAExD,MAAM;gBACJ,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE;gBACjF,kBAAkB,EAAE,QAAQ;aAC7B,CAAA;QACH,CAAC;IACH,CAAC;IACD,qBAAqB,CAAC,MAAe;QACnC,OAAO,MAAM,CAAC,MAAM,CAAA;IACtB,CAAC;CACyC,CAAA"}
|
|
1
|
+
{"version":3,"file":"SubAgent.js","sourceRoot":"","sources":["../../src/tools/SubAgent.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { Tool } from './Tool';
|
|
2
|
+
import type { AgentConfig } from '../../types/agent';
|
|
3
|
+
/**
|
|
4
|
+
* 组装子代理工具集,并返回重组闭包(供 tools_loaded 重建上下文时使用)。
|
|
5
|
+
* 显式声明的 agent 声明即所得(内置与 core 级 useTools 求交 + 声明匹配的 MCP),与工具搜索模式无关;
|
|
6
|
+
* '*' 时工具搜索模式收敛为默认集并注入 load_tools,自加载状态存 agent 级、随子代理结束清理。
|
|
7
|
+
* rebuildTools 为 append-only:前段冻结在闭包里,仅自加载段增长,保证子代理前缀缓存稳定。
|
|
8
|
+
*/
|
|
9
|
+
export declare function buildSubagentToolset(agentConfig: AgentConfig, sessionId: string, agentId: string): {
|
|
10
|
+
tools: Tool[];
|
|
11
|
+
rebuildTools: () => Tool[];
|
|
12
|
+
};
|
|
13
|
+
//# sourceMappingURL=subagentTools.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"subagentTools.d.ts","sourceRoot":"","sources":["../../../src/tools/base/subagentTools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAO7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AA6BpD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,GACd;IAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IAAC,YAAY,EAAE,MAAM,IAAI,EAAE,CAAA;CAAE,CA0E/C"}
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.buildSubagentToolset = buildSubagentToolset;
|
|
4
|
+
const tools_1 = require("./tools");
|
|
5
|
+
const MCPManager_1 = require("../../services/mcp/MCPManager");
|
|
6
|
+
const ConfManager_1 = require("../../manager/ConfManager");
|
|
7
|
+
const StateManager_1 = require("../../manager/StateManager");
|
|
8
|
+
const LoadTools_1 = require("../LoadTools");
|
|
9
|
+
const tool_1 = require("../../prompt/tool");
|
|
10
|
+
// 子代理的 run_shell 不支持后台执行:omit background,模型不可见此字段
|
|
11
|
+
function omitRunShellBackground(tools) {
|
|
12
|
+
return tools.map(t => {
|
|
13
|
+
if (t.name === tool_1.TOOL_NAME_RUN_SHELL) {
|
|
14
|
+
return { ...t, toolParams: t.toolParams.omit({ background: true }) };
|
|
15
|
+
}
|
|
16
|
+
return t;
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
// 显式声明的 tools 中匹配 MCP 工具:精确全名 mcp__{server}__{tool},或通配 mcp__{server}__* / mcp__{server}__{prefix}*
|
|
20
|
+
// 不合法通配(mcp__*、mcp__{server}* 等未具体到 server 的形式)直接丢弃
|
|
21
|
+
function matchDeclaredMCPTools(declared, mcpTools) {
|
|
22
|
+
const exact = new Set();
|
|
23
|
+
const prefixes = [];
|
|
24
|
+
for (const name of declared) {
|
|
25
|
+
if (!name.startsWith('mcp__'))
|
|
26
|
+
continue;
|
|
27
|
+
if (name.endsWith('*')) {
|
|
28
|
+
if ((0, tools_1.isValidMCPWildcard)(name))
|
|
29
|
+
prefixes.push(name.slice(0, -1));
|
|
30
|
+
continue;
|
|
31
|
+
}
|
|
32
|
+
exact.add(name);
|
|
33
|
+
}
|
|
34
|
+
if (exact.size === 0 && prefixes.length === 0)
|
|
35
|
+
return [];
|
|
36
|
+
return mcpTools.filter(t => exact.has(t.name) || prefixes.some(p => t.name.startsWith(p)));
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* 组装子代理工具集,并返回重组闭包(供 tools_loaded 重建上下文时使用)。
|
|
40
|
+
* 显式声明的 agent 声明即所得(内置与 core 级 useTools 求交 + 声明匹配的 MCP),与工具搜索模式无关;
|
|
41
|
+
* '*' 时工具搜索模式收敛为默认集并注入 load_tools,自加载状态存 agent 级、随子代理结束清理。
|
|
42
|
+
* rebuildTools 为 append-only:前段冻结在闭包里,仅自加载段增长,保证子代理前缀缓存稳定。
|
|
43
|
+
*/
|
|
44
|
+
function buildSubagentToolset(agentConfig, sessionId, agentId) {
|
|
45
|
+
const runtime = (0, StateManager_1.getStateManager)().session(sessionId);
|
|
46
|
+
const coreUseTools = (0, ConfManager_1.getConfManager)().getCoreConfig()?.useTools;
|
|
47
|
+
const hasExplicitTools = !!agentConfig.tools && agentConfig.tools !== '*';
|
|
48
|
+
const mcpTools = (0, MCPManager_1.getMCPManager)().getMCPTools();
|
|
49
|
+
let builtinTools;
|
|
50
|
+
if (hasExplicitTools) {
|
|
51
|
+
const declared = agentConfig.tools;
|
|
52
|
+
const effective = coreUseTools ? declared.filter(name => coreUseTools.includes(name)) : declared;
|
|
53
|
+
builtinTools = (0, tools_1.getAvailableBuiltinTools)([...effective]);
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
builtinTools = (0, tools_1.getAvailableBuiltinTools)(coreUseTools);
|
|
57
|
+
}
|
|
58
|
+
builtinTools = omitRunShellBackground(builtinTools.filter(t => !tools_1.SUBAGENT_EXCLUDED_TOOLS.has(t.name)));
|
|
59
|
+
if (hasExplicitTools) {
|
|
60
|
+
const declaredMCP = matchDeclaredMCPTools(agentConfig.tools, mcpTools);
|
|
61
|
+
const tools = declaredMCP.length > 0 ? [...builtinTools, ...declaredMCP] : builtinTools;
|
|
62
|
+
return { tools, rebuildTools: () => tools };
|
|
63
|
+
}
|
|
64
|
+
const enableToolSearch = (0, ConfManager_1.getConfManager)().getCoreConfig()?.enableToolSearch ?? false;
|
|
65
|
+
if (!enableToolSearch) {
|
|
66
|
+
const tools = mcpTools.length > 0 ? [...builtinTools, ...mcpTools] : builtinTools;
|
|
67
|
+
return { tools, rebuildTools: () => tools };
|
|
68
|
+
}
|
|
69
|
+
// 工具搜索模式:默认集 + 继承父会话已加载(spawn 时快照,防父代理并发 load 导致继承段漂移)
|
|
70
|
+
const byName = new Map();
|
|
71
|
+
builtinTools.forEach(t => byName.set(t.name, t));
|
|
72
|
+
mcpTools.forEach(t => byName.set(t.name, t));
|
|
73
|
+
// 默认集按白名单序从内置 ∪ MCP 取(与主代理一致,含配置的 MCP 默认工具);排除工具不在 byName 中自然丢弃
|
|
74
|
+
const defaultNameList = (0, tools_1.getToolSearchDefaultNames)(coreUseTools);
|
|
75
|
+
const defaultNames = new Set(defaultNameList);
|
|
76
|
+
const base = defaultNameList
|
|
77
|
+
.map(name => byName.get(name))
|
|
78
|
+
.filter((t) => !!t);
|
|
79
|
+
const inherited = runtime.getLoadedToolNames()
|
|
80
|
+
.filter(name => !defaultNames.has(name) && !tools_1.SUBAGENT_EXCLUDED_TOOLS.has(name))
|
|
81
|
+
.map(name => byName.get(name))
|
|
82
|
+
.filter((t) => !!t);
|
|
83
|
+
const staticToolNames = [...base.map(t => t.name), ...inherited.map(t => t.name)];
|
|
84
|
+
const staticNameSet = new Set(staticToolNames);
|
|
85
|
+
// 子代理延迟池 = (可用内置 ∪ MCP) \ SUBAGENT_EXCLUDED_TOOLS \ 已在列表(MCP 实时读取)
|
|
86
|
+
const getDeferredPool = () => {
|
|
87
|
+
const pool = new Map();
|
|
88
|
+
(0, tools_1.getAvailableBuiltinTools)(coreUseTools).forEach(t => pool.set(t.name, t));
|
|
89
|
+
(0, MCPManager_1.getMCPManager)().getMCPTools().forEach(t => pool.set(t.name, t));
|
|
90
|
+
return omitRunShellBackground([...pool.values()].filter(t => !tools_1.SUBAGENT_EXCLUDED_TOOLS.has(t.name) && !staticNameSet.has(t.name)));
|
|
91
|
+
};
|
|
92
|
+
// 延迟池为空时不注入 load_tools(对齐主代理短路逻辑)
|
|
93
|
+
if (getDeferredPool().length === 0) {
|
|
94
|
+
const tools = [...base, ...inherited];
|
|
95
|
+
return { tools, rebuildTools: () => tools };
|
|
96
|
+
}
|
|
97
|
+
const loadToolsInstance = (0, LoadTools_1.createSubagentLoadTools)({ sessionId, agentId, staticToolNames, getDeferredPool });
|
|
98
|
+
const resolveOwnLoaded = () => {
|
|
99
|
+
const poolByName = new Map(getDeferredPool().map(t => [t.name, t]));
|
|
100
|
+
return runtime.getAgentLoadedToolNames(agentId)
|
|
101
|
+
.map(name => poolByName.get(name))
|
|
102
|
+
.filter((t) => !!t);
|
|
103
|
+
};
|
|
104
|
+
const rebuildTools = () => [...base, loadToolsInstance, ...inherited, ...resolveOwnLoaded()];
|
|
105
|
+
return { tools: rebuildTools(), rebuildTools };
|
|
106
|
+
}
|
|
107
|
+
//# sourceMappingURL=subagentTools.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"subagentTools.js","sourceRoot":"","sources":["../../../src/tools/base/subagentTools.ts"],"names":[],"mappings":"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"}
|