@markusylisiurunen/tau 0.1.18 → 0.1.20
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 +12 -3
- package/dist/app.js +32 -50
- package/dist/app.js.map +1 -1
- package/dist/commands.js +4 -1
- package/dist/commands.js.map +1 -1
- package/dist/content_loader.js +35 -6
- package/dist/content_loader.js.map +1 -1
- package/dist/personas.js +2 -1
- package/dist/personas.js.map +1 -1
- package/dist/session/session_engine.js +18 -9
- package/dist/session/session_engine.js.map +1 -1
- package/dist/subagents/explore.js +6 -3
- package/dist/subagents/explore.js.map +1 -1
- package/dist/subagents/subagent_engine.js +1 -38
- package/dist/subagents/subagent_engine.js.map +1 -1
- package/dist/terminal.js +5 -9
- package/dist/terminal.js.map +1 -1
- package/dist/tools/fork.js +242 -0
- package/dist/tools/fork.js.map +1 -0
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/task.js +5 -36
- package/dist/tools/task.js.map +1 -1
- package/dist/tools/web_fetch.js +1 -1
- package/dist/tools/web_fetch.js.map +1 -1
- package/dist/tools/web_search.js +1 -1
- package/dist/tools/web_search.js.map +1 -1
- package/dist/ui/chat_container.js +27 -14
- package/dist/ui/chat_container.js.map +1 -1
- package/dist/ui/custom_editor.js +13 -20
- package/dist/ui/custom_editor.js.map +1 -1
- package/dist/ui/task_execution.js +15 -9
- package/dist/ui/task_execution.js.map +1 -1
- package/dist/utils/context.js +27 -19
- package/dist/utils/context.js.map +1 -1
- package/dist/{tools → utils}/parallel_api.js.map +1 -1
- package/dist/utils/subagent_utils.js +80 -0
- package/dist/utils/subagent_utils.js.map +1 -0
- package/dist/version.js +1 -1
- package/package.json +3 -3
- /package/dist/{tools → utils}/parallel_api.js +0 -0
|
@@ -0,0 +1,242 @@
|
|
|
1
|
+
import { Type } from "@sinclair/typebox";
|
|
2
|
+
import { z } from "zod";
|
|
3
|
+
import { SessionEngine } from "../session/session_engine.js";
|
|
4
|
+
import { createToolError, createToolResult, extractAssistantText } from "../utils/messages.js";
|
|
5
|
+
import { AsyncUiEventQueue, extractAssistantTextForProgress, formatToolUiEventForProgress, getToolResultFirstLine, } from "../utils/subagent_utils.js";
|
|
6
|
+
const FORK_DESCRIPTION = [
|
|
7
|
+
"Fork the current session and run autonomously until it produces a final assistant response.",
|
|
8
|
+
"The fork receives the full main thread history, appends the provided prompt as the next user message,",
|
|
9
|
+
"and returns the final assistant text output from the fork.",
|
|
10
|
+
"Only use this tool when the user specifically requests that the session be forked.",
|
|
11
|
+
].join(" ");
|
|
12
|
+
const FORK_TITLE_DESCRIPTION = [
|
|
13
|
+
"A short human-friendly UI title shown while the fork runs.",
|
|
14
|
+
"Do not use title case; all lower-case is preferred except for proper nouns.",
|
|
15
|
+
].join(" ");
|
|
16
|
+
const FORK_PROMPT_DESCRIPTION = [
|
|
17
|
+
"The prompt to append as the next user message in the forked session.",
|
|
18
|
+
"The fork will then run autonomously until completion.",
|
|
19
|
+
"Format this as a direct instruction to the assistant.",
|
|
20
|
+
"Be precise rather than loose in your phrasing.",
|
|
21
|
+
"Include any instructions specifying what the assistant should return in its final response.",
|
|
22
|
+
].join(" ");
|
|
23
|
+
export const FORK_TOOL = {
|
|
24
|
+
name: "fork",
|
|
25
|
+
description: FORK_DESCRIPTION,
|
|
26
|
+
parameters: Type.Object({
|
|
27
|
+
title: Type.String({ description: FORK_TITLE_DESCRIPTION }),
|
|
28
|
+
prompt: Type.String({ description: FORK_PROMPT_DESCRIPTION }),
|
|
29
|
+
}, { additionalProperties: false }),
|
|
30
|
+
};
|
|
31
|
+
const forkArgsSchema = z.object({
|
|
32
|
+
title: z.string().trim().catch(""),
|
|
33
|
+
prompt: z.string().trim().catch(""),
|
|
34
|
+
});
|
|
35
|
+
function parseForkArgs(raw) {
|
|
36
|
+
const parsed = forkArgsSchema.safeParse(raw);
|
|
37
|
+
return parsed.success ? parsed.data : { title: "", prompt: "" };
|
|
38
|
+
}
|
|
39
|
+
function stripToolCallFromHistory(history, toolCallId) {
|
|
40
|
+
const copied = [...history];
|
|
41
|
+
for (let i = copied.length - 1; i >= 0; i--) {
|
|
42
|
+
const msg = copied[i];
|
|
43
|
+
if (!msg || msg.role !== "assistant") {
|
|
44
|
+
continue;
|
|
45
|
+
}
|
|
46
|
+
const assistant = msg;
|
|
47
|
+
const hasCall = assistant.content.some((b) => b.type === "toolCall" && b.id === toolCallId);
|
|
48
|
+
if (!hasCall) {
|
|
49
|
+
continue;
|
|
50
|
+
}
|
|
51
|
+
const nextContent = assistant.content.filter((b) => b.type !== "toolCall");
|
|
52
|
+
if (nextContent.length === 0) {
|
|
53
|
+
copied.splice(i, 1);
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
copied[i] = { ...assistant, content: nextContent };
|
|
57
|
+
}
|
|
58
|
+
break;
|
|
59
|
+
}
|
|
60
|
+
return copied;
|
|
61
|
+
}
|
|
62
|
+
export function createForkToolDefinition() {
|
|
63
|
+
return {
|
|
64
|
+
schema: FORK_TOOL,
|
|
65
|
+
async dispatch(toolCall, riskLevel, signal, context) {
|
|
66
|
+
const { title, prompt } = parseForkArgs(toolCall.arguments);
|
|
67
|
+
const blocked = (reason, details) => {
|
|
68
|
+
const toolResult = createToolError(toolCall, reason);
|
|
69
|
+
const uiEvent = {
|
|
70
|
+
type: "task_blocked",
|
|
71
|
+
toolCallId: toolCall.id,
|
|
72
|
+
kind: "fork",
|
|
73
|
+
title: details?.title ?? (title || "(fork)"),
|
|
74
|
+
reason,
|
|
75
|
+
};
|
|
76
|
+
return { kind: "single", toolResult, uiEvent };
|
|
77
|
+
};
|
|
78
|
+
if (riskLevel === "none") {
|
|
79
|
+
return blocked("Fork tool blocked due to risk level being set to 'none'. Ask the user to enable it with /risk:read-only or /risk:read-write.");
|
|
80
|
+
}
|
|
81
|
+
if (!title || !prompt) {
|
|
82
|
+
const missing = [!title ? "title" : undefined, !prompt ? "prompt" : undefined].filter(Boolean);
|
|
83
|
+
return blocked(`Fork tool error: missing required parameter(s): ${missing.join(", ")}.`, {
|
|
84
|
+
title: title || "(fork)",
|
|
85
|
+
});
|
|
86
|
+
}
|
|
87
|
+
if (!context) {
|
|
88
|
+
return blocked("Fork tool error: missing session context.", { title });
|
|
89
|
+
}
|
|
90
|
+
const uiQueue = new AsyncUiEventQueue();
|
|
91
|
+
let costTotal = 0;
|
|
92
|
+
let turns = 0;
|
|
93
|
+
let toolCalls = 0;
|
|
94
|
+
const pushProgress = (eventText, nextCostTotal, nextTurns, nextToolCalls) => {
|
|
95
|
+
costTotal = nextCostTotal;
|
|
96
|
+
turns = nextTurns;
|
|
97
|
+
toolCalls = nextToolCalls;
|
|
98
|
+
uiQueue.push({
|
|
99
|
+
type: "task_progress",
|
|
100
|
+
toolCallId: toolCall.id,
|
|
101
|
+
kind: "fork",
|
|
102
|
+
name: "",
|
|
103
|
+
title,
|
|
104
|
+
event: eventText,
|
|
105
|
+
costTotal,
|
|
106
|
+
turns,
|
|
107
|
+
toolCalls,
|
|
108
|
+
});
|
|
109
|
+
};
|
|
110
|
+
const run = (async () => {
|
|
111
|
+
let status = "success";
|
|
112
|
+
let finalText = "";
|
|
113
|
+
try {
|
|
114
|
+
pushProgress("fork started", 0, 0, 0);
|
|
115
|
+
const runSignal = signal ?? new AbortController().signal;
|
|
116
|
+
const enabledTools = context.persona.tools ?? context.toolRegistry.schemas;
|
|
117
|
+
const forkTools = enabledTools.filter((t) => t.name !== "task" && t.name !== "fork");
|
|
118
|
+
const forkPersona = { ...context.persona, tools: forkTools };
|
|
119
|
+
const forkHistory = stripToolCallFromHistory(context.history, toolCall.id);
|
|
120
|
+
const forkEngine = new SessionEngine({
|
|
121
|
+
persona: forkPersona,
|
|
122
|
+
systemPrompt: context.systemPrompt,
|
|
123
|
+
riskLevel,
|
|
124
|
+
toolRegistry: context.toolRegistry,
|
|
125
|
+
config: context.config,
|
|
126
|
+
});
|
|
127
|
+
for (const msg of forkHistory) {
|
|
128
|
+
forkEngine.addMessage(msg);
|
|
129
|
+
}
|
|
130
|
+
forkEngine.addUserText([
|
|
131
|
+
"<system>",
|
|
132
|
+
[
|
|
133
|
+
"You are running in a forked session with access to the same tools and capabilities as the main session.",
|
|
134
|
+
"Execute the following instruction autonomously until you have a complete answer.",
|
|
135
|
+
"Your final message will be returned to the user, so ensure it is complete and self-contained,",
|
|
136
|
+
"describing what you did and providing any requested information.",
|
|
137
|
+
"Do not stop until you have a final answer ready to return.",
|
|
138
|
+
].join(" "),
|
|
139
|
+
"</system>",
|
|
140
|
+
prompt,
|
|
141
|
+
].join("\n"));
|
|
142
|
+
let lastAssistantFinal;
|
|
143
|
+
for await (const event of forkEngine.processTurn(runSignal)) {
|
|
144
|
+
if (runSignal.aborted) {
|
|
145
|
+
break;
|
|
146
|
+
}
|
|
147
|
+
if (event.type === "assistant_final") {
|
|
148
|
+
lastAssistantFinal = event.message;
|
|
149
|
+
turns += 1;
|
|
150
|
+
costTotal += event.message.usage?.cost?.total ?? 0;
|
|
151
|
+
toolCalls += event.message.content.filter((c) => c.type === "toolCall").length;
|
|
152
|
+
const agentLine = extractAssistantTextForProgress(event.message);
|
|
153
|
+
if (agentLine) {
|
|
154
|
+
pushProgress(agentLine, costTotal, turns, toolCalls);
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
else if (event.type === "tool_ui") {
|
|
158
|
+
const uiEvent = event.uiEvent;
|
|
159
|
+
const text = formatToolUiEventForProgress(uiEvent);
|
|
160
|
+
if (text) {
|
|
161
|
+
pushProgress(text, costTotal, turns, toolCalls);
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
else if (event.type === "tool_result") {
|
|
165
|
+
if (event.message.isError) {
|
|
166
|
+
const firstLine = getToolResultFirstLine(event.message);
|
|
167
|
+
const issue = firstLine
|
|
168
|
+
? `${event.message.toolName}: ${firstLine}`
|
|
169
|
+
: `${event.message.toolName}: tool returned an error`;
|
|
170
|
+
pushProgress(`tool error: ${issue}`, costTotal, turns, toolCalls);
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
else if (event.type === "notice") {
|
|
174
|
+
if (event.severity === "error") {
|
|
175
|
+
pushProgress(`tool error: ${event.text}`, costTotal, turns, toolCalls);
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
if (runSignal.aborted) {
|
|
180
|
+
status = "aborted";
|
|
181
|
+
finalText = "Fork aborted.";
|
|
182
|
+
}
|
|
183
|
+
else if (!lastAssistantFinal) {
|
|
184
|
+
throw new Error("fork did not produce a final response");
|
|
185
|
+
}
|
|
186
|
+
else if (lastAssistantFinal.stopReason === "toolUse") {
|
|
187
|
+
throw new Error("fork stopped without producing a final non-tool response");
|
|
188
|
+
}
|
|
189
|
+
else {
|
|
190
|
+
const text = extractAssistantText(lastAssistantFinal).trim();
|
|
191
|
+
if (!text) {
|
|
192
|
+
throw new Error(`fork produced an empty response (stopReason: ${lastAssistantFinal.stopReason ?? "unknown"})`);
|
|
193
|
+
}
|
|
194
|
+
finalText = text;
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
catch (err) {
|
|
198
|
+
if (signal?.aborted) {
|
|
199
|
+
status = "aborted";
|
|
200
|
+
finalText = "Fork aborted.";
|
|
201
|
+
}
|
|
202
|
+
else {
|
|
203
|
+
status = "error";
|
|
204
|
+
finalText = `Fork failed: ${err instanceof Error ? err.message : String(err)}`;
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
finally {
|
|
208
|
+
uiQueue.close();
|
|
209
|
+
}
|
|
210
|
+
const toolResult = status === "success"
|
|
211
|
+
? createToolResult(toolCall, finalText, false)
|
|
212
|
+
: createToolResult(toolCall, finalText, true);
|
|
213
|
+
const uiEvent = {
|
|
214
|
+
type: "task_finished",
|
|
215
|
+
toolCallId: toolCall.id,
|
|
216
|
+
kind: "fork",
|
|
217
|
+
name: "",
|
|
218
|
+
title,
|
|
219
|
+
costTotal,
|
|
220
|
+
turns,
|
|
221
|
+
toolCalls,
|
|
222
|
+
status,
|
|
223
|
+
finalOutput: finalText,
|
|
224
|
+
};
|
|
225
|
+
return { kind: "single", toolResult, uiEvent };
|
|
226
|
+
})();
|
|
227
|
+
return {
|
|
228
|
+
kind: "phased",
|
|
229
|
+
startedUiEvent: {
|
|
230
|
+
type: "task_started",
|
|
231
|
+
toolCallId: toolCall.id,
|
|
232
|
+
kind: "fork",
|
|
233
|
+
name: "",
|
|
234
|
+
title,
|
|
235
|
+
},
|
|
236
|
+
uiEvents: uiQueue,
|
|
237
|
+
run,
|
|
238
|
+
};
|
|
239
|
+
},
|
|
240
|
+
};
|
|
241
|
+
}
|
|
242
|
+
//# sourceMappingURL=fork.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fork.js","sourceRoot":"","sources":["../../src/tools/fork.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/tools/registry.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/tools/registry.ts"],"names":[],"mappings":"AA0IA,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;CACF"}
|
package/dist/tools/task.js
CHANGED
|
@@ -3,6 +3,7 @@ import { z } from "zod";
|
|
|
3
3
|
import { getSubagentDefinitionFromString } from "../subagents/registry.js";
|
|
4
4
|
import { runSubagentToCompletion } from "../subagents/subagent_engine.js";
|
|
5
5
|
import { createToolError, createToolResult } from "../utils/messages.js";
|
|
6
|
+
import { AsyncUiEventQueue } from "../utils/subagent_utils.js";
|
|
6
7
|
const TASK_DESCRIPTION = [
|
|
7
8
|
"Run an isolated sub-agent task to completion and return only its final text output.",
|
|
8
9
|
"Use this to delegate narrow exploration or focused work to a constrained sub-agent.",
|
|
@@ -39,42 +40,6 @@ function parseTaskArgs(raw) {
|
|
|
39
40
|
const parsed = taskArgsSchema.safeParse(raw);
|
|
40
41
|
return parsed.success ? parsed.data : { name: "", title: "", prompt: "" };
|
|
41
42
|
}
|
|
42
|
-
class AsyncUiEventQueue {
|
|
43
|
-
buffered = [];
|
|
44
|
-
waiting = [];
|
|
45
|
-
closed = false;
|
|
46
|
-
push(event) {
|
|
47
|
-
if (this.closed)
|
|
48
|
-
return;
|
|
49
|
-
const next = this.waiting.shift();
|
|
50
|
-
if (next) {
|
|
51
|
-
next({ value: event, done: false });
|
|
52
|
-
return;
|
|
53
|
-
}
|
|
54
|
-
this.buffered.push(event);
|
|
55
|
-
}
|
|
56
|
-
close() {
|
|
57
|
-
if (this.closed)
|
|
58
|
-
return;
|
|
59
|
-
this.closed = true;
|
|
60
|
-
for (const resolve of this.waiting.splice(0)) {
|
|
61
|
-
resolve({ value: undefined, done: true });
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
[Symbol.asyncIterator]() {
|
|
65
|
-
return {
|
|
66
|
-
next: () => {
|
|
67
|
-
if (this.buffered.length > 0) {
|
|
68
|
-
return Promise.resolve({ value: this.buffered.shift(), done: false });
|
|
69
|
-
}
|
|
70
|
-
if (this.closed) {
|
|
71
|
-
return Promise.resolve({ value: undefined, done: true });
|
|
72
|
-
}
|
|
73
|
-
return new Promise((resolve) => this.waiting.push(resolve));
|
|
74
|
-
},
|
|
75
|
-
};
|
|
76
|
-
}
|
|
77
|
-
}
|
|
78
43
|
function getEnabledSubagentConfig(context, definition) {
|
|
79
44
|
const persona = context?.persona;
|
|
80
45
|
const config = persona?.subagents;
|
|
@@ -90,6 +55,7 @@ export function createTaskToolDefinition() {
|
|
|
90
55
|
const uiEvent = {
|
|
91
56
|
type: "task_blocked",
|
|
92
57
|
toolCallId: toolCall.id,
|
|
58
|
+
kind: "task",
|
|
93
59
|
name: details?.name ?? (name || undefined),
|
|
94
60
|
title: details?.title ?? (title || "(task)"),
|
|
95
61
|
reason,
|
|
@@ -134,6 +100,7 @@ export function createTaskToolDefinition() {
|
|
|
134
100
|
uiQueue.push({
|
|
135
101
|
type: "task_progress",
|
|
136
102
|
toolCallId: toolCall.id,
|
|
103
|
+
kind: "task",
|
|
137
104
|
name: definition.name,
|
|
138
105
|
title,
|
|
139
106
|
event: eventText,
|
|
@@ -182,6 +149,7 @@ export function createTaskToolDefinition() {
|
|
|
182
149
|
const uiEvent = {
|
|
183
150
|
type: "task_finished",
|
|
184
151
|
toolCallId: toolCall.id,
|
|
152
|
+
kind: "task",
|
|
185
153
|
name: definition.name,
|
|
186
154
|
title,
|
|
187
155
|
costTotal,
|
|
@@ -197,6 +165,7 @@ export function createTaskToolDefinition() {
|
|
|
197
165
|
startedUiEvent: {
|
|
198
166
|
type: "task_started",
|
|
199
167
|
toolCallId: toolCall.id,
|
|
168
|
+
kind: "task",
|
|
200
169
|
name: definition.name,
|
|
201
170
|
title,
|
|
202
171
|
},
|
package/dist/tools/task.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task.js","sourceRoot":"","sources":["../../src/tools/task.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,+BAA+B,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAG1E,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"task.js","sourceRoot":"","sources":["../../src/tools/task.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/web_fetch.js
CHANGED
|
@@ -2,9 +2,9 @@ import { Type } from "@sinclair/typebox";
|
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import { getParallelApiKey } from "../config.js";
|
|
4
4
|
import { createToolError, createToolResult } from "../utils/messages.js";
|
|
5
|
+
import { extractParallelErrorMessage, PARALLEL_API_BASE_URL, PARALLEL_BETA_HEADER, } from "../utils/parallel_api.js";
|
|
5
6
|
import { truncateMiddleForModel } from "../utils/truncate.js";
|
|
6
7
|
import { formatZodError } from "../utils/zod.js";
|
|
7
|
-
import { extractParallelErrorMessage, PARALLEL_API_BASE_URL, PARALLEL_BETA_HEADER, } from "./parallel_api.js";
|
|
8
8
|
const WEB_FETCH_DESCRIPTION = [
|
|
9
9
|
"Fetch and extract relevant content from a URL.",
|
|
10
10
|
"When you are interested in only a specific part, use excerpts=true and fullContent=false.",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web_fetch.js","sourceRoot":"","sources":["../../src/tools/web_fetch.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,
|
|
1
|
+
{"version":3,"file":"web_fetch.js","sourceRoot":"","sources":["../../src/tools/web_fetch.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/web_search.js
CHANGED
|
@@ -2,9 +2,9 @@ import { Type } from "@sinclair/typebox";
|
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import { getParallelApiKey } from "../config.js";
|
|
4
4
|
import { createToolError, createToolResult } from "../utils/messages.js";
|
|
5
|
+
import { extractParallelErrorMessage, PARALLEL_API_BASE_URL, PARALLEL_BETA_HEADER, } from "../utils/parallel_api.js";
|
|
5
6
|
import { truncateMiddleForModel } from "../utils/truncate.js";
|
|
6
7
|
import { formatZodError } from "../utils/zod.js";
|
|
7
|
-
import { extractParallelErrorMessage, PARALLEL_API_BASE_URL, PARALLEL_BETA_HEADER, } from "./parallel_api.js";
|
|
8
8
|
const WEB_SEARCH_DESCRIPTION = [
|
|
9
9
|
"Search the web for relevant sources.",
|
|
10
10
|
"Use this to discover good candidate URLs before fetching content with web_fetch.",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web_search.js","sourceRoot":"","sources":["../../src/tools/web_search.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,
|
|
1
|
+
{"version":3,"file":"web_search.js","sourceRoot":"","sources":["../../src/tools/web_search.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ export class ChatContainerComponent extends Container {
|
|
|
5
5
|
thoughtsVisible = false;
|
|
6
6
|
compactToolUi = false;
|
|
7
7
|
allMessages = [];
|
|
8
|
+
idToIndex = new Map();
|
|
8
9
|
constructor(thoughtsVisible = false) {
|
|
9
10
|
super();
|
|
10
11
|
this.thoughtsVisible = thoughtsVisible;
|
|
@@ -12,35 +13,43 @@ export class ChatContainerComponent extends Container {
|
|
|
12
13
|
this.addChild(this.chatContainer);
|
|
13
14
|
}
|
|
14
15
|
addMessage(message) {
|
|
16
|
+
const id = this.generateId();
|
|
15
17
|
const isAssistant = message instanceof AssistantMessageComponent;
|
|
16
|
-
this.allMessages.push({ type: "component", component: message, isAssistant });
|
|
18
|
+
this.allMessages.push({ id, type: "component", component: message, isAssistant });
|
|
19
|
+
this.idToIndex.set(id, this.allMessages.length - 1);
|
|
17
20
|
// Always add immediately (rebuild() will filter later if needed)
|
|
18
21
|
this.addSpacerIfNeeded();
|
|
19
22
|
this.chatContainer.addChild(message);
|
|
20
|
-
|
|
21
|
-
return this.allMessages.length - 1;
|
|
23
|
+
return id;
|
|
22
24
|
}
|
|
23
|
-
|
|
24
|
-
|
|
25
|
+
replaceMessage(id, newComponent) {
|
|
26
|
+
const index = this.idToIndex.get(id);
|
|
27
|
+
if (index === undefined)
|
|
25
28
|
return;
|
|
26
|
-
}
|
|
27
29
|
const isAssistant = newComponent instanceof AssistantMessageComponent;
|
|
28
|
-
this.allMessages[index] = { type: "component", component: newComponent, isAssistant };
|
|
30
|
+
this.allMessages[index] = { id, type: "component", component: newComponent, isAssistant };
|
|
29
31
|
// Rebuild to update the display
|
|
30
32
|
this.rebuild();
|
|
31
33
|
}
|
|
32
|
-
addToolMessage(render) {
|
|
33
|
-
|
|
34
|
+
addToolMessage(render, id) {
|
|
35
|
+
const finalId = id ?? this.generateId();
|
|
36
|
+
this.allMessages.push({ id: finalId, type: "tool", render, isAssistant: false });
|
|
37
|
+
this.idToIndex.set(finalId, this.allMessages.length - 1);
|
|
34
38
|
const component = render(this.compactToolUi);
|
|
35
39
|
this.addSpacerIfNeeded();
|
|
36
40
|
this.chatContainer.addChild(component);
|
|
37
|
-
return
|
|
41
|
+
return finalId;
|
|
38
42
|
}
|
|
39
|
-
|
|
40
|
-
|
|
43
|
+
replaceToolMessage(id, render) {
|
|
44
|
+
const index = this.idToIndex.get(id);
|
|
45
|
+
if (index === undefined)
|
|
41
46
|
return;
|
|
42
|
-
|
|
43
|
-
|
|
47
|
+
this.allMessages[index] = {
|
|
48
|
+
id,
|
|
49
|
+
type: "tool",
|
|
50
|
+
render,
|
|
51
|
+
isAssistant: false,
|
|
52
|
+
};
|
|
44
53
|
this.rebuild();
|
|
45
54
|
}
|
|
46
55
|
setThinkingVisibility(visible) {
|
|
@@ -57,6 +66,7 @@ export class ChatContainerComponent extends Container {
|
|
|
57
66
|
}
|
|
58
67
|
clear() {
|
|
59
68
|
this.allMessages = [];
|
|
69
|
+
this.idToIndex.clear();
|
|
60
70
|
this.chatContainer.clear();
|
|
61
71
|
}
|
|
62
72
|
rebuild() {
|
|
@@ -86,5 +96,8 @@ export class ChatContainerComponent extends Container {
|
|
|
86
96
|
return;
|
|
87
97
|
this.chatContainer.addChild(new Spacer(1));
|
|
88
98
|
}
|
|
99
|
+
generateId() {
|
|
100
|
+
return Math.random().toString(36).slice(2, 11);
|
|
101
|
+
}
|
|
89
102
|
}
|
|
90
103
|
//# sourceMappingURL=chat_container.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat_container.js","sourceRoot":"","sources":["../../src/ui/chat_container.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,SAAS,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"chat_container.js","sourceRoot":"","sources":["../../src/ui/chat_container.ts"],"names":[],"mappings":"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"}
|