agentenkit 0.7.0 → 0.10.0
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/adapters/mcp.js +1 -1
- package/dist/adapters/mcp.js.map +1 -1
- package/dist/core/builtin/index.js +1 -1
- package/dist/core/builtin/index.js.map +1 -1
- package/dist/core/builtin/run.d.ts +2 -0
- package/dist/core/builtin/run.d.ts.map +1 -1
- package/dist/core/builtin/run.js.map +1 -1
- package/dist/core/builtin/sandbox-tools.d.ts.map +1 -1
- package/dist/core/builtin/sandbox-tools.js +57 -31
- package/dist/core/builtin/sandbox-tools.js.map +1 -1
- package/dist/core/builtin/sandbox.d.ts +28 -2
- package/dist/core/builtin/sandbox.d.ts.map +1 -1
- package/dist/core/builtin/sandbox.js +103 -8
- package/dist/core/builtin/sandbox.js.map +1 -1
- package/dist/core/builtin/web.d.ts +6 -0
- package/dist/core/builtin/web.d.ts.map +1 -1
- package/dist/core/builtin/web.js +58 -6
- package/dist/core/builtin/web.js.map +1 -1
- package/dist/core/cache.d.ts.map +1 -1
- package/dist/core/cache.js +3 -6
- package/dist/core/cache.js.map +1 -1
- package/dist/core/context.d.ts +18 -0
- package/dist/core/context.d.ts.map +1 -1
- package/dist/core/context.js +132 -47
- package/dist/core/context.js.map +1 -1
- package/dist/core/engine.d.ts.map +1 -1
- package/dist/core/engine.js +92 -48
- package/dist/core/engine.js.map +1 -1
- package/dist/core/hitl.d.ts.map +1 -1
- package/dist/core/hitl.js +5 -1
- package/dist/core/hitl.js.map +1 -1
- package/dist/core/loop.d.ts +15 -5
- package/dist/core/loop.d.ts.map +1 -1
- package/dist/core/loop.js +51 -46
- package/dist/core/loop.js.map +1 -1
- package/dist/core/sdk.d.ts +71 -0
- package/dist/core/sdk.d.ts.map +1 -0
- package/dist/core/sdk.js +281 -0
- package/dist/core/sdk.js.map +1 -0
- package/dist/core/settle.d.ts.map +1 -1
- package/dist/core/settle.js +13 -1
- package/dist/core/settle.js.map +1 -1
- package/dist/core/stream.d.ts +4 -4
- package/dist/core/stream.d.ts.map +1 -1
- package/dist/core/stream.js +14 -7
- package/dist/core/stream.js.map +1 -1
- package/dist/core/subagent.d.ts +255 -20
- package/dist/core/subagent.d.ts.map +1 -1
- package/dist/core/subagent.js +1 -1
- package/dist/core/subagent.js.map +1 -1
- package/dist/core/tools.d.ts +7 -9
- package/dist/core/tools.d.ts.map +1 -1
- package/dist/core/tools.js +7 -4
- package/dist/core/tools.js.map +1 -1
- package/dist/core/types.d.ts +21 -0
- package/dist/core/types.d.ts.map +1 -1
- package/dist/core/types.js +9 -0
- package/dist/core/types.js.map +1 -1
- package/dist/core/usage.d.ts +14 -4
- package/dist/core/usage.d.ts.map +1 -1
- package/dist/core/usage.js +31 -4
- package/dist/core/usage.js.map +1 -1
- package/dist/index.d.ts +4 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/ports/runtime.d.ts +23 -2
- package/dist/ports/runtime.d.ts.map +1 -1
- package/dist/ports/sandbox.d.ts +10 -0
- package/dist/ports/sandbox.d.ts.map +1 -1
- package/dist/ports/sandbox.js.map +1 -1
- package/dist/ports/tools.d.ts +22 -2
- package/dist/ports/tools.d.ts.map +1 -1
- package/dist/runtime.d.ts.map +1 -1
- package/dist/runtime.js +19 -1
- package/dist/runtime.js.map +1 -1
- package/package.json +7 -4
|
@@ -61,12 +61,15 @@ export function threadSandbox(run) {
|
|
|
61
61
|
if (!provider)
|
|
62
62
|
return Promise.reject(new Error('No sandbox: pass setupAgentCore({ tools: { sandbox } })'));
|
|
63
63
|
const key = run.threadId;
|
|
64
|
-
|
|
65
|
-
if (
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
return p
|
|
64
|
+
let p = pending.get(key);
|
|
65
|
+
if (!p) {
|
|
66
|
+
p = acquire(run, provider).finally(() => pending.delete(key));
|
|
67
|
+
pending.set(key, p);
|
|
68
|
+
}
|
|
69
|
+
return p.then((ts) => {
|
|
70
|
+
run.onSandbox?.(ts.sandbox);
|
|
71
|
+
return ts;
|
|
72
|
+
});
|
|
70
73
|
}
|
|
71
74
|
async function acquire(run, provider) {
|
|
72
75
|
const { kv, config } = run.deps;
|
|
@@ -78,6 +81,19 @@ async function acquire(run, provider) {
|
|
|
78
81
|
if (rec && rec.provider !== provider.name)
|
|
79
82
|
rec = null;
|
|
80
83
|
let lost = false;
|
|
84
|
+
if (rec && config.sandboxScope === 'run') {
|
|
85
|
+
if (rec.released) {
|
|
86
|
+
// Given back at a park: for the same run, its files are gone.
|
|
87
|
+
lost = rec.runId === run.runId;
|
|
88
|
+
rec = null;
|
|
89
|
+
}
|
|
90
|
+
else if (rec.runId !== run.runId) {
|
|
91
|
+
// Left by an earlier run that never gave it back. This run starts
|
|
92
|
+
// fresh; that is the normal case here, not a loss.
|
|
93
|
+
await destroyQuietly(run.deps, provider, rec.id);
|
|
94
|
+
rec = null;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
81
97
|
if (rec && (now - rec.lastUsedAt > idle || now - rec.createdAt > lifetime)) {
|
|
82
98
|
await destroyQuietly(run.deps, provider, rec.id);
|
|
83
99
|
rec = null;
|
|
@@ -108,6 +124,8 @@ async function acquire(run, provider) {
|
|
|
108
124
|
}
|
|
109
125
|
if (!rec) {
|
|
110
126
|
sandbox = await provider.create({
|
|
127
|
+
// The app's defaults, then the two the runtime owns.
|
|
128
|
+
...config.sandboxDefaults,
|
|
111
129
|
timeoutMs: Math.min(idle + PUSH_EVERY_MS, lifetime),
|
|
112
130
|
metadata: {
|
|
113
131
|
threadId: run.threadId,
|
|
@@ -116,11 +134,14 @@ async function acquire(run, provider) {
|
|
|
116
134
|
},
|
|
117
135
|
});
|
|
118
136
|
remember(sandbox, now);
|
|
119
|
-
rec = {
|
|
137
|
+
rec = {
|
|
138
|
+
id: sandbox.sandboxId, provider: provider.name, createdAt: now, lastUsedAt: now,
|
|
139
|
+
...(config.sandboxScope === 'run' && run.runId ? { runId: run.runId } : {}),
|
|
140
|
+
};
|
|
120
141
|
created = true;
|
|
121
142
|
}
|
|
122
143
|
await kv.set(sandboxKey(run.threadId), JSON.stringify(rec), { exSeconds: Math.ceil(lifetime / 1000) });
|
|
123
|
-
return { sandbox: sandbox, created, lost };
|
|
144
|
+
return { sandbox: sandbox, created, lost, restored: provider.restoresWorkdir === true };
|
|
124
145
|
}
|
|
125
146
|
async function connect(provider, id) {
|
|
126
147
|
const held = handles.get(id);
|
|
@@ -160,6 +181,80 @@ export async function destroyThreadSandbox(deps, threadId) {
|
|
|
160
181
|
await destroyQuietly(deps, provider, rec.id);
|
|
161
182
|
await deps.kv.del(sandboxKey(threadId)).catch(() => undefined);
|
|
162
183
|
}
|
|
184
|
+
/** Ends the sandbox a run made, when the run is done with it
|
|
185
|
+
* (`sandboxScope: 'run'` only; otherwise it does nothing). `parked` says the
|
|
186
|
+
* run is waiting rather than ended: then the sandbox is kept when
|
|
187
|
+
* `sandboxKeepOnPark`, and otherwise a mark is left so the resumed run is
|
|
188
|
+
* told its files are gone. A sandbox another run made is left alone. Never
|
|
189
|
+
* throws: the sandbox's own timeout ends it anyway. */
|
|
190
|
+
export async function releaseRunSandbox(deps, threadId, runId, parked) {
|
|
191
|
+
const provider = deps.tools?.sandbox;
|
|
192
|
+
if (!provider || !runId || deps.config.sandboxScope !== 'run')
|
|
193
|
+
return;
|
|
194
|
+
if (parked && deps.config.sandboxKeepOnPark)
|
|
195
|
+
return;
|
|
196
|
+
try {
|
|
197
|
+
const key = sandboxKey(threadId);
|
|
198
|
+
const raw = await deps.kv.get(key);
|
|
199
|
+
const rec = parse(raw);
|
|
200
|
+
if (!rec || rec.released || rec.runId !== runId || rec.provider !== provider.name)
|
|
201
|
+
return;
|
|
202
|
+
await destroyQuietly(deps, provider, rec.id);
|
|
203
|
+
if (!parked) {
|
|
204
|
+
await deps.kv.delIfValue(key, raw);
|
|
205
|
+
return;
|
|
206
|
+
}
|
|
207
|
+
await deps.kv.set(key, JSON.stringify({ ...rec, released: true }), {
|
|
208
|
+
exSeconds: Math.ceil(deps.config.sandboxMaxLifetimeMs / 1000),
|
|
209
|
+
});
|
|
210
|
+
}
|
|
211
|
+
catch (err) {
|
|
212
|
+
(deps.log ?? console).error('sandbox release not recorded', { threadId, runId, err });
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
/** Runs one tool call and, when it used the sandbox and the app set
|
|
216
|
+
* `afterSandboxCall`, calls the hook once after it. What the hook throws
|
|
217
|
+
* becomes the call's error, unless the call failed on its own. `call` gets
|
|
218
|
+
* the ToolRun to hand the tool, which notes the sandbox it used. A park is
|
|
219
|
+
* not a failure: the hook sees no error for it. */
|
|
220
|
+
export async function callWithSandboxHook(run, toolName, toolCallId, isPark, call) {
|
|
221
|
+
const hook = run?.deps.tools?.afterSandboxCall;
|
|
222
|
+
if (!run || !hook)
|
|
223
|
+
return call(run);
|
|
224
|
+
let used;
|
|
225
|
+
const tracked = { ...run, onSandbox: (s) => { used = s; } };
|
|
226
|
+
let out;
|
|
227
|
+
let failed = false;
|
|
228
|
+
let error;
|
|
229
|
+
try {
|
|
230
|
+
out = await call(tracked);
|
|
231
|
+
}
|
|
232
|
+
catch (err) {
|
|
233
|
+
failed = true;
|
|
234
|
+
error = err;
|
|
235
|
+
}
|
|
236
|
+
if (used) {
|
|
237
|
+
const ownError = failed && !isPark(error);
|
|
238
|
+
try {
|
|
239
|
+
await hook({
|
|
240
|
+
threadId: run.threadId,
|
|
241
|
+
...(run.runId ? { runId: run.runId } : {}),
|
|
242
|
+
agentId: run.agentId,
|
|
243
|
+
toolName,
|
|
244
|
+
...(toolCallId ? { toolCallId } : {}),
|
|
245
|
+
sandbox: used,
|
|
246
|
+
...(ownError ? { error } : {}),
|
|
247
|
+
});
|
|
248
|
+
}
|
|
249
|
+
catch (hookErr) {
|
|
250
|
+
if (!failed)
|
|
251
|
+
throw hookErr;
|
|
252
|
+
}
|
|
253
|
+
}
|
|
254
|
+
if (failed)
|
|
255
|
+
throw error;
|
|
256
|
+
return out;
|
|
257
|
+
}
|
|
163
258
|
function parse(raw) {
|
|
164
259
|
if (!raw)
|
|
165
260
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandbox.js","sourceRoot":"","sources":["../../../src/core/builtin/sandbox.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,EAAsC,MAAM,wBAAwB,CAAC;AACvH,OAAO,EAAE,SAAS,EAAgB,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"sandbox.js","sourceRoot":"","sources":["../../../src/core/builtin/sandbox.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,12 @@ export interface WebFetchOptions {
|
|
|
24
24
|
/** Registry key of the small model that answers a `prompt` from the page.
|
|
25
25
|
* Default: the config's `compactionModel`. */
|
|
26
26
|
model?: string;
|
|
27
|
+
/** Open only a link a web_search on this thread returned, or one the user
|
|
28
|
+
* wrote in a message. Any other url, a link found on a page or one the
|
|
29
|
+
* model made up, gets an error it can read. It keeps text on a page from
|
|
30
|
+
* sending the agent to a url of its choosing, with private data in the
|
|
31
|
+
* query string. */
|
|
32
|
+
onlyKnownUrls?: boolean;
|
|
27
33
|
}
|
|
28
34
|
export declare function runWebSearch(search: Search, options: WebSearchOptions, args: Record<string, unknown>, run: ToolRun, signal: AbortSignal | undefined): Promise<{
|
|
29
35
|
error: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../../src/core/builtin/web.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAI7F,OAAO,EAA+B,KAAK,OAAO,EAAE,MAAM,UAAU,CAAC;AAErE,MAAM,WAAW,gBAAgB;IAC/B,0EAA0E;IAC1E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;kEAC8D;IAC9D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;kEAG8D;IAC9D,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,+DAA+D;IAC/D,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,2DAA2D;IAC3D,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC9B,oEAAoE;IACpE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gDAAgD;IAChD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;mDAC+C;IAC/C,KAAK,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../../src/core/builtin/web.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAI7F,OAAO,EAA+B,KAAK,OAAO,EAAE,MAAM,UAAU,CAAC;AAErE,MAAM,WAAW,gBAAgB;IAC/B,0EAA0E;IAC1E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;kEAC8D;IAC9D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;kEAG8D;IAC9D,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,+DAA+D;IAC/D,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,2DAA2D;IAC3D,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC9B,oEAAoE;IACpE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gDAAgD;IAChD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;mDAC+C;IAC/C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;wBAIoB;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAwFD,wBAAsB,YAAY,CAChC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,gBAAgB,EACzB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,WAAW,GAAG,SAAS;;;;;;;;;;GA2ChC;AAMD,wBAAsB,WAAW,CAC/B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,WAAW,GAAG,SAAS;;;;;;;;;;;;;GA8EhC;AAED,YAAY,EAAE,gBAAgB,EAAE,CAAC"}
|
package/dist/core/builtin/web.js
CHANGED
|
@@ -15,6 +15,53 @@ const usesKey = (run, tool) => `agent:tool:uses:${scopeOf(run)}:${tool}`;
|
|
|
15
15
|
// later turn must read the same id as the same page.
|
|
16
16
|
const searchKey = (run) => `agent:tool:searches:${run.threadId}`;
|
|
17
17
|
const refKey = (run, id) => `agent:tool:ref:${run.threadId}:${id}`;
|
|
18
|
+
/** Marks a link a search on the thread returned, by its sameUrl form. */
|
|
19
|
+
const knownKey = (run, url) => `agent:tool:known:${run.threadId}:${sameUrl(url)}`;
|
|
20
|
+
/** A link reduced to what makes it the same page: host without "www.", path
|
|
21
|
+
* without a trailing slash, and the query. The scheme and the fragment do
|
|
22
|
+
* not count, so a user's "example.com/menu" matches the model's
|
|
23
|
+
* "https://www.example.com/menu/". */
|
|
24
|
+
function sameUrl(raw) {
|
|
25
|
+
let s = raw.trim();
|
|
26
|
+
if (!/^https?:\/\//i.test(s))
|
|
27
|
+
s = `https://${s}`;
|
|
28
|
+
try {
|
|
29
|
+
const u = new URL(s);
|
|
30
|
+
const host = u.host.toLowerCase().replace(/^www\./, '');
|
|
31
|
+
return host + u.pathname.replace(/\/$/, '') + u.search;
|
|
32
|
+
}
|
|
33
|
+
catch {
|
|
34
|
+
return s.toLowerCase();
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
/** Links in what the user wrote, with or without a scheme. */
|
|
38
|
+
const USER_LINK = /\b(?:https?:\/\/)?(?:[a-z0-9-]+\.)+[a-z]{2,}(?:\/[^\s<>"'()[\]]*)?/gi;
|
|
39
|
+
/** A stored message's text: a plain string, or its text parts. */
|
|
40
|
+
function messageText(content) {
|
|
41
|
+
if (typeof content === 'string')
|
|
42
|
+
return content;
|
|
43
|
+
if (!Array.isArray(content))
|
|
44
|
+
return '';
|
|
45
|
+
return content
|
|
46
|
+
.map((p) => (p && typeof p === 'object' && typeof p.text === 'string' ? p.text : ''))
|
|
47
|
+
.filter(Boolean)
|
|
48
|
+
.join('\n');
|
|
49
|
+
}
|
|
50
|
+
/** Whether a search on the thread returned url, or the user wrote it. */
|
|
51
|
+
async function knownUrl(run, url) {
|
|
52
|
+
if (await run.deps.kv.get(knownKey(run, url)))
|
|
53
|
+
return true;
|
|
54
|
+
const want = sameUrl(url);
|
|
55
|
+
for (const m of await run.deps.storage.messages.list(run.threadId, { agentId: null })) {
|
|
56
|
+
if (m.role !== 'user')
|
|
57
|
+
continue;
|
|
58
|
+
for (const link of messageText(m.content).match(USER_LINK) ?? []) {
|
|
59
|
+
if (sameUrl(link.replace(/[.,;:!?]+$/, '')) === want)
|
|
60
|
+
return true;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
return false;
|
|
64
|
+
}
|
|
18
65
|
/** Count one use and say whether it is over the run's limit. */
|
|
19
66
|
async function overLimit(run, tool, maxUses) {
|
|
20
67
|
if (!maxUses)
|
|
@@ -78,8 +125,10 @@ export async function runWebSearch(search, options, args, run, signal) {
|
|
|
78
125
|
snippet: cut(h.snippet, 500).text,
|
|
79
126
|
...(h.publishedAt ? { publishedAt: h.publishedAt } : {}),
|
|
80
127
|
}));
|
|
81
|
-
for (const r of results)
|
|
128
|
+
for (const r of results) {
|
|
82
129
|
await run.deps.kv.set(refKey(run, r.id), r.url, { exSeconds: refTtlSeconds(run) });
|
|
130
|
+
await run.deps.kv.set(knownKey(run, r.url), '1', { exSeconds: refTtlSeconds(run) });
|
|
131
|
+
}
|
|
83
132
|
await publishSources(run, results);
|
|
84
133
|
return { results };
|
|
85
134
|
}
|
|
@@ -100,6 +149,9 @@ export async function runWebFetch(fetcher, options, args, run, signal) {
|
|
|
100
149
|
return failed('web_fetch needs a url or the id of a search result');
|
|
101
150
|
if (!/^https?:\/\//i.test(url))
|
|
102
151
|
return failed(`web_fetch: ${url} is not an http or https address`);
|
|
152
|
+
if (options.onlyKnownUrls && !(await knownUrl(run, url))) {
|
|
153
|
+
return failed(`web_fetch can only open a link from your web_search results or one the user gave; ${url} is neither`);
|
|
154
|
+
}
|
|
103
155
|
if (await overLimit(run, 'web_fetch', options.maxUses)) {
|
|
104
156
|
return failed(`web_fetch can be used ${options.maxUses} times in one run, and that is used up`);
|
|
105
157
|
}
|
|
@@ -140,21 +192,21 @@ export async function runWebFetch(fetcher, options, args, run, signal) {
|
|
|
140
192
|
? cut(page.content, Math.max(window - 4_000, 1_000) * 3)
|
|
141
193
|
: { text: page.content, cut: false };
|
|
142
194
|
try {
|
|
143
|
-
const { text,
|
|
195
|
+
const { text, finalStep } = await generateText({
|
|
144
196
|
model: reader.instance(),
|
|
145
|
-
|
|
197
|
+
instructions: READER_SYSTEM,
|
|
146
198
|
prompt: `<page url="${page.url}" title="${page.title.replace(/"/g, "'")}">\n${fit.text}\n</page>\n\nQuestion: ${prompt}`,
|
|
147
199
|
...(signal ? { abortSignal: signal } : {}),
|
|
148
200
|
});
|
|
149
|
-
const meta =
|
|
201
|
+
const meta = finalStep.providerMetadata;
|
|
150
202
|
await recordToolUsage(run, {
|
|
151
203
|
kind: 'tool',
|
|
152
204
|
step: 0,
|
|
153
205
|
model: key,
|
|
154
206
|
modelId: wireId(reader, key),
|
|
155
207
|
outcome: 'finished',
|
|
156
|
-
providerMetadata: { tool: 'web_fetch', ...(providerMeta(meta,
|
|
157
|
-
...fillTokens(usage, meta),
|
|
208
|
+
providerMetadata: { tool: 'web_fetch', ...(providerMeta(meta, finalStep.response) ?? {}) },
|
|
209
|
+
...fillTokens(finalStep.usage, meta),
|
|
158
210
|
});
|
|
159
211
|
const answer = cut(text, cap);
|
|
160
212
|
const partial = answer.cut || fit.cut || page.truncated;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web.js","sourceRoot":"","sources":["../../../src/core/builtin/web.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"web.js","sourceRoot":"","sources":["../../../src/core/builtin/web.ts"],"names":[],"mappings":"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"}
|
package/dist/core/cache.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../src/core/cache.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;4BAU4B;AAC5B,MAAM,WAAW,oBAAoB;IACnC,uEAAuE;IACvE,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAQD,UAAU,gBAAgB;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;
|
|
1
|
+
{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../src/core/cache.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;4BAU4B;AAC5B,MAAM,WAAW,oBAAoB;IACnC,uEAAuE;IACvE,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAQD,UAAU,gBAAgB;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAwCD;;;;;6EAK6E;AAC7E,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,QAAQ,SAAc,GACrB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAM/D;AAED;wEACwE;AACxE,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,gBAAgB,EAC1D,QAAQ,EAAE,CAAC,EAAE,EACb,IAAI,GAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/B,CAAC,EAAE,CAaL"}
|
package/dist/core/cache.js
CHANGED
|
@@ -11,9 +11,9 @@ function toParts(content) {
|
|
|
11
11
|
/** Stamp the marker where the SDK will actually read it.
|
|
12
12
|
*
|
|
13
13
|
* Two rules, and breaking either one is silent:
|
|
14
|
-
* - The SDK reads `providerOptions
|
|
15
|
-
*
|
|
16
|
-
*
|
|
14
|
+
* - The SDK reads `providerOptions`. A bare `providerMetadata` is read by
|
|
15
|
+
* nothing, so stamping that alone leaves the breakpoint inert — set, and
|
|
16
|
+
* never seen by a provider.
|
|
17
17
|
* - A SYSTEM message's content must stay a string; it carries its metadata on
|
|
18
18
|
* the message itself. Splitting it into parts the way a user message allows
|
|
19
19
|
* makes the whole prompt fail validation, and every run throws. */
|
|
@@ -22,7 +22,6 @@ function stampCacheBreakpoint(message, provider) {
|
|
|
22
22
|
return {
|
|
23
23
|
...message,
|
|
24
24
|
providerOptions: cacheStamp(provider),
|
|
25
|
-
experimental_providerMetadata: cacheStamp(provider),
|
|
26
25
|
};
|
|
27
26
|
}
|
|
28
27
|
const parts = toParts(message.content);
|
|
@@ -33,7 +32,6 @@ function stampCacheBreakpoint(message, provider) {
|
|
|
33
32
|
stamped[stamped.length - 1] = {
|
|
34
33
|
...last,
|
|
35
34
|
providerOptions: cacheStamp(provider),
|
|
36
|
-
experimental_providerMetadata: cacheStamp(provider),
|
|
37
35
|
};
|
|
38
36
|
return { ...message, content: stamped };
|
|
39
37
|
}
|
|
@@ -48,7 +46,6 @@ export function systemCacheMessage(system, provider = 'anthropic') {
|
|
|
48
46
|
role: 'system',
|
|
49
47
|
content: system,
|
|
50
48
|
providerOptions: cacheStamp(provider),
|
|
51
|
-
experimental_providerMetadata: cacheStamp(provider),
|
|
52
49
|
};
|
|
53
50
|
}
|
|
54
51
|
/** Mark the stable prefix of a prompt for provider-side caching:
|
package/dist/core/cache.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/core/cache.ts"],"names":[],"mappings":"AA4BA,MAAM,UAAU,GAAG,CAAC,QAAgB,EAAE,EAAE,CAAC,CAAC;IACxC,CAAC,QAAQ,CAAC,EAAE,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE;CACpD,CAAC,CAAC;AAEH,SAAS,OAAO,CAAC,OAAgB;IAC/B,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC1E,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QAAE,OAAO,OAA0B,CAAC;IAC9D,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;;;;;;;uEAQuE;AACvE,SAAS,oBAAoB,CAA6B,OAAU,EAAE,QAAgB;IACpF,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO;YACL,GAAG,OAAO;YACV,eAAe,EAAE,UAAU,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/core/cache.ts"],"names":[],"mappings":"AA4BA,MAAM,UAAU,GAAG,CAAC,QAAgB,EAAE,EAAE,CAAC,CAAC;IACxC,CAAC,QAAQ,CAAC,EAAE,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE;CACpD,CAAC,CAAC;AAEH,SAAS,OAAO,CAAC,OAAgB;IAC/B,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC1E,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QAAE,OAAO,OAA0B,CAAC;IAC9D,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;;;;;;;uEAQuE;AACvE,SAAS,oBAAoB,CAA6B,OAAU,EAAE,QAAgB;IACpF,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO;YACL,GAAG,OAAO;YACV,eAAe,EAAE,UAAU,CAAC,QAAQ,CAAC;SACtC,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,OAAO,CAAC;IACvC,MAAM,OAAO,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;IAC3B,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC;IAC1C,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG;QAC5B,GAAG,IAAI;QACP,eAAe,EAAE,UAAU,CAAC,QAAQ,CAAC;KACtC,CAAC;IACF,OAAO,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;AAC1C,CAAC;AAED;;;;;6EAK6E;AAC7E,MAAM,UAAU,kBAAkB,CAChC,MAAc,EACd,QAAQ,GAAG,WAAW;IAEtB,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,MAAM;QACf,eAAe,EAAE,UAAU,CAAC,QAAQ,CAAC;KACtC,CAAC;AACJ,CAAC;AAED;wEACwE;AACxE,MAAM,UAAU,iBAAiB,CAC/B,QAAa,EACb,OAA8B,EAAE;IAEhC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,WAAW,CAAC;IAC9C,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IAE5C,MAAM,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;IAC9D,IAAI,WAAW,IAAI,CAAC;QAAE,GAAG,CAAC,WAAW,CAAC,GAAG,oBAAoB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,QAAQ,CAAC,CAAC;IAE1F,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnB,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;QAC5B,GAAG,CAAC,IAAI,CAAC,GAAG,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;IACxD,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}
|
package/dist/core/context.d.ts
CHANGED
|
@@ -25,6 +25,24 @@ export interface CompactOptions {
|
|
|
25
25
|
/** The run's ledger, so the summary call counts against the run's caps like
|
|
26
26
|
* any other call. Absent records the row on its own. */
|
|
27
27
|
ledger?: RunLedger;
|
|
28
|
+
/** Compact whatever the history's size: everything older than the recent
|
|
29
|
+
* tail goes into the summary. Used when a provider has refused a prompt as
|
|
30
|
+
* too long, and for a compaction someone asked for. */
|
|
31
|
+
force?: boolean;
|
|
28
32
|
}
|
|
29
33
|
export declare function compactContext(deps: RuntimePorts, threadId: string, model: string, opts?: CompactOptions): Promise<MessageDTO[]>;
|
|
34
|
+
/** Whether a model call was refused because the prompt did not fit the
|
|
35
|
+
* model's context window. A rate limit (429) never is, whatever its
|
|
36
|
+
* wording: compacting would not help it. */
|
|
37
|
+
export declare function isContextOverflow(err: unknown): boolean;
|
|
38
|
+
/** How much history one summary call carries: half the compaction model's
|
|
39
|
+
* own window, leaving room for its answer and for the estimate being rough.
|
|
40
|
+
* The history can be larger than the summarizer's window, and a call past it
|
|
41
|
+
* would be refused. */
|
|
42
|
+
export declare function summaryChunkTokens(deps: RuntimePorts): number;
|
|
43
|
+
/** Packs lines in order into chunks of at most `limit` tokens. A line larger
|
|
44
|
+
* than a chunk keeps its start and end; its middle goes. */
|
|
45
|
+
export declare function chunkLines(lines: string[], limit: number): string[];
|
|
46
|
+
/** Cuts a line past `limit` tokens down to its start and end. */
|
|
47
|
+
export declare function trimMiddle(line: string, limit: number): string;
|
|
30
48
|
//# sourceMappingURL=context.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/core/context.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAY,MAAM,YAAY,CAAC;AAErE,OAAO,EAAwC,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAIlF,yDAAyD;AACzD,eAAO,MAAM,qBAAqB,SAAU,CAAC;AAS7C;;yDAEyD;AACzD,wBAAgB,aAAa,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAavE;AAED;;;iCAGiC;AACjC,eAAO,MAAM,cAAc,GAAI,SAAS,OAAO,WACA,CAAC;AAEhD;kDACkD;AAClD,wBAAsB,YAAY,CAChC,IAAI,EAAE,YAAY,EAClB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,YAAY,CAAC,CAUvB;AAED,+DAA+D;AAC/D,MAAM,WAAW,cAAc;IAC7B;yCACqC;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B;6DACyD;IACzD,MAAM,CAAC,EAAE,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/core/context.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAY,MAAM,YAAY,CAAC;AAErE,OAAO,EAAwC,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAIlF,yDAAyD;AACzD,eAAO,MAAM,qBAAqB,SAAU,CAAC;AAS7C;;yDAEyD;AACzD,wBAAgB,aAAa,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAavE;AAED;;;iCAGiC;AACjC,eAAO,MAAM,cAAc,GAAI,SAAS,OAAO,WACA,CAAC;AAEhD;kDACkD;AAClD,wBAAsB,YAAY,CAChC,IAAI,EAAE,YAAY,EAClB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,YAAY,CAAC,CAUvB;AAED,+DAA+D;AAC/D,MAAM,WAAW,cAAc;IAC7B;yCACqC;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B;6DACyD;IACzD,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB;;4DAEwD;IACxD,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AASD,wBAAsB,cAAc,CAClC,IAAI,EAAE,YAAY,EAClB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,IAAI,GAAE,cAAmB,GACxB,OAAO,CAAC,UAAU,EAAE,CAAC,CAqDvB;AA2BD;;6CAE6C;AAC7C,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAKvD;AAcD;;;wBAGwB;AACxB,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CAE7D;AAyBD;6DAC6D;AAC7D,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAiBnE;AAED,iEAAiE;AACjE,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAM9D"}
|