@markusylisiurunen/tau 0.2.61 → 0.2.63
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 +8 -6
- package/dist/core/async/cli.js +10 -6
- package/dist/core/async/cli.js.map +1 -1
- package/dist/core/async/cron.js +9 -9
- package/dist/core/async/cron.js.map +1 -1
- package/dist/core/async/daemon_runtime.js +4 -10
- package/dist/core/async/daemon_runtime.js.map +1 -1
- package/dist/core/async/http_server.js +56 -13
- package/dist/core/async/http_server.js.map +1 -1
- package/dist/core/async/server_config.js +34 -46
- package/dist/core/async/server_config.js.map +1 -1
- package/dist/core/async/session_manager.js +9 -5
- package/dist/core/async/session_manager.js.map +1 -1
- package/dist/core/async/telegram.js +56 -14
- package/dist/core/async/telegram.js.map +1 -1
- package/dist/core/auth/auth_storage.js +51 -14
- package/dist/core/auth/auth_storage.js.map +1 -1
- package/dist/core/cli.js +27 -43
- package/dist/core/cli.js.map +1 -1
- package/dist/core/config/content_loader.js +100 -121
- package/dist/core/config/content_loader.js.map +1 -1
- package/dist/core/config/runtime.js +9 -11
- package/dist/core/config/runtime.js.map +1 -1
- package/dist/core/config/schema.js +43 -18
- package/dist/core/config/schema.js.map +1 -1
- package/dist/core/config/theme_variants.js +1 -1
- package/dist/core/config/theme_variants.js.map +1 -1
- package/dist/core/events/types.js.map +1 -1
- package/dist/core/install/cli.js +2 -2
- package/dist/core/install/cli.js.map +1 -1
- package/dist/core/modes/rpc_adapter.js +3 -3
- package/dist/core/modes/rpc_adapter.js.map +1 -1
- package/dist/core/modes/rpc_protocol.js +32 -17
- package/dist/core/modes/rpc_protocol.js.map +1 -1
- package/dist/core/modes/rpc_server.js +29 -12
- package/dist/core/modes/rpc_server.js.map +1 -1
- package/dist/core/persona_reference.js +27 -0
- package/dist/core/persona_reference.js.map +1 -0
- package/dist/core/personas.js +7 -1
- package/dist/core/personas.js.map +1 -1
- package/dist/core/runtime/chat_runtime.js +2 -2
- package/dist/core/runtime/chat_runtime.js.map +1 -1
- package/dist/core/runtime/conversation_turn_runtime.js +2 -3
- package/dist/core/runtime/conversation_turn_runtime.js.map +1 -1
- package/dist/core/runtime/runtime_bootstrap.js +14 -4
- package/dist/core/runtime/runtime_bootstrap.js.map +1 -1
- package/dist/core/runtime/session_prompt_composer.js +1 -7
- package/dist/core/runtime/session_prompt_composer.js.map +1 -1
- package/dist/core/session/core_session.js +2 -2
- package/dist/core/session/core_session.js.map +1 -1
- package/dist/core/session/session_engine.js +68 -16
- package/dist/core/session/session_engine.js.map +1 -1
- package/dist/core/subagents/control_plane.js +12 -2
- package/dist/core/subagents/control_plane.js.map +1 -1
- package/dist/core/subagents/launch_model.js +4 -5
- package/dist/core/subagents/launch_model.js.map +1 -1
- package/dist/core/subagents/registry.js +13 -12
- package/dist/core/subagents/registry.js.map +1 -1
- package/dist/core/subagents/subagent_engine.js +2 -1
- package/dist/core/subagents/subagent_engine.js.map +1 -1
- package/dist/core/tools/bash.js +35 -43
- package/dist/core/tools/bash.js.map +1 -1
- package/dist/core/tools/edit.js +16 -13
- package/dist/core/tools/edit.js.map +1 -1
- package/dist/core/tools/emit_output.js +14 -6
- package/dist/core/tools/emit_output.js.map +1 -1
- package/dist/core/tools/execution_backend.js +14 -4
- package/dist/core/tools/execution_backend.js.map +1 -1
- package/dist/core/tools/grep.js +15 -9
- package/dist/core/tools/grep.js.map +1 -1
- package/dist/core/tools/list.js +15 -16
- package/dist/core/tools/list.js.map +1 -1
- package/dist/core/tools/read.js +13 -13
- package/dist/core/tools/read.js.map +1 -1
- package/dist/core/tools/registry.js.map +1 -1
- package/dist/core/tools/send_input_to_agent.js +31 -24
- package/dist/core/tools/send_input_to_agent.js.map +1 -1
- package/dist/core/tools/spawn_agent.js +43 -54
- package/dist/core/tools/spawn_agent.js.map +1 -1
- package/dist/core/tools/terminate_agent.js +29 -9
- package/dist/core/tools/terminate_agent.js.map +1 -1
- package/dist/core/tools/view_image.js +12 -7
- package/dist/core/tools/view_image.js.map +1 -1
- package/dist/core/tools/wait_for_agent.js +21 -13
- package/dist/core/tools/wait_for_agent.js.map +1 -1
- package/dist/core/tools/web_fetch.js +29 -39
- package/dist/core/tools/web_fetch.js.map +1 -1
- package/dist/core/tools/web_search.js +22 -42
- package/dist/core/tools/web_search.js.map +1 -1
- package/dist/core/tools/write.js +15 -9
- package/dist/core/tools/write.js.map +1 -1
- package/dist/core/version.js +1 -1
- package/dist/main.js +20 -6
- package/dist/main.js.map +1 -1
- package/dist/sdk/client.js +23 -1
- package/dist/sdk/client.js.map +1 -1
- package/dist/sdk/types.d.ts +3 -3
- package/dist/tui/app.js.map +1 -1
- package/dist/tui/chat_controller/interrupt_lifecycle.js +34 -0
- package/dist/tui/chat_controller/interrupt_lifecycle.js.map +1 -0
- package/dist/tui/chat_controller/queued_user_messages.js +57 -0
- package/dist/tui/chat_controller/queued_user_messages.js.map +1 -0
- package/dist/tui/chat_controller/session_maintenance_service.js +705 -0
- package/dist/tui/chat_controller/session_maintenance_service.js.map +1 -0
- package/dist/tui/chat_controller.js +145 -844
- package/dist/tui/chat_controller.js.map +1 -1
- package/dist/tui/chat_view.js +2 -0
- package/dist/tui/chat_view.js.map +1 -1
- package/dist/tui/ui/bash_execution.js +4 -4
- package/dist/tui/ui/bash_execution.js.map +1 -1
- package/dist/tui/ui/chat_message_model.js +0 -6
- package/dist/tui/ui/chat_message_model.js.map +1 -1
- package/dist/tui/ui/file_execution.js +6 -6
- package/dist/tui/ui/file_execution.js.map +1 -1
- package/dist/tui/ui/restricted_execution.js +7 -7
- package/dist/tui/ui/restricted_execution.js.map +1 -1
- package/dist/tui/ui/tool_ui_registry.js +68 -78
- package/dist/tui/ui/tool_ui_registry.js.map +1 -1
- package/package.json +1 -1
|
@@ -9,6 +9,7 @@ import { getSubagentDescription, resolveSubagentEffectiveSettings } from "../sub
|
|
|
9
9
|
import { formatCwd } from "../utils/format.js";
|
|
10
10
|
import { createToolError, createToolResult } from "../utils/messages.js";
|
|
11
11
|
import { resolveSandboxHostRoot, resolveSandboxMappedWorkingDirectory, } from "../utils/sandbox_prompt_paths.js";
|
|
12
|
+
import { formatZodError } from "../utils/zod.js";
|
|
12
13
|
import { buildSubagentUiText } from "./subagent_ui.js";
|
|
13
14
|
import { TOOL_NAME_SPAWN_AGENT } from "./tool_names.js";
|
|
14
15
|
const SPAWN_AGENT_DESCRIPTION = [
|
|
@@ -50,17 +51,18 @@ export const SPAWN_AGENT_TOOL = {
|
|
|
50
51
|
}, { additionalProperties: false }),
|
|
51
52
|
};
|
|
52
53
|
const spawnArgsSchema = z.object({
|
|
53
|
-
name: z.string().trim().
|
|
54
|
-
title: z.string().trim().
|
|
55
|
-
prompt: z.string().trim().
|
|
56
|
-
model: z.string().trim().
|
|
57
|
-
workingDirectory: z.string().trim().
|
|
54
|
+
name: z.string().trim().min(1),
|
|
55
|
+
title: z.string().trim().min(1),
|
|
56
|
+
prompt: z.string().trim().min(1),
|
|
57
|
+
model: z.string().trim().min(1).optional(),
|
|
58
|
+
workingDirectory: z.string().trim().min(1).optional(),
|
|
58
59
|
});
|
|
59
60
|
function parseSpawnArgs(raw) {
|
|
60
61
|
const parsed = spawnArgsSchema.safeParse(raw);
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
62
|
+
if (!parsed.success) {
|
|
63
|
+
return { ok: false, error: formatZodError(parsed.error) };
|
|
64
|
+
}
|
|
65
|
+
return { ok: true, data: parsed.data };
|
|
64
66
|
}
|
|
65
67
|
function formatSpawnToolResult(args) {
|
|
66
68
|
const lines = [`id: ${args.id}`, `name: ${args.name}`, `title: ${args.title}`];
|
|
@@ -114,9 +116,11 @@ async function buildSubagentSystemPrompt(args) {
|
|
|
114
116
|
export function createSpawnAgentToolDefinition(backend) {
|
|
115
117
|
return {
|
|
116
118
|
schema: SPAWN_AGENT_TOOL,
|
|
117
|
-
async dispatch(toolCall,
|
|
118
|
-
const
|
|
119
|
-
const
|
|
119
|
+
async dispatch(toolCall, riskLevel, signal, context) {
|
|
120
|
+
const parsedArgs = parseSpawnArgs(toolCall.arguments);
|
|
121
|
+
const name = parsedArgs.ok ? parsedArgs.data.name : "";
|
|
122
|
+
const title = parsedArgs.ok ? parsedArgs.data.title : "";
|
|
123
|
+
const headerTarget = title || "(invalid arguments)";
|
|
120
124
|
const blocked = (reason, details) => {
|
|
121
125
|
const toolResult = createToolError(toolCall, reason);
|
|
122
126
|
const uiEvent = {
|
|
@@ -129,51 +133,26 @@ export function createSpawnAgentToolDefinition(backend) {
|
|
|
129
133
|
};
|
|
130
134
|
return { kind: "single", toolResult, uiEvent };
|
|
131
135
|
};
|
|
132
|
-
if (!
|
|
133
|
-
|
|
134
|
-
!name ? "name" : undefined,
|
|
135
|
-
!title ? "title" : undefined,
|
|
136
|
-
!prompt ? "prompt" : undefined,
|
|
137
|
-
]
|
|
138
|
-
.filter(Boolean)
|
|
139
|
-
.join(", ");
|
|
140
|
-
return blocked(`missing required parameter(s): ${missing}.`, {
|
|
141
|
-
title: title || "(subagent)",
|
|
142
|
-
});
|
|
143
|
-
}
|
|
144
|
-
if (!context?.persona?.subagents || Object.keys(context.persona.subagents).length === 0) {
|
|
145
|
-
return blocked("spawn_agent tool is not enabled for the current persona.", {
|
|
146
|
-
name,
|
|
147
|
-
title,
|
|
148
|
-
});
|
|
136
|
+
if (!parsedArgs.ok) {
|
|
137
|
+
return blocked(`invalid arguments: ${parsedArgs.error}`);
|
|
149
138
|
}
|
|
150
|
-
const
|
|
151
|
-
|
|
139
|
+
const { prompt, model, workingDirectory } = parsedArgs.data;
|
|
140
|
+
const persona = context.persona;
|
|
141
|
+
if (!persona?.subagents || Object.keys(persona.subagents).length === 0) {
|
|
152
142
|
return blocked("spawn_agent tool is not enabled for the current persona.", {
|
|
153
143
|
name,
|
|
154
144
|
title,
|
|
155
145
|
});
|
|
156
146
|
}
|
|
157
|
-
const personaConfig = persona.subagents
|
|
147
|
+
const personaConfig = persona.subagents[name];
|
|
158
148
|
if (!personaConfig) {
|
|
159
149
|
return blocked(`subagent '${name}' is not enabled for the current persona.`, {
|
|
160
150
|
name,
|
|
161
151
|
title,
|
|
162
152
|
});
|
|
163
153
|
}
|
|
154
|
+
const config = context.config;
|
|
164
155
|
let launchModelOverride;
|
|
165
|
-
if (model !== undefined && !model) {
|
|
166
|
-
return blocked("model parameter must be a non-empty string in format <provider>/<model>:<effort>.", {
|
|
167
|
-
name,
|
|
168
|
-
title,
|
|
169
|
-
});
|
|
170
|
-
}
|
|
171
|
-
if (workingDirectory !== undefined && !workingDirectory) {
|
|
172
|
-
return blocked("workingDirectory parameter must be a non-empty string.", {
|
|
173
|
-
name,
|
|
174
|
-
title,
|
|
175
|
-
});
|
|
176
|
-
}
|
|
177
156
|
if (model) {
|
|
178
157
|
const parsedLaunchModel = parseSubagentLaunchModel(model);
|
|
179
158
|
if (parsedLaunchModel.error || !parsedLaunchModel.launchModel) {
|
|
@@ -201,7 +180,7 @@ export function createSpawnAgentToolDefinition(backend) {
|
|
|
201
180
|
const baseHostCwd = context.hostCwd ?? process.cwd();
|
|
202
181
|
const baseHome = context.home ?? process.env.HOME ?? process.cwd();
|
|
203
182
|
const sandboxEnabled = context.sandboxEnabled ?? false;
|
|
204
|
-
const sandboxMountPath =
|
|
183
|
+
const sandboxMountPath = config.sandbox?.mountPath;
|
|
205
184
|
const sandboxHostRoot = resolveSandboxHostRoot({
|
|
206
185
|
cwd: baseCwd,
|
|
207
186
|
hostCwd: baseHostCwd,
|
|
@@ -227,8 +206,8 @@ export function createSpawnAgentToolDefinition(backend) {
|
|
|
227
206
|
systemPrompt = await buildSubagentSystemPrompt({
|
|
228
207
|
name,
|
|
229
208
|
persona,
|
|
230
|
-
riskLevel
|
|
231
|
-
config
|
|
209
|
+
riskLevel,
|
|
210
|
+
config,
|
|
232
211
|
cwd,
|
|
233
212
|
hostCwd,
|
|
234
213
|
home: baseHome,
|
|
@@ -256,7 +235,7 @@ export function createSpawnAgentToolDefinition(backend) {
|
|
|
256
235
|
const effectiveSettings = resolveSubagentEffectiveSettings({
|
|
257
236
|
persona,
|
|
258
237
|
config: personaConfig,
|
|
259
|
-
riskLevel
|
|
238
|
+
riskLevel,
|
|
260
239
|
launchModel: launchModelOverride,
|
|
261
240
|
});
|
|
262
241
|
const runtimeConfig = {
|
|
@@ -274,6 +253,10 @@ export function createSpawnAgentToolDefinition(backend) {
|
|
|
274
253
|
});
|
|
275
254
|
}
|
|
276
255
|
const modelLabel = launchModelOverride?.normalized;
|
|
256
|
+
const statusWorkingDirectory = runtimeConfig.workingDirectory
|
|
257
|
+
? formatCwd(runtimeConfig.workingDirectory)
|
|
258
|
+
: undefined;
|
|
259
|
+
const statusPrefixParts = [name, modelLabel, statusWorkingDirectory].filter(Boolean);
|
|
277
260
|
return {
|
|
278
261
|
kind: "phased",
|
|
279
262
|
startedUiEvent: {
|
|
@@ -285,7 +268,14 @@ export function createSpawnAgentToolDefinition(backend) {
|
|
|
285
268
|
},
|
|
286
269
|
run: (async () => {
|
|
287
270
|
if (signal?.aborted) {
|
|
288
|
-
const
|
|
271
|
+
const reason = "aborted";
|
|
272
|
+
const toolResult = createToolError(toolCall, `spawn_agent ${reason}`);
|
|
273
|
+
const uiText = buildSubagentUiText({
|
|
274
|
+
output: reason,
|
|
275
|
+
statusText: [...statusPrefixParts, reason].join(" · "),
|
|
276
|
+
maxOutputLines: 16,
|
|
277
|
+
fullText: reason,
|
|
278
|
+
});
|
|
289
279
|
const uiEvent = {
|
|
290
280
|
type: "spawn_agent_finished",
|
|
291
281
|
toolCallId: toolCall.id,
|
|
@@ -293,7 +283,8 @@ export function createSpawnAgentToolDefinition(backend) {
|
|
|
293
283
|
title,
|
|
294
284
|
headerTarget,
|
|
295
285
|
status: "error",
|
|
296
|
-
message:
|
|
286
|
+
message: reason,
|
|
287
|
+
uiText,
|
|
297
288
|
};
|
|
298
289
|
return { kind: "single", toolResult, uiEvent };
|
|
299
290
|
}
|
|
@@ -302,7 +293,8 @@ export function createSpawnAgentToolDefinition(backend) {
|
|
|
302
293
|
prompt,
|
|
303
294
|
title,
|
|
304
295
|
modelLabel,
|
|
305
|
-
|
|
296
|
+
originHistoryEntryId: context.turnUserHistoryEntryId,
|
|
297
|
+
config,
|
|
306
298
|
authPath: context.authPath,
|
|
307
299
|
backend,
|
|
308
300
|
personaId: context.persona?.id,
|
|
@@ -325,10 +317,7 @@ export function createSpawnAgentToolDefinition(backend) {
|
|
|
325
317
|
title,
|
|
326
318
|
workingDirectory: runtimeConfig.workingDirectory,
|
|
327
319
|
});
|
|
328
|
-
const
|
|
329
|
-
? formatCwd(runtimeConfig.workingDirectory)
|
|
330
|
-
: undefined;
|
|
331
|
-
const statusParts = [name, modelLabel, statusWorkingDirectory, spawnResult.id].filter(Boolean);
|
|
320
|
+
const statusParts = [...statusPrefixParts, spawnResult.id];
|
|
332
321
|
const toolResult = createToolResult(toolCall, resultText, false);
|
|
333
322
|
const uiText = buildSubagentUiText({
|
|
334
323
|
output: prompt,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawn_agent.js","sourceRoot":"","sources":["../../../src/core/tools/spawn_agent.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"spawn_agent.js","sourceRoot":"","sources":["../../../src/core/tools/spawn_agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Type } from "@sinclair/typebox";
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import { createToolError, createToolResult } from "../utils/messages.js";
|
|
4
|
+
import { formatZodError } from "../utils/zod.js";
|
|
4
5
|
import { buildSubagentUiText, formatSubagentStatusLine } from "./subagent_ui.js";
|
|
5
6
|
import { TOOL_NAME_TERMINATE_AGENT } from "./tool_names.js";
|
|
6
7
|
const TERMINATE_AGENT_DESCRIPTION = [
|
|
@@ -16,11 +17,14 @@ export const TERMINATE_AGENT_TOOL = {
|
|
|
16
17
|
}, { additionalProperties: false }),
|
|
17
18
|
};
|
|
18
19
|
const terminateArgsSchema = z.object({
|
|
19
|
-
id: z.string().trim().
|
|
20
|
+
id: z.string().trim().min(1),
|
|
20
21
|
});
|
|
21
22
|
function parseTerminateArgs(raw) {
|
|
22
23
|
const parsed = terminateArgsSchema.safeParse(raw);
|
|
23
|
-
|
|
24
|
+
if (!parsed.success) {
|
|
25
|
+
return { ok: false, error: formatZodError(parsed.error) };
|
|
26
|
+
}
|
|
27
|
+
return { ok: true, data: parsed.data };
|
|
24
28
|
}
|
|
25
29
|
function formatTerminateResult(result) {
|
|
26
30
|
const payload = {
|
|
@@ -56,8 +60,9 @@ export function createTerminateAgentToolDefinition() {
|
|
|
56
60
|
return {
|
|
57
61
|
schema: TERMINATE_AGENT_TOOL,
|
|
58
62
|
async dispatch(toolCall, _riskLevel, signal, context) {
|
|
59
|
-
const
|
|
60
|
-
const
|
|
63
|
+
const parsedArgs = parseTerminateArgs(toolCall.arguments);
|
|
64
|
+
const id = parsedArgs.ok ? parsedArgs.data.id : "";
|
|
65
|
+
const headerTarget = id || "(invalid arguments)";
|
|
61
66
|
const blocked = (reason) => {
|
|
62
67
|
const toolResult = createToolError(toolCall, reason);
|
|
63
68
|
const uiEvent = {
|
|
@@ -69,10 +74,10 @@ export function createTerminateAgentToolDefinition() {
|
|
|
69
74
|
};
|
|
70
75
|
return { kind: "single", toolResult, uiEvent };
|
|
71
76
|
};
|
|
72
|
-
if (!
|
|
73
|
-
return blocked(
|
|
77
|
+
if (!parsedArgs.ok) {
|
|
78
|
+
return blocked(`invalid arguments: ${parsedArgs.error}`);
|
|
74
79
|
}
|
|
75
|
-
const controlPlane = context
|
|
80
|
+
const controlPlane = context.subagentControlPlane;
|
|
76
81
|
if (!controlPlane) {
|
|
77
82
|
return blocked("subagent control plane is not available.");
|
|
78
83
|
}
|
|
@@ -89,6 +94,12 @@ export function createTerminateAgentToolDefinition() {
|
|
|
89
94
|
const result = await controlPlane.terminate(id, signal);
|
|
90
95
|
if (!result) {
|
|
91
96
|
const message = `unknown subagent id '${id}'.`;
|
|
97
|
+
const uiText = buildSubagentUiText({
|
|
98
|
+
output: message,
|
|
99
|
+
statusText: "error",
|
|
100
|
+
maxOutputLines: 16,
|
|
101
|
+
fullText: message,
|
|
102
|
+
});
|
|
92
103
|
const uiEvent = {
|
|
93
104
|
type: "terminate_agent_finished",
|
|
94
105
|
toolCallId: toolCall.id,
|
|
@@ -96,6 +107,7 @@ export function createTerminateAgentToolDefinition() {
|
|
|
96
107
|
headerTarget,
|
|
97
108
|
status: "error",
|
|
98
109
|
message,
|
|
110
|
+
uiText,
|
|
99
111
|
};
|
|
100
112
|
const toolResult = createToolError(toolCall, message);
|
|
101
113
|
return { kind: "single", toolResult, uiEvent };
|
|
@@ -130,15 +142,23 @@ export function createTerminateAgentToolDefinition() {
|
|
|
130
142
|
}
|
|
131
143
|
catch (error) {
|
|
132
144
|
const message = error instanceof Error ? error.message : String(error);
|
|
145
|
+
const reason = message.trim() || "terminate_agent failed";
|
|
146
|
+
const uiText = buildSubagentUiText({
|
|
147
|
+
output: reason,
|
|
148
|
+
statusText: "error",
|
|
149
|
+
maxOutputLines: 16,
|
|
150
|
+
fullText: reason,
|
|
151
|
+
});
|
|
133
152
|
const uiEvent = {
|
|
134
153
|
type: "terminate_agent_finished",
|
|
135
154
|
toolCallId: toolCall.id,
|
|
136
155
|
agentId: id,
|
|
137
156
|
headerTarget,
|
|
138
157
|
status: "error",
|
|
139
|
-
message,
|
|
158
|
+
message: reason,
|
|
159
|
+
uiText,
|
|
140
160
|
};
|
|
141
|
-
const toolResult = createToolError(toolCall,
|
|
161
|
+
const toolResult = createToolError(toolCall, reason);
|
|
142
162
|
return { kind: "single", toolResult, uiEvent };
|
|
143
163
|
}
|
|
144
164
|
})(),
|
|
@@ -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,mBAAmB,CAAC;AACzC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"terminate_agent.js","sourceRoot":"","sources":["../../../src/core/tools/terminate_agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import sharp from "sharp";
|
|
|
4
4
|
import { z } from "zod";
|
|
5
5
|
import { createToolError } from "../utils/messages.js";
|
|
6
6
|
import { formatBytes } from "../utils/truncate.js";
|
|
7
|
+
import { formatZodError } from "../utils/zod.js";
|
|
7
8
|
import { TOOL_NAME_VIEW_IMAGE } from "./tool_names.js";
|
|
8
9
|
const VIEW_IMAGE_DESCRIPTION = [
|
|
9
10
|
"View an image file and return it to the model.",
|
|
@@ -26,11 +27,14 @@ export const VIEW_IMAGE_TOOL = {
|
|
|
26
27
|
}, { additionalProperties: false }),
|
|
27
28
|
};
|
|
28
29
|
const viewImageArgsSchema = z.object({
|
|
29
|
-
path: z.string().trim().
|
|
30
|
+
path: z.string().trim().min(1),
|
|
30
31
|
});
|
|
31
32
|
function parseViewImageArgs(raw) {
|
|
32
33
|
const parsed = viewImageArgsSchema.safeParse(raw);
|
|
33
|
-
|
|
34
|
+
if (!parsed.success) {
|
|
35
|
+
return { ok: false, error: formatZodError(parsed.error) };
|
|
36
|
+
}
|
|
37
|
+
return { ok: true, data: parsed.data };
|
|
34
38
|
}
|
|
35
39
|
function isSupportedImageType(mimeType) {
|
|
36
40
|
return mimeType ? SUPPORTED_IMAGE_TYPES.includes(mimeType) : false;
|
|
@@ -151,21 +155,22 @@ export function createViewImageToolDefinition(backend) {
|
|
|
151
155
|
return {
|
|
152
156
|
schema: VIEW_IMAGE_TOOL,
|
|
153
157
|
async dispatch(toolCall, _riskLevel) {
|
|
154
|
-
const
|
|
155
|
-
const
|
|
158
|
+
const parsedArgs = parseViewImageArgs(toolCall.arguments);
|
|
159
|
+
const path = parsedArgs.ok ? parsedArgs.data.path : "";
|
|
160
|
+
const headerTarget = path || "(invalid arguments)";
|
|
156
161
|
const blocked = (reason) => {
|
|
157
162
|
const toolResult = createToolError(toolCall, reason);
|
|
158
163
|
const uiEvent = {
|
|
159
164
|
type: "view_image_blocked",
|
|
160
165
|
toolCallId: toolCall.id,
|
|
161
|
-
path: path || "(
|
|
166
|
+
path: path || "(invalid path)",
|
|
162
167
|
headerTarget,
|
|
163
168
|
reason,
|
|
164
169
|
};
|
|
165
170
|
return { kind: "single", toolResult, uiEvent };
|
|
166
171
|
};
|
|
167
|
-
if (!
|
|
168
|
-
return blocked(
|
|
172
|
+
if (!parsedArgs.ok) {
|
|
173
|
+
return blocked(`invalid arguments: ${parsedArgs.error}`);
|
|
169
174
|
}
|
|
170
175
|
try {
|
|
171
176
|
const { path: resolvedPath, content } = await backend.readFileBinary(path, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"view_image.js","sourceRoot":"","sources":["../../../src/core/tools/view_image.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"view_image.js","sourceRoot":"","sources":["../../../src/core/tools/view_image.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { Type } from "@sinclair/typebox";
|
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import { createToolError, createToolResult } from "../utils/messages.js";
|
|
4
4
|
import { truncateForTokens } from "../utils/truncate.js";
|
|
5
|
+
import { formatZodError } from "../utils/zod.js";
|
|
5
6
|
import { buildSubagentUiText, formatSubagentStatusLine } from "./subagent_ui.js";
|
|
6
7
|
import { TOOL_NAME_WAIT_FOR_AGENT } from "./tool_names.js";
|
|
7
8
|
const WAIT_FOR_AGENT_DESCRIPTION = [
|
|
@@ -20,15 +21,14 @@ export const WAIT_FOR_AGENT_TOOL = {
|
|
|
20
21
|
}, { additionalProperties: false }),
|
|
21
22
|
};
|
|
22
23
|
const waitArgsSchema = z.object({
|
|
23
|
-
ids: z.array(z.string().trim()).
|
|
24
|
+
ids: z.array(z.string().trim().min(1)).min(1),
|
|
24
25
|
});
|
|
25
26
|
function parseWaitArgs(raw) {
|
|
26
27
|
const parsed = waitArgsSchema.safeParse(raw);
|
|
27
28
|
if (!parsed.success) {
|
|
28
|
-
return {
|
|
29
|
+
return { ok: false, error: formatZodError(parsed.error) };
|
|
29
30
|
}
|
|
30
|
-
|
|
31
|
-
return { ids };
|
|
31
|
+
return { ok: true, data: parsed.data };
|
|
32
32
|
}
|
|
33
33
|
function buildSubagentBody(result) {
|
|
34
34
|
const outputs = result.outputs
|
|
@@ -98,10 +98,11 @@ export function createWaitForAgentToolDefinition() {
|
|
|
98
98
|
return {
|
|
99
99
|
schema: WAIT_FOR_AGENT_TOOL,
|
|
100
100
|
async dispatch(toolCall, _riskLevel, signal, context) {
|
|
101
|
-
const
|
|
101
|
+
const parsedArgs = parseWaitArgs(toolCall.arguments);
|
|
102
|
+
const ids = parsedArgs.ok ? parsedArgs.data.ids : [];
|
|
102
103
|
const formatHeaderTarget = (entries) => {
|
|
103
104
|
const cleaned = entries.map((id) => id.trim()).filter(Boolean);
|
|
104
|
-
return cleaned.length > 0 ? cleaned.join(", ") : "(
|
|
105
|
+
return cleaned.length > 0 ? cleaned.join(", ") : "(invalid arguments)";
|
|
105
106
|
};
|
|
106
107
|
const headerTarget = formatHeaderTarget(ids);
|
|
107
108
|
const blocked = (reason) => {
|
|
@@ -109,12 +110,15 @@ export function createWaitForAgentToolDefinition() {
|
|
|
109
110
|
const uiEvent = {
|
|
110
111
|
type: "wait_for_agent_blocked",
|
|
111
112
|
toolCallId: toolCall.id,
|
|
112
|
-
agentIds: ids
|
|
113
|
+
agentIds: ids,
|
|
113
114
|
headerTarget,
|
|
114
115
|
reason,
|
|
115
116
|
};
|
|
116
117
|
return { kind: "single", toolResult, uiEvent };
|
|
117
118
|
};
|
|
119
|
+
if (!parsedArgs.ok) {
|
|
120
|
+
return blocked(`invalid arguments: ${parsedArgs.error}`);
|
|
121
|
+
}
|
|
118
122
|
const deduped = [];
|
|
119
123
|
const seen = new Set();
|
|
120
124
|
for (const id of ids) {
|
|
@@ -124,10 +128,7 @@ export function createWaitForAgentToolDefinition() {
|
|
|
124
128
|
}
|
|
125
129
|
}
|
|
126
130
|
const dedupedTarget = formatHeaderTarget(deduped);
|
|
127
|
-
|
|
128
|
-
return blocked("missing 'ids' parameter. provide at least one subagent id.");
|
|
129
|
-
}
|
|
130
|
-
const controlPlane = context?.subagentControlPlane;
|
|
131
|
+
const controlPlane = context.subagentControlPlane;
|
|
131
132
|
if (!controlPlane) {
|
|
132
133
|
return blocked("subagent control plane is not available.");
|
|
133
134
|
}
|
|
@@ -168,15 +169,22 @@ export function createWaitForAgentToolDefinition() {
|
|
|
168
169
|
}
|
|
169
170
|
catch (error) {
|
|
170
171
|
const message = error instanceof Error ? error.message : String(error);
|
|
172
|
+
const reason = message.trim() || "wait_for_agent failed";
|
|
173
|
+
const uiText = buildSubagentUiText({
|
|
174
|
+
output: reason,
|
|
175
|
+
statusText: "error",
|
|
176
|
+
fullText: reason,
|
|
177
|
+
});
|
|
171
178
|
const uiEvent = {
|
|
172
179
|
type: "wait_for_agent_finished",
|
|
173
180
|
toolCallId: toolCall.id,
|
|
174
181
|
agentIds: deduped,
|
|
175
182
|
headerTarget: dedupedTarget,
|
|
176
183
|
status: "error",
|
|
177
|
-
message,
|
|
184
|
+
message: reason,
|
|
185
|
+
uiText,
|
|
178
186
|
};
|
|
179
|
-
const toolResult = createToolError(toolCall,
|
|
187
|
+
const toolResult = createToolError(toolCall, reason);
|
|
180
188
|
return { kind: "single", toolResult, uiEvent };
|
|
181
189
|
}
|
|
182
190
|
})(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wait_for_agent.js","sourceRoot":"","sources":["../../../src/core/tools/wait_for_agent.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"wait_for_agent.js","sourceRoot":"","sources":["../../../src/core/tools/wait_for_agent.ts"],"names":[],"mappings":"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"}
|