@markusylisiurunen/tau 0.3.28 → 0.3.29
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/README.md +10 -8
- package/dist/core/config/runtime.js +5 -1
- package/dist/core/config/runtime.js.map +1 -1
- package/dist/core/config/runtime_config_snapshot.js +5 -1
- package/dist/core/config/runtime_config_snapshot.js.map +1 -1
- package/dist/core/config/schema.js.map +1 -1
- package/dist/core/diff_review/snapshot.js +3 -3
- package/dist/core/diff_review/snapshot.js.map +1 -1
- package/dist/core/index.js +0 -4
- package/dist/core/index.js.map +1 -1
- package/dist/core/runtime/runtime_bootstrap.js +5 -1
- package/dist/core/runtime/runtime_bootstrap.js.map +1 -1
- package/dist/core/session/direct_bash.js +1 -0
- package/dist/core/session/direct_bash.js.map +1 -1
- package/dist/core/session/runner.js +1 -0
- package/dist/core/session/runner.js.map +1 -1
- package/dist/core/session/session_engine.js +48 -12
- package/dist/core/session/session_engine.js.map +1 -1
- package/dist/core/subagents/control_plane.js +0 -37
- package/dist/core/subagents/control_plane.js.map +1 -1
- package/dist/core/subagents/subagent_engine.js +5 -8
- package/dist/core/subagents/subagent_engine.js.map +1 -1
- package/dist/core/telegram/adapter.js +45 -4
- package/dist/core/telegram/adapter.js.map +1 -1
- package/dist/core/telegram/config.js +0 -8
- package/dist/core/telegram/config.js.map +1 -1
- package/dist/core/telegram/session_manager.js +116 -42
- package/dist/core/telegram/session_manager.js.map +1 -1
- package/dist/core/telegram/workspace.js +18 -76
- package/dist/core/telegram/workspace.js.map +1 -1
- package/dist/core/tools/bash.js +16 -8
- package/dist/core/tools/bash.js.map +1 -1
- package/dist/core/tools/catalog.js +1 -5
- package/dist/core/tools/catalog.js.map +1 -1
- package/dist/core/tools/execution_backend.js +81 -153
- package/dist/core/tools/execution_backend.js.map +1 -1
- package/dist/core/tools/registry.js +0 -3
- package/dist/core/tools/registry.js.map +1 -1
- package/dist/core/tools/spawn_agent.js +1 -1
- package/dist/core/tools/spawn_agent.js.map +1 -1
- package/dist/core/tools/terminate_agent.js +5 -11
- package/dist/core/tools/terminate_agent.js.map +1 -1
- package/dist/core/tools/tool_names.js +0 -8
- package/dist/core/tools/tool_names.js.map +1 -1
- package/dist/core/tools/wait_for_agents.js +3 -11
- package/dist/core/tools/wait_for_agents.js.map +1 -1
- package/dist/core/utils/compact.js +53 -11
- package/dist/core/utils/compact.js.map +1 -1
- package/dist/core/utils/project_files.js +14 -1
- package/dist/core/utils/project_files.js.map +1 -1
- package/dist/core/utils/user_metadata.js +14 -0
- package/dist/core/utils/user_metadata.js.map +1 -1
- package/dist/core/version.js +1 -1
- package/dist/execution/cloudflare_sandbox_execution_environment.js +155 -112
- package/dist/execution/cloudflare_sandbox_execution_environment.js.map +1 -1
- package/dist/execution/fly_sprite_execution_environment.js +109 -91
- package/dist/execution/fly_sprite_execution_environment.js.map +1 -1
- package/dist/execution/sandbox_tool_helpers.js +0 -25
- package/dist/execution/sandbox_tool_helpers.js.map +1 -1
- package/dist/execution/tool_backend_execution_environment.js +4 -1
- package/dist/execution/tool_backend_execution_environment.js.map +1 -1
- package/dist/host/local_session_host.js +40 -7
- package/dist/host/local_session_host.js.map +1 -1
- package/dist/host/session_host.js +5 -0
- package/dist/host/session_host.js.map +1 -1
- package/dist/host/session_protocol_handler.js +55 -6
- package/dist/host/session_protocol_handler.js.map +1 -1
- package/dist/protocol/index.d.ts +2 -2
- package/dist/protocol/index.js +1 -1
- package/dist/protocol/index.js.map +1 -1
- package/dist/protocol/session_protocol.d.ts +21 -2
- package/dist/protocol/session_protocol.js +114 -28
- package/dist/protocol/session_protocol.js.map +1 -1
- package/dist/sdk/session.js +51 -2
- package/dist/sdk/session.js.map +1 -1
- package/dist/sdk/types.d.ts +5 -0
- package/dist/tui/session_chat_controller.js +5 -50
- package/dist/tui/session_chat_controller.js.map +1 -1
- package/dist/tui/session_tool_execution_backend.js +76 -98
- package/dist/tui/session_tool_execution_backend.js.map +1 -1
- package/dist/tui/ui/subagent_panel.js +0 -13
- package/dist/tui/ui/subagent_panel.js.map +1 -1
- package/package.json +1 -1
- package/dist/core/tools/emit_output.js +0 -58
- package/dist/core/tools/emit_output.js.map +0 -1
- package/dist/core/tools/grep.js +0 -250
- package/dist/core/tools/grep.js.map +0 -1
- package/dist/core/tools/list.js +0 -131
- package/dist/core/tools/list.js.map +0 -1
- package/dist/core/tools/read.js +0 -171
- package/dist/core/tools/read.js.map +0 -1
- package/dist/tui/ui/restricted_execution.js +0 -203
- package/dist/tui/ui/restricted_execution.js.map +0 -1
|
@@ -1,12 +1,27 @@
|
|
|
1
1
|
import { mkdirSync, readdirSync, readFileSync, statSync, writeFileSync } from "node:fs";
|
|
2
2
|
import { dirname, resolve } from "node:path";
|
|
3
|
+
import { SESSION_PROTOCOL_MAX_EXEC_CAPTURE_BYTES } from "../../protocol/session_protocol.js";
|
|
3
4
|
import { sanitizeEnvironment } from "../utils/sanitize_env.js";
|
|
4
5
|
import { spawnWithCapture } from "../utils/spawn_capture.js";
|
|
5
6
|
import { formatBytes } from "../utils/truncate.js";
|
|
6
|
-
const
|
|
7
|
-
const
|
|
8
|
-
const
|
|
9
|
-
const
|
|
7
|
+
export const DEFAULT_COMMAND_CAPTURE_BYTES = 1024 * 1024;
|
|
8
|
+
export const MAX_COMMAND_CAPTURE_BYTES = SESSION_PROTOCOL_MAX_EXEC_CAPTURE_BYTES;
|
|
9
|
+
const COMMAND_KILL_GRACE_MS = 2_000;
|
|
10
|
+
export const NONINTERACTIVE_GIT_ENV = {
|
|
11
|
+
GIT_TERMINAL_PROMPT: "0",
|
|
12
|
+
GIT_EDITOR: "true",
|
|
13
|
+
GIT_SEQUENCE_EDITOR: "true",
|
|
14
|
+
GIT_PAGER: "cat",
|
|
15
|
+
GIT_ASKPASS: "true",
|
|
16
|
+
GIT_SSH_COMMAND: "ssh -o BatchMode=yes",
|
|
17
|
+
};
|
|
18
|
+
export function applyCommandEnvironment(argv, env) {
|
|
19
|
+
const assignments = Object.entries(env ?? {}).flatMap(([key, value]) => value === undefined ? [] : [`${key}=${value}`]);
|
|
20
|
+
return assignments.length > 0 ? ["env", ...assignments, ...argv] : argv;
|
|
21
|
+
}
|
|
22
|
+
export function applyBashEnvironment(env) {
|
|
23
|
+
return { ...env, ...NONINTERACTIVE_GIT_ENV };
|
|
24
|
+
}
|
|
10
25
|
export function createLocalToolExecutionBackend(deps) {
|
|
11
26
|
const envProvider = deps?.env?.env ?? (() => process.env);
|
|
12
27
|
const cwdProvider = deps?.env?.cwd ?? (() => process.cwd());
|
|
@@ -17,105 +32,65 @@ export function createLocalToolExecutionBackend(deps) {
|
|
|
17
32
|
...sanitizeEnvironment(envProvider()),
|
|
18
33
|
...env,
|
|
19
34
|
});
|
|
35
|
+
const runBash = async (command, options = {}) => {
|
|
36
|
+
const effectiveTimeoutMs = typeof options.timeoutMs === "number" &&
|
|
37
|
+
Number.isFinite(options.timeoutMs) &&
|
|
38
|
+
options.timeoutMs > 0
|
|
39
|
+
? options.timeoutMs
|
|
40
|
+
: undefined;
|
|
41
|
+
const result = await spawnCapture("bash", ["-lc", command, ...(options.args ?? [])], {
|
|
42
|
+
stdio: options.stdin === undefined ? ["ignore", "pipe", "pipe"] : ["pipe", "pipe", "pipe"],
|
|
43
|
+
env: resolveEnvironment(applyBashEnvironment(options.env)),
|
|
44
|
+
detached: true,
|
|
45
|
+
killProcessGroup: true,
|
|
46
|
+
cwd: resolveCwd(options.cwd),
|
|
47
|
+
signal: options.signal,
|
|
48
|
+
timeoutMs: effectiveTimeoutMs,
|
|
49
|
+
maxCaptureBytes: options.maxCaptureBytes ?? DEFAULT_COMMAND_CAPTURE_BYTES,
|
|
50
|
+
maxCaptureMode: "ignore",
|
|
51
|
+
maxCaptureStrategy: "tail",
|
|
52
|
+
captureOutput: "combined-and-split",
|
|
53
|
+
killGraceMs: COMMAND_KILL_GRACE_MS,
|
|
54
|
+
...(options.stdin !== undefined ? { input: options.stdin } : {}),
|
|
55
|
+
});
|
|
56
|
+
let output = result.output ?? "";
|
|
57
|
+
const stdout = result.stdout;
|
|
58
|
+
let stderr = result.stderr;
|
|
59
|
+
let terminationNote;
|
|
60
|
+
if (result.timedOut && effectiveTimeoutMs !== undefined) {
|
|
61
|
+
terminationNote = `(tau) timed out after ${effectiveTimeoutMs}ms`;
|
|
62
|
+
}
|
|
63
|
+
else if (result.aborted) {
|
|
64
|
+
terminationNote = "(tau) aborted";
|
|
65
|
+
}
|
|
66
|
+
else if (result.closeSignal) {
|
|
67
|
+
terminationNote = `(tau) terminated by signal ${result.closeSignal}`;
|
|
68
|
+
}
|
|
69
|
+
const note = terminationNote?.trim();
|
|
70
|
+
if (note && !output.includes(note)) {
|
|
71
|
+
const noteText = `${output && !output.endsWith("\n") ? "\n" : ""}${note}\n`;
|
|
72
|
+
output += noteText;
|
|
73
|
+
stderr += noteText;
|
|
74
|
+
}
|
|
75
|
+
return {
|
|
76
|
+
output,
|
|
77
|
+
stdout,
|
|
78
|
+
stderr,
|
|
79
|
+
exitCode: result.exitCode,
|
|
80
|
+
truncated: result.captureLimitExceeded,
|
|
81
|
+
timedOut: result.timedOut,
|
|
82
|
+
aborted: result.aborted,
|
|
83
|
+
closeSignal: result.closeSignal,
|
|
84
|
+
};
|
|
85
|
+
};
|
|
86
|
+
const runNodeScript = (script, args = [], options = {}) => runBash('exec "$0" "$@"', {
|
|
87
|
+
...options,
|
|
88
|
+
args: ["node", "-e", script, ...args],
|
|
89
|
+
});
|
|
20
90
|
return {
|
|
21
91
|
async dispose() { },
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
const signal = options.signal;
|
|
25
|
-
const cwd = resolveCwd(options.cwd);
|
|
26
|
-
const effectiveTimeoutMs = typeof timeoutMs === "number" && Number.isFinite(timeoutMs) && timeoutMs > 0
|
|
27
|
-
? timeoutMs
|
|
28
|
-
: undefined;
|
|
29
|
-
const result = await spawnCapture(command, [], {
|
|
30
|
-
shell: true,
|
|
31
|
-
stdio: ["ignore", "pipe", "pipe"],
|
|
32
|
-
env: {
|
|
33
|
-
...resolveEnvironment(options.env),
|
|
34
|
-
GIT_TERMINAL_PROMPT: "0",
|
|
35
|
-
GIT_EDITOR: "true",
|
|
36
|
-
GIT_SEQUENCE_EDITOR: "true",
|
|
37
|
-
GIT_PAGER: "cat",
|
|
38
|
-
GIT_ASKPASS: "true",
|
|
39
|
-
GIT_SSH_COMMAND: "ssh -o BatchMode=yes",
|
|
40
|
-
},
|
|
41
|
-
detached: true,
|
|
42
|
-
killProcessGroup: true,
|
|
43
|
-
cwd,
|
|
44
|
-
signal,
|
|
45
|
-
timeoutMs: effectiveTimeoutMs,
|
|
46
|
-
maxCaptureBytes: BASH_MAX_CAPTURE_BYTES,
|
|
47
|
-
maxCaptureMode: "ignore",
|
|
48
|
-
maxCaptureStrategy: "tail",
|
|
49
|
-
captureOutput: "combined-and-split",
|
|
50
|
-
killGraceMs: BASH_KILL_GRACE_MS,
|
|
51
|
-
});
|
|
52
|
-
let output = result.output ?? "";
|
|
53
|
-
const stdout = result.stdout;
|
|
54
|
-
let stderr = result.stderr;
|
|
55
|
-
const truncated = result.captureLimitExceeded;
|
|
56
|
-
let terminationNote;
|
|
57
|
-
if (result.timedOut && effectiveTimeoutMs !== undefined) {
|
|
58
|
-
terminationNote = `(tau) timed out after ${effectiveTimeoutMs}ms`;
|
|
59
|
-
}
|
|
60
|
-
else if (result.aborted) {
|
|
61
|
-
terminationNote = "(tau) aborted";
|
|
62
|
-
}
|
|
63
|
-
else if (result.closeSignal) {
|
|
64
|
-
terminationNote = `(tau) terminated by signal ${result.closeSignal}`;
|
|
65
|
-
}
|
|
66
|
-
const note = terminationNote?.trim();
|
|
67
|
-
if (note && !output.includes(note)) {
|
|
68
|
-
const noteText = `${output && !output.endsWith("\n") ? "\n" : ""}${note}\n`;
|
|
69
|
-
output += noteText;
|
|
70
|
-
stderr += noteText;
|
|
71
|
-
}
|
|
72
|
-
return { output, stdout, stderr, exitCode: result.exitCode, truncated };
|
|
73
|
-
},
|
|
74
|
-
async runNodeScript(script, args = [], options = {}) {
|
|
75
|
-
const timeoutMs = options.timeoutMs;
|
|
76
|
-
const signal = options.signal;
|
|
77
|
-
const cwd = resolveCwd(options.cwd);
|
|
78
|
-
const effectiveTimeoutMs = typeof timeoutMs === "number" && Number.isFinite(timeoutMs) && timeoutMs > 0
|
|
79
|
-
? timeoutMs
|
|
80
|
-
: undefined;
|
|
81
|
-
const result = await spawnCapture("node", ["-e", script, ...args], {
|
|
82
|
-
stdio: ["ignore", "pipe", "pipe"],
|
|
83
|
-
env: resolveEnvironment(options.env),
|
|
84
|
-
detached: true,
|
|
85
|
-
killProcessGroup: true,
|
|
86
|
-
cwd,
|
|
87
|
-
signal,
|
|
88
|
-
timeoutMs: effectiveTimeoutMs,
|
|
89
|
-
maxCaptureBytes: options.maxCaptureBytes === null
|
|
90
|
-
? undefined
|
|
91
|
-
: (options.maxCaptureBytes ?? BASH_MAX_CAPTURE_BYTES),
|
|
92
|
-
maxCaptureMode: "ignore",
|
|
93
|
-
maxCaptureStrategy: "tail",
|
|
94
|
-
captureOutput: "combined-and-split",
|
|
95
|
-
killGraceMs: BASH_KILL_GRACE_MS,
|
|
96
|
-
});
|
|
97
|
-
let output = result.output ?? "";
|
|
98
|
-
const stdout = result.stdout;
|
|
99
|
-
let stderr = result.stderr;
|
|
100
|
-
const truncated = result.captureLimitExceeded;
|
|
101
|
-
let terminationNote;
|
|
102
|
-
if (result.timedOut && effectiveTimeoutMs !== undefined) {
|
|
103
|
-
terminationNote = `(tau) timed out after ${effectiveTimeoutMs}ms`;
|
|
104
|
-
}
|
|
105
|
-
else if (result.aborted) {
|
|
106
|
-
terminationNote = "(tau) aborted";
|
|
107
|
-
}
|
|
108
|
-
else if (result.closeSignal) {
|
|
109
|
-
terminationNote = `(tau) terminated by signal ${result.closeSignal}`;
|
|
110
|
-
}
|
|
111
|
-
const note = terminationNote?.trim();
|
|
112
|
-
if (note && !output.includes(note)) {
|
|
113
|
-
const noteText = `${output && !output.endsWith("\n") ? "\n" : ""}${note}\n`;
|
|
114
|
-
output += noteText;
|
|
115
|
-
stderr += noteText;
|
|
116
|
-
}
|
|
117
|
-
return { output, stdout, stderr, exitCode: result.exitCode, truncated };
|
|
118
|
-
},
|
|
92
|
+
runBash,
|
|
93
|
+
runNodeScript,
|
|
119
94
|
async readFile(path) {
|
|
120
95
|
const resolvedPath = resolvePath(path);
|
|
121
96
|
const content = readFileSync(resolvedPath, "utf-8");
|
|
@@ -165,58 +140,17 @@ export function createLocalToolExecutionBackend(deps) {
|
|
|
165
140
|
}));
|
|
166
141
|
return { path: resolvedPath, entries };
|
|
167
142
|
},
|
|
168
|
-
async grep(options) {
|
|
169
|
-
const { baseArgs, pattern, paths, signal, timeoutMs, dryRun } = options;
|
|
170
|
-
const resolvedPaths = paths.map((path) => {
|
|
171
|
-
const cleaned = path.trim();
|
|
172
|
-
if (!cleaned) {
|
|
173
|
-
throw new Error("invalid grep path: empty path.");
|
|
174
|
-
}
|
|
175
|
-
return cleaned;
|
|
176
|
-
});
|
|
177
|
-
const fullArgs = [...baseArgs, "--", pattern, ...resolvedPaths];
|
|
178
|
-
if (dryRun) {
|
|
179
|
-
return {
|
|
180
|
-
output: "",
|
|
181
|
-
exitCode: 0,
|
|
182
|
-
captureTruncated: false,
|
|
183
|
-
resolvedPaths,
|
|
184
|
-
};
|
|
185
|
-
}
|
|
186
|
-
try {
|
|
187
|
-
const result = await spawnCapture("rg", fullArgs, {
|
|
188
|
-
cwd: cwdProvider(),
|
|
189
|
-
windowsHide: true,
|
|
190
|
-
signal,
|
|
191
|
-
timeoutMs,
|
|
192
|
-
maxCaptureBytes: GREP_MAX_CAPTURE_BYTES,
|
|
193
|
-
maxCaptureMode: "ignore",
|
|
194
|
-
captureOutput: "combined",
|
|
195
|
-
killGraceMs: GREP_KILL_GRACE_MS,
|
|
196
|
-
});
|
|
197
|
-
return {
|
|
198
|
-
output: result.output ?? "",
|
|
199
|
-
exitCode: result.exitCode,
|
|
200
|
-
captureTruncated: result.captureLimitExceeded || result.timedOut,
|
|
201
|
-
resolvedPaths,
|
|
202
|
-
};
|
|
203
|
-
}
|
|
204
|
-
catch (err) {
|
|
205
|
-
return {
|
|
206
|
-
output: err instanceof Error ? err.message : String(err),
|
|
207
|
-
exitCode: 2,
|
|
208
|
-
captureTruncated: false,
|
|
209
|
-
resolvedPaths,
|
|
210
|
-
};
|
|
211
|
-
}
|
|
212
|
-
},
|
|
213
143
|
};
|
|
214
144
|
}
|
|
215
145
|
export function scopeToolExecutionBackend(backend, workingDirectory, env) {
|
|
216
146
|
const resolvePath = (path) => resolve(workingDirectory, path);
|
|
217
147
|
const resolveCwd = (cwd) => cwd ? resolve(workingDirectory, cwd) : workingDirectory;
|
|
218
148
|
const mergeEnvironment = (overrides) => {
|
|
219
|
-
const merged = {
|
|
149
|
+
const merged = {
|
|
150
|
+
...env,
|
|
151
|
+
...overrides,
|
|
152
|
+
...(env?.HOME !== undefined ? { HOME: env.HOME } : {}),
|
|
153
|
+
};
|
|
220
154
|
return Object.keys(merged).length > 0 ? { env: merged } : {};
|
|
221
155
|
};
|
|
222
156
|
return {
|
|
@@ -252,12 +186,6 @@ export function scopeToolExecutionBackend(backend, workingDirectory, env) {
|
|
|
252
186
|
listDir(path) {
|
|
253
187
|
return backend.listDir(resolvePath(path));
|
|
254
188
|
},
|
|
255
|
-
grep(options) {
|
|
256
|
-
return backend.grep({
|
|
257
|
-
...options,
|
|
258
|
-
paths: options.paths.map((path) => resolvePath(path)),
|
|
259
|
-
});
|
|
260
|
-
},
|
|
261
189
|
};
|
|
262
190
|
}
|
|
263
191
|
//# sourceMappingURL=execution_backend.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution_backend.js","sourceRoot":"","sources":["../../../src/core/tools/execution_backend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxF,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"execution_backend.js","sourceRoot":"","sources":["../../../src/core/tools/execution_backend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxF,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,uCAAuC,EAAE,MAAM,oCAAoC,CAAC;AAE7F,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,MAAM,CAAC,MAAM,6BAA6B,GAAG,IAAI,GAAG,IAAI,CAAC;AACzD,MAAM,CAAC,MAAM,yBAAyB,GAAG,uCAAuC,CAAC;AAEjF,MAAM,qBAAqB,GAAG,KAAK,CAAC;AAwDpC,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC,mBAAmB,EAAE,GAAG;IACxB,UAAU,EAAE,MAAM;IAClB,mBAAmB,EAAE,MAAM;IAC3B,SAAS,EAAE,KAAK;IAChB,WAAW,EAAE,MAAM;IACnB,eAAe,EAAE,sBAAsB;CAC/B,CAAC;AAEX,MAAM,UAAU,uBAAuB,CACrC,IAAc,EACd,GAAmD;IAEnD,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CACrE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC,CAC/C,CAAC;IACF,OAAO,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,GAAG,WAAW,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAC1E,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,GAAuC;IAEvC,OAAO,EAAE,GAAG,GAAG,EAAE,GAAG,sBAAsB,EAAE,CAAC;AAC/C,CAAC;AAmBD,MAAM,UAAU,+BAA+B,CAC7C,IAAgC;IAEhC,MAAM,WAAW,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1D,MAAM,WAAW,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5D,MAAM,YAAY,GAAG,IAAI,EAAE,KAAK,IAAI,gBAAgB,CAAC;IACrD,MAAM,WAAW,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,IAAI,CAAC,CAAC;IAC3E,MAAM,UAAU,GAAG,CAAC,GAAY,EAAU,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IACjG,MAAM,kBAAkB,GAAG,CAAC,GAA4B,EAAqB,EAAE,CAAC,CAAC;QAC/E,GAAG,mBAAmB,CAAC,WAAW,EAAE,CAAC;QACrC,GAAG,GAAG;KACP,CAAC,CAAC;IAEH,MAAM,OAAO,GAAoC,KAAK,EAAE,OAAO,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE;QAC/E,MAAM,kBAAkB,GACtB,OAAO,OAAO,CAAC,SAAS,KAAK,QAAQ;YACrC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC;YAClC,OAAO,CAAC,SAAS,GAAG,CAAC;YACnB,CAAC,CAAC,OAAO,CAAC,SAAS;YACnB,CAAC,CAAC,SAAS,CAAC;QAChB,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,EAAE;YACnF,KAAK,EAAE,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;YAC1F,GAAG,EAAE,kBAAkB,CAAC,oBAAoB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC1D,QAAQ,EAAE,IAAI;YACd,gBAAgB,EAAE,IAAI;YACtB,GAAG,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC;YAC5B,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,SAAS,EAAE,kBAAkB;YAC7B,eAAe,EAAE,OAAO,CAAC,eAAe,IAAI,6BAA6B;YACzE,cAAc,EAAE,QAAQ;YACxB,kBAAkB,EAAE,MAAM;YAC1B,aAAa,EAAE,oBAAoB;YACnC,WAAW,EAAE,qBAAqB;YAClC,GAAG,CAAC,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACjE,CAAC,CAAC;QAEH,IAAI,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;QACjC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,IAAI,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC3B,IAAI,eAAmC,CAAC;QACxC,IAAI,MAAM,CAAC,QAAQ,IAAI,kBAAkB,KAAK,SAAS,EAAE,CAAC;YACxD,eAAe,GAAG,yBAAyB,kBAAkB,IAAI,CAAC;QACpE,CAAC;aAAM,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YAC1B,eAAe,GAAG,eAAe,CAAC;QACpC,CAAC;aAAM,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YAC9B,eAAe,GAAG,8BAA8B,MAAM,CAAC,WAAW,EAAE,CAAC;QACvE,CAAC;QAED,MAAM,IAAI,GAAG,eAAe,EAAE,IAAI,EAAE,CAAC;QACrC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACnC,MAAM,QAAQ,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,IAAI,CAAC;YAC5E,MAAM,IAAI,QAAQ,CAAC;YACnB,MAAM,IAAI,QAAQ,CAAC;QACrB,CAAC;QAED,OAAO;YACL,MAAM;YACN,MAAM;YACN,MAAM;YACN,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,SAAS,EAAE,MAAM,CAAC,oBAAoB;YACtC,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,WAAW,EAAE,MAAM,CAAC,WAAW;SAChC,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,aAAa,GAA0C,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE,CAC/F,OAAO,CAAC,gBAAgB,EAAE;QACxB,GAAG,OAAO;QACV,IAAI,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;KACtC,CAAC,CAAC;IAEL,OAAO;QACL,KAAK,CAAC,OAAO,KAAI,CAAC;QAElB,OAAO;QACP,aAAa;QAEb,KAAK,CAAC,QAAQ,CAAC,IAAI;YACjB,MAAM,YAAY,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,OAAO,GAAG,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;YACpD,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC;QACzC,CAAC;QAED,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,GAAG,EAAE;YACrC,MAAM,YAAY,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,KAAK,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;YACrC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;gBACpB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;YACzC,CAAC;YACD,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC;YACzB,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;YAClC,IAAI,QAAQ,KAAK,SAAS,IAAI,KAAK,GAAG,QAAQ,EAAE,CAAC;gBAC/C,MAAM,IAAI,KAAK,CACb,gCAAgC,WAAW,CAAC,QAAQ,CAAC,SAAS,WAAW,CAAC,KAAK,CAAC,IAAI,CACrF,CAAC;YACJ,CAAC;YACD,MAAM,OAAO,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;YAC3C,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAChD,CAAC;QAED,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO;YAC3B,MAAM,YAAY,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;YAClC,IAAI,GAAG,IAAI,GAAG,KAAK,GAAG,EAAE,CAAC;gBACvB,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACtC,CAAC;YAED,aAAa,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YAE9C,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAClD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;YACzC,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;QAC9C,CAAC;QAED,KAAK,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO;YACjC,MAAM,YAAY,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;YAClC,IAAI,GAAG,IAAI,GAAG,KAAK,GAAG,EAAE,CAAC;gBACvB,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACtC,CAAC;YACD,aAAa,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;YACrC,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC;QAC3D,CAAC;QAED,KAAK,CAAC,OAAO,CAAC,IAAI;YAChB,MAAM,YAAY,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,OAAO,GAAG,WAAW,CAAC,YAAY,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;YACnE,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAClC,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,WAAW,EAAE,CAAC,CAAC,WAAW,EAAE;gBAC5B,SAAS,EAAE,CAAC,CAAC,cAAc,EAAE;aAC9B,CAAC,CAAC,CAAC;YACJ,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC;QACzC,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,OAA6B,EAC7B,gBAAwB,EACxB,GAA4B;IAE5B,MAAM,WAAW,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,OAAO,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;IAC9E,MAAM,UAAU,GAAG,CAAC,GAAY,EAAU,EAAE,CAC1C,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC;IAC1D,MAAM,gBAAgB,GAAG,CACvB,SAAkC,EACA,EAAE;QACpC,MAAM,MAAM,GAAG;YACb,GAAG,GAAG;YACN,GAAG,SAAS;YACZ,GAAG,CAAC,GAAG,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACvD,CAAC;QACF,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/D,CAAC,CAAC;IAEF,OAAO;QACL,OAAO;YACL,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC;QACD,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,EAAE;YAC3B,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE;gBAC9B,GAAG,OAAO;gBACV,GAAG,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC;gBAC5B,GAAG,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC;aACjC,CAAC,CAAC;QACL,CAAC;QACD,aAAa,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE;YAC3C,OAAO,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE;gBACzC,GAAG,OAAO;gBACV,GAAG,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC;gBAC5B,GAAG,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC;aACjC,CAAC,CAAC;QACL,CAAC;QACD,QAAQ,CAAC,IAAI;YACX,OAAO,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7C,CAAC;QACD,cAAc,CAAC,IAAI,EAAE,OAAO;YAC1B,OAAO,OAAO,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;QAC5D,CAAC;QACD,SAAS,CAAC,IAAI,EAAE,OAAO;YACrB,OAAO,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;QACvD,CAAC;QACD,eAAe,CAAC,IAAI,EAAE,OAAO;YAC3B,OAAO,OAAO,CAAC,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;QAC7D,CAAC;QACD,OAAO,CAAC,IAAI;YACV,OAAO,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5C,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -7,9 +7,6 @@ export function createToolDispatch(run, startedUiEvent) {
|
|
|
7
7
|
export function isMainToolDispatchContext(context) {
|
|
8
8
|
return context.scope === "main";
|
|
9
9
|
}
|
|
10
|
-
export function isSubagentToolDispatchContext(context) {
|
|
11
|
-
return context.scope === "subagent";
|
|
12
|
-
}
|
|
13
10
|
export class ToolRegistry {
|
|
14
11
|
byName = new Map();
|
|
15
12
|
constructor(definitions) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/core/tools/registry.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/core/tools/registry.ts"],"names":[],"mappings":"AA4OA,MAAM,UAAU,kBAAkB,CAChC,GAAkF,EAClF,cAA4B;IAE5B,OAAO;QACL,cAAc;QACd,GAAG,EAAE,OAAO,GAAG,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC;KACpF,CAAC;AACJ,CAAC;AAuCD,MAAM,UAAU,yBAAyB,CACvC,OAA4B;IAE5B,OAAO,OAAO,CAAC,KAAK,KAAK,MAAM,CAAC;AAClC,CAAC;AAYD,MAAM,OAAO,YAAY;IACN,MAAM,GAAG,IAAI,GAAG,EAA0B,CAAC;IAE5D,YAAY,WAA6B;QACvC,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAED,IAAI,OAAO;QACT,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACxD,CAAC;IAED,GAAG,CAAC,QAAgB;QAClB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;IAED,qBAAqB,CAAC,YAAyB;QAC7C,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC,OAAO,CAAC;QACtB,CAAC;QAED,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YACnC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC7C,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,SAAS,QAAQ,qBAAqB,CAAC,CAAC;YAC1D,CAAC;YACD,OAAO,UAAU,CAAC,MAAM,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
|
|
@@ -11,7 +11,7 @@ import { buildSubagentUiText } from "./subagent_ui.js";
|
|
|
11
11
|
import { TOOL_NAME_SPAWN_AGENT } from "./tool_names.js";
|
|
12
12
|
const SPAWN_AGENT_DESCRIPTION = [
|
|
13
13
|
"Spawn a subagent to run in the background and return its id.",
|
|
14
|
-
"Use wait_for_agents to collect
|
|
14
|
+
"Use wait_for_agents to collect its final response once it finishes.",
|
|
15
15
|
"See your system instructions for available subagents and their capabilities.",
|
|
16
16
|
].join(" ");
|
|
17
17
|
const SPAWN_AGENT_NAME_DESCRIPTION = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawn_agent.js","sourceRoot":"","sources":["../../../src/core/tools/spawn_agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,gCAAgC,EAAE,MAAM,0BAA0B,CAAC;AAEpG,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EACL,kBAAkB,EAClB,yBAAyB,GAM1B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExD,MAAM,uBAAuB,GAAG;IAC9B,8DAA8D;IAC9D,
|
|
1
|
+
{"version":3,"file":"spawn_agent.js","sourceRoot":"","sources":["../../../src/core/tools/spawn_agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,8 @@ import { createToolDispatch, isMainToolDispatchContext, } from "./registry.js";
|
|
|
6
6
|
import { buildSubagentUiText, formatSubagentStatusLine } from "./subagent_ui.js";
|
|
7
7
|
import { TOOL_NAME_TERMINATE_AGENT } from "./tool_names.js";
|
|
8
8
|
const TERMINATE_AGENT_DESCRIPTION = [
|
|
9
|
-
"Terminate a running subagent and return its final status.",
|
|
10
|
-
"If the subagent already finished, this returns its latest
|
|
9
|
+
"Terminate a running subagent and return its final status and response.",
|
|
10
|
+
"If the subagent already finished, this returns its latest result.",
|
|
11
11
|
].join(" ");
|
|
12
12
|
const TERMINATE_AGENT_ID_DESCRIPTION = "Subagent id to terminate.";
|
|
13
13
|
export const TERMINATE_AGENT_TOOL = {
|
|
@@ -26,20 +26,14 @@ function formatTerminateResult(result) {
|
|
|
26
26
|
name: result.name,
|
|
27
27
|
title: result.title,
|
|
28
28
|
status: result.status,
|
|
29
|
-
|
|
29
|
+
finalText: result.finalText,
|
|
30
30
|
error: result.error,
|
|
31
31
|
};
|
|
32
32
|
return JSON.stringify(payload, null, 2);
|
|
33
33
|
}
|
|
34
34
|
function formatTerminateOutput(result) {
|
|
35
|
-
const
|
|
36
|
-
|
|
37
|
-
.filter((text) => text.trim().length > 0);
|
|
38
|
-
let body = cleanedOutputs.join("\n\n");
|
|
39
|
-
if (!body) {
|
|
40
|
-
const finalText = result.finalText?.trimEnd() ?? "";
|
|
41
|
-
body = finalText.trim().length > 0 ? finalText : "";
|
|
42
|
-
}
|
|
35
|
+
const finalText = result.finalText?.trimEnd() ?? "";
|
|
36
|
+
const body = finalText.trim().length > 0 ? finalText : "";
|
|
43
37
|
if (result.status !== "success") {
|
|
44
38
|
const errorLine = result.error ? `Error: ${result.error}` : `Status: ${result.status}`;
|
|
45
39
|
return body ? `${errorLine}\n${body}` : errorLine;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminate_agent.js","sourceRoot":"","sources":["../../../src/core/tools/terminate_agent.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EACL,kBAAkB,EAClB,yBAAyB,GAM1B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AACjF,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAE5D,MAAM,2BAA2B,GAAG;IAClC,
|
|
1
|
+
{"version":3,"file":"terminate_agent.js","sourceRoot":"","sources":["../../../src/core/tools/terminate_agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,12 +7,8 @@ export const TOOL_NAME_SPAWN_AGENT = "spawn_agent";
|
|
|
7
7
|
export const TOOL_NAME_SEND_INPUT_TO_AGENT = "send_input_to_agent";
|
|
8
8
|
export const TOOL_NAME_WAIT_FOR_AGENTS = "wait_for_agents";
|
|
9
9
|
export const TOOL_NAME_TERMINATE_AGENT = "terminate_agent";
|
|
10
|
-
export const TOOL_NAME_EMIT_OUTPUT = "emit_output";
|
|
11
10
|
export const TOOL_NAME_WEB_SEARCH = "web_search";
|
|
12
11
|
export const TOOL_NAME_WEB_FETCH = "web_fetch";
|
|
13
|
-
export const TOOL_NAME_READ = "read";
|
|
14
|
-
export const TOOL_NAME_LIST = "list";
|
|
15
|
-
export const TOOL_NAME_GREP = "grep";
|
|
16
12
|
export const TOOL_NAME_NOOK = "nook";
|
|
17
13
|
export const TOOL_NAMES = [
|
|
18
14
|
TOOL_NAME_BASH,
|
|
@@ -23,12 +19,8 @@ export const TOOL_NAMES = [
|
|
|
23
19
|
TOOL_NAME_SEND_INPUT_TO_AGENT,
|
|
24
20
|
TOOL_NAME_WAIT_FOR_AGENTS,
|
|
25
21
|
TOOL_NAME_TERMINATE_AGENT,
|
|
26
|
-
TOOL_NAME_EMIT_OUTPUT,
|
|
27
22
|
TOOL_NAME_WEB_SEARCH,
|
|
28
23
|
TOOL_NAME_WEB_FETCH,
|
|
29
|
-
TOOL_NAME_READ,
|
|
30
|
-
TOOL_NAME_LIST,
|
|
31
|
-
TOOL_NAME_GREP,
|
|
32
24
|
TOOL_NAME_NOOK,
|
|
33
25
|
];
|
|
34
26
|
//# sourceMappingURL=tool_names.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool_names.js","sourceRoot":"","sources":["../../../src/core/tools/tool_names.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC;AACrC,MAAM,CAAC,MAAM,eAAe,GAAG,OAAO,CAAC;AACvC,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC;AACrC,MAAM,CAAC,MAAM,oBAAoB,GAAG,YAAY,CAAC;AACjD,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,CAAC;AACnD,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,CAAC;AACnD,MAAM,CAAC,MAAM,6BAA6B,GAAG,qBAAqB,CAAC;AACnE,MAAM,CAAC,MAAM,yBAAyB,GAAG,iBAAiB,CAAC;AAC3D,MAAM,CAAC,MAAM,yBAAyB,GAAG,iBAAiB,CAAC;AAC3D,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"tool_names.js","sourceRoot":"","sources":["../../../src/core/tools/tool_names.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC;AACrC,MAAM,CAAC,MAAM,eAAe,GAAG,OAAO,CAAC;AACvC,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC;AACrC,MAAM,CAAC,MAAM,oBAAoB,GAAG,YAAY,CAAC;AACjD,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,CAAC;AACnD,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,CAAC;AACnD,MAAM,CAAC,MAAM,6BAA6B,GAAG,qBAAqB,CAAC;AACnE,MAAM,CAAC,MAAM,yBAAyB,GAAG,iBAAiB,CAAC;AAC3D,MAAM,CAAC,MAAM,yBAAyB,GAAG,iBAAiB,CAAC;AAC3D,MAAM,CAAC,MAAM,oBAAoB,GAAG,YAAY,CAAC;AACjD,MAAM,CAAC,MAAM,mBAAmB,GAAG,WAAW,CAAC;AAC/C,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC;AAErC,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,cAAc;IACd,eAAe;IACf,cAAc;IACd,oBAAoB;IACpB,qBAAqB;IACrB,6BAA6B;IAC7B,yBAAyB;IACzB,yBAAyB;IACzB,oBAAoB;IACpB,mBAAmB;IACnB,cAAc;CACN,CAAC"}
|
|
@@ -7,7 +7,7 @@ import { createToolDispatch, isMainToolDispatchContext, } from "./registry.js";
|
|
|
7
7
|
import { buildSubagentUiText, formatSubagentStatusLine } from "./subagent_ui.js";
|
|
8
8
|
import { TOOL_NAME_WAIT_FOR_AGENTS } from "./tool_names.js";
|
|
9
9
|
const WAIT_FOR_AGENTS_DESCRIPTION = [
|
|
10
|
-
"Wait for one or more subagents and return as soon as at least one requested subagent finishes.",
|
|
10
|
+
"Wait for one or more subagents and return final responses as soon as at least one requested subagent finishes.",
|
|
11
11
|
"Provide the list of subagent ids returned by spawn_agent.",
|
|
12
12
|
].join(" ");
|
|
13
13
|
const WAIT_FOR_AGENTS_IDS_DESCRIPTION = "List of subagent ids to wait for.";
|
|
@@ -25,20 +25,12 @@ const waitArgsSchema = z.object({
|
|
|
25
25
|
ids: z.array(z.string().trim().min(1)).min(1),
|
|
26
26
|
});
|
|
27
27
|
function buildSubagentBody(result) {
|
|
28
|
-
const outputs = result.outputs
|
|
29
|
-
.map((text) => text.trimEnd())
|
|
30
|
-
.filter((text) => text.trim().length > 0);
|
|
31
|
-
const finalText = result.finalText?.trimEnd() ?? "";
|
|
32
|
-
const trimmedFinal = finalText.trim();
|
|
33
|
-
if (trimmedFinal && !outputs.some((text) => text.trim() === trimmedFinal)) {
|
|
34
|
-
outputs.push(finalText);
|
|
35
|
-
}
|
|
36
28
|
const errorLine = result.status !== "success"
|
|
37
29
|
? result.error
|
|
38
30
|
? `Error: ${result.error}`
|
|
39
31
|
: `Status: ${result.status}`
|
|
40
32
|
: undefined;
|
|
41
|
-
const bodyParts = [errorLine,
|
|
33
|
+
const bodyParts = [errorLine, result.finalText?.trimEnd()].filter((text) => text?.trim().length);
|
|
42
34
|
return bodyParts.join("\n");
|
|
43
35
|
}
|
|
44
36
|
function formatSubagentOutputLines(result) {
|
|
@@ -66,7 +58,7 @@ function formatWaitOutput(results, requestedIds, maxTokensPerSubagent) {
|
|
|
66
58
|
const runningIds = requestedIds.filter((id) => !finishedIdSet.has(id));
|
|
67
59
|
if (runningIds.length > 0) {
|
|
68
60
|
output.push(`Finished: ${finishedIds.join(", ")}. Still running: ${runningIds.join(", ")}. ` +
|
|
69
|
-
"Call wait_for_agents again with the still-running ids to collect their
|
|
61
|
+
"Call wait_for_agents again with the still-running ids to collect their final responses.");
|
|
70
62
|
output.push("");
|
|
71
63
|
}
|
|
72
64
|
results.forEach((result, index) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wait_for_agents.js","sourceRoot":"","sources":["../../../src/core/tools/wait_for_agents.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EACL,kBAAkB,EAClB,yBAAyB,GAM1B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AACjF,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAE5D,MAAM,2BAA2B,GAAG;IAClC,
|
|
1
|
+
{"version":3,"file":"wait_for_agents.js","sourceRoot":"","sources":["../../../src/core/tools/wait_for_agents.ts"],"names":[],"mappings":"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"}
|