agents 0.0.0-851f7e1 → 0.0.0-85b0bb0
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/ai-chat-agent.d.ts +46 -4
- package/dist/ai-chat-agent.js +138 -68
- package/dist/ai-chat-agent.js.map +1 -1
- package/dist/ai-react.d.ts +17 -4
- package/dist/ai-react.js +48 -37
- package/dist/ai-react.js.map +1 -1
- package/dist/ai-types.d.ts +5 -0
- package/dist/{chunk-XG52S6YY.js → chunk-4CIGD73X.js} +360 -160
- package/dist/chunk-4CIGD73X.js.map +1 -0
- package/dist/chunk-767EASBA.js +106 -0
- package/dist/chunk-767EASBA.js.map +1 -0
- package/dist/chunk-E3LCYPCB.js +469 -0
- package/dist/chunk-E3LCYPCB.js.map +1 -0
- package/dist/chunk-NKZZ66QY.js +116 -0
- package/dist/chunk-NKZZ66QY.js.map +1 -0
- package/dist/client.d.ts +15 -1
- package/dist/client.js +6 -126
- package/dist/client.js.map +1 -1
- package/dist/index.d.ts +124 -14
- package/dist/index.js +8 -6
- package/dist/mcp/client.d.ts +313 -21
- package/dist/mcp/client.js +3 -402
- package/dist/mcp/client.js.map +1 -1
- package/dist/mcp/do-oauth-client-provider.d.ts +3 -3
- package/dist/mcp/do-oauth-client-provider.js +3 -103
- package/dist/mcp/do-oauth-client-provider.js.map +1 -1
- package/dist/mcp/index.d.ts +44 -5
- package/dist/mcp/index.js +593 -159
- package/dist/mcp/index.js.map +1 -1
- package/dist/react.d.ts +85 -5
- package/dist/react.js +20 -8
- package/dist/react.js.map +1 -1
- package/dist/schedule.d.ts +2 -2
- package/dist/schedule.js +4 -6
- package/dist/schedule.js.map +1 -1
- package/dist/serializable.d.ts +32 -0
- package/dist/serializable.js +1 -0
- package/package.json +70 -56
- package/src/index.ts +431 -86
- package/dist/chunk-HMLY7DHA.js +0 -16
- package/dist/chunk-XG52S6YY.js.map +0 -1
- /package/dist/{chunk-HMLY7DHA.js.map → serializable.js.map} +0 -0
|
@@ -1,19 +1,22 @@
|
|
|
1
1
|
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
} from "./chunk-
|
|
2
|
+
MCPClientManager
|
|
3
|
+
} from "./chunk-E3LCYPCB.js";
|
|
4
|
+
import {
|
|
5
|
+
DurableObjectOAuthClientProvider
|
|
6
|
+
} from "./chunk-767EASBA.js";
|
|
7
|
+
import {
|
|
8
|
+
camelCaseToKebabCase
|
|
9
|
+
} from "./chunk-NKZZ66QY.js";
|
|
7
10
|
|
|
8
11
|
// src/index.ts
|
|
12
|
+
import { AsyncLocalStorage } from "async_hooks";
|
|
13
|
+
import { parseCronExpression } from "cron-schedule";
|
|
14
|
+
import { nanoid } from "nanoid";
|
|
9
15
|
import {
|
|
10
|
-
|
|
16
|
+
getServerByName,
|
|
11
17
|
routePartykitRequest,
|
|
12
|
-
|
|
18
|
+
Server
|
|
13
19
|
} from "partyserver";
|
|
14
|
-
import { parseCronExpression } from "cron-schedule";
|
|
15
|
-
import { nanoid } from "nanoid";
|
|
16
|
-
import { AsyncLocalStorage } from "node:async_hooks";
|
|
17
20
|
function isRPCRequest(msg) {
|
|
18
21
|
return typeof msg === "object" && msg !== null && "type" in msg && msg.type === "rpc" && "id" in msg && typeof msg.id === "string" && "method" in msg && typeof msg.method === "string" && "args" in msg && Array.isArray(msg.args);
|
|
19
22
|
}
|
|
@@ -36,18 +39,72 @@ function getNextCronTime(cron) {
|
|
|
36
39
|
var STATE_ROW_ID = "cf_state_row_id";
|
|
37
40
|
var STATE_WAS_CHANGED = "cf_state_was_changed";
|
|
38
41
|
var DEFAULT_STATE = {};
|
|
39
|
-
var
|
|
40
|
-
|
|
42
|
+
var agentContext = new AsyncLocalStorage();
|
|
43
|
+
function getCurrentAgent() {
|
|
44
|
+
const store = agentContext.getStore();
|
|
45
|
+
if (!store) {
|
|
46
|
+
return {
|
|
47
|
+
agent: void 0,
|
|
48
|
+
connection: void 0,
|
|
49
|
+
request: void 0
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
return store;
|
|
53
|
+
}
|
|
41
54
|
var Agent = class extends Server {
|
|
42
55
|
constructor(ctx, env) {
|
|
43
56
|
super(ctx, env);
|
|
44
|
-
|
|
45
|
-
|
|
57
|
+
this._state = DEFAULT_STATE;
|
|
58
|
+
this._ParentClass = Object.getPrototypeOf(this).constructor;
|
|
59
|
+
this.mcp = new MCPClientManager(this._ParentClass.name, "0.0.1");
|
|
46
60
|
/**
|
|
47
61
|
* Initial state for the Agent
|
|
48
62
|
* Override to provide default state values
|
|
49
63
|
*/
|
|
50
64
|
this.initialState = DEFAULT_STATE;
|
|
65
|
+
/**
|
|
66
|
+
* Method called when an alarm fires.
|
|
67
|
+
* Executes any scheduled tasks that are due.
|
|
68
|
+
*
|
|
69
|
+
* @remarks
|
|
70
|
+
* To schedule a task, please use the `this.schedule` method instead.
|
|
71
|
+
* See {@link https://developers.cloudflare.com/agents/api-reference/schedule-tasks/}
|
|
72
|
+
*/
|
|
73
|
+
this.alarm = async () => {
|
|
74
|
+
const now = Math.floor(Date.now() / 1e3);
|
|
75
|
+
const result = this.sql`
|
|
76
|
+
SELECT * FROM cf_agents_schedules WHERE time <= ${now}
|
|
77
|
+
`;
|
|
78
|
+
for (const row of result || []) {
|
|
79
|
+
const callback = this[row.callback];
|
|
80
|
+
if (!callback) {
|
|
81
|
+
console.error(`callback ${row.callback} not found`);
|
|
82
|
+
continue;
|
|
83
|
+
}
|
|
84
|
+
await agentContext.run(
|
|
85
|
+
{ agent: this, connection: void 0, request: void 0 },
|
|
86
|
+
async () => {
|
|
87
|
+
try {
|
|
88
|
+
await callback.bind(this)(JSON.parse(row.payload), row);
|
|
89
|
+
} catch (e) {
|
|
90
|
+
console.error(`error executing callback "${row.callback}"`, e);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
);
|
|
94
|
+
if (row.type === "cron") {
|
|
95
|
+
const nextExecutionTime = getNextCronTime(row.cron);
|
|
96
|
+
const nextTimestamp = Math.floor(nextExecutionTime.getTime() / 1e3);
|
|
97
|
+
this.sql`
|
|
98
|
+
UPDATE cf_agents_schedules SET time = ${nextTimestamp} WHERE id = ${row.id}
|
|
99
|
+
`;
|
|
100
|
+
} else {
|
|
101
|
+
this.sql`
|
|
102
|
+
DELETE FROM cf_agents_schedules WHERE id = ${row.id}
|
|
103
|
+
`;
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
await this._scheduleNextAlarm();
|
|
107
|
+
};
|
|
51
108
|
this.sql`
|
|
52
109
|
CREATE TABLE IF NOT EXISTS cf_agents_state (
|
|
53
110
|
id TEXT PRIMARY KEY NOT NULL,
|
|
@@ -55,7 +112,7 @@ var Agent = class extends Server {
|
|
|
55
112
|
)
|
|
56
113
|
`;
|
|
57
114
|
void this.ctx.blockConcurrencyWhile(async () => {
|
|
58
|
-
return
|
|
115
|
+
return this._tryCatch(async () => {
|
|
59
116
|
this.sql`
|
|
60
117
|
CREATE TABLE IF NOT EXISTS cf_agents_schedules (
|
|
61
118
|
id TEXT PRIMARY KEY NOT NULL DEFAULT (randomblob(9)),
|
|
@@ -71,22 +128,55 @@ var Agent = class extends Server {
|
|
|
71
128
|
await this.alarm();
|
|
72
129
|
});
|
|
73
130
|
});
|
|
131
|
+
this.sql`
|
|
132
|
+
CREATE TABLE IF NOT EXISTS cf_agents_mcp_servers (
|
|
133
|
+
id TEXT PRIMARY KEY NOT NULL,
|
|
134
|
+
name TEXT NOT NULL,
|
|
135
|
+
server_url TEXT NOT NULL,
|
|
136
|
+
callback_url TEXT NOT NULL,
|
|
137
|
+
client_id TEXT,
|
|
138
|
+
auth_url TEXT,
|
|
139
|
+
server_options TEXT
|
|
140
|
+
)
|
|
141
|
+
`;
|
|
142
|
+
const _onRequest = this.onRequest.bind(this);
|
|
143
|
+
this.onRequest = (request) => {
|
|
144
|
+
return agentContext.run(
|
|
145
|
+
{ agent: this, connection: void 0, request },
|
|
146
|
+
async () => {
|
|
147
|
+
if (this.mcp.isCallbackRequest(request)) {
|
|
148
|
+
await this.mcp.handleCallbackRequest(request);
|
|
149
|
+
this.broadcast(
|
|
150
|
+
JSON.stringify({
|
|
151
|
+
mcp: this.getMcpServers(),
|
|
152
|
+
type: "cf_agent_mcp_servers"
|
|
153
|
+
})
|
|
154
|
+
);
|
|
155
|
+
return new Response("<script>window.close();</script>", {
|
|
156
|
+
headers: { "content-type": "text/html" },
|
|
157
|
+
status: 200
|
|
158
|
+
});
|
|
159
|
+
}
|
|
160
|
+
return this._tryCatch(() => _onRequest(request));
|
|
161
|
+
}
|
|
162
|
+
);
|
|
163
|
+
};
|
|
74
164
|
const _onMessage = this.onMessage.bind(this);
|
|
75
165
|
this.onMessage = async (connection, message) => {
|
|
76
|
-
return
|
|
166
|
+
return agentContext.run(
|
|
77
167
|
{ agent: this, connection, request: void 0 },
|
|
78
168
|
async () => {
|
|
79
169
|
if (typeof message !== "string") {
|
|
80
|
-
return
|
|
170
|
+
return this._tryCatch(() => _onMessage(connection, message));
|
|
81
171
|
}
|
|
82
172
|
let parsed;
|
|
83
173
|
try {
|
|
84
174
|
parsed = JSON.parse(message);
|
|
85
|
-
} catch (
|
|
86
|
-
return
|
|
175
|
+
} catch (_e) {
|
|
176
|
+
return this._tryCatch(() => _onMessage(connection, message));
|
|
87
177
|
}
|
|
88
178
|
if (isStateUpdateMessage(parsed)) {
|
|
89
|
-
|
|
179
|
+
this._setStateInternal(parsed.state, connection);
|
|
90
180
|
return;
|
|
91
181
|
}
|
|
92
182
|
if (isRPCRequest(parsed)) {
|
|
@@ -96,7 +186,7 @@ var Agent = class extends Server {
|
|
|
96
186
|
if (typeof methodFn !== "function") {
|
|
97
187
|
throw new Error(`Method ${method} does not exist`);
|
|
98
188
|
}
|
|
99
|
-
if (!
|
|
189
|
+
if (!this._isCallable(method)) {
|
|
100
190
|
throw new Error(`Method ${method} is not callable`);
|
|
101
191
|
}
|
|
102
192
|
const metadata = callableMetadata.get(methodFn);
|
|
@@ -107,55 +197,94 @@ var Agent = class extends Server {
|
|
|
107
197
|
}
|
|
108
198
|
const result = await methodFn.apply(this, args);
|
|
109
199
|
const response = {
|
|
110
|
-
|
|
200
|
+
done: true,
|
|
111
201
|
id,
|
|
112
|
-
success: true,
|
|
113
202
|
result,
|
|
114
|
-
|
|
203
|
+
success: true,
|
|
204
|
+
type: "rpc"
|
|
115
205
|
};
|
|
116
206
|
connection.send(JSON.stringify(response));
|
|
117
207
|
} catch (e) {
|
|
118
208
|
const response = {
|
|
119
|
-
|
|
209
|
+
error: e instanceof Error ? e.message : "Unknown error occurred",
|
|
120
210
|
id: parsed.id,
|
|
121
211
|
success: false,
|
|
122
|
-
|
|
212
|
+
type: "rpc"
|
|
123
213
|
};
|
|
124
214
|
connection.send(JSON.stringify(response));
|
|
125
215
|
console.error("RPC error:", e);
|
|
126
216
|
}
|
|
127
217
|
return;
|
|
128
218
|
}
|
|
129
|
-
return
|
|
219
|
+
return this._tryCatch(() => _onMessage(connection, message));
|
|
130
220
|
}
|
|
131
221
|
);
|
|
132
222
|
};
|
|
133
223
|
const _onConnect = this.onConnect.bind(this);
|
|
134
224
|
this.onConnect = (connection, ctx2) => {
|
|
135
|
-
return
|
|
225
|
+
return agentContext.run(
|
|
136
226
|
{ agent: this, connection, request: ctx2.request },
|
|
137
227
|
async () => {
|
|
138
228
|
setTimeout(() => {
|
|
139
229
|
if (this.state) {
|
|
140
230
|
connection.send(
|
|
141
231
|
JSON.stringify({
|
|
142
|
-
|
|
143
|
-
|
|
232
|
+
state: this.state,
|
|
233
|
+
type: "cf_agent_state"
|
|
144
234
|
})
|
|
145
235
|
);
|
|
146
236
|
}
|
|
147
|
-
|
|
237
|
+
connection.send(
|
|
238
|
+
JSON.stringify({
|
|
239
|
+
mcp: this.getMcpServers(),
|
|
240
|
+
type: "cf_agent_mcp_servers"
|
|
241
|
+
})
|
|
242
|
+
);
|
|
243
|
+
return this._tryCatch(() => _onConnect(connection, ctx2));
|
|
148
244
|
}, 20);
|
|
149
245
|
}
|
|
150
246
|
);
|
|
151
247
|
};
|
|
248
|
+
const _onStart = this.onStart.bind(this);
|
|
249
|
+
this.onStart = async () => {
|
|
250
|
+
return agentContext.run(
|
|
251
|
+
{ agent: this, connection: void 0, request: void 0 },
|
|
252
|
+
async () => {
|
|
253
|
+
const servers = this.sql`
|
|
254
|
+
SELECT id, name, server_url, client_id, auth_url, callback_url, server_options FROM cf_agents_mcp_servers;
|
|
255
|
+
`;
|
|
256
|
+
Promise.allSettled(
|
|
257
|
+
servers.map((server) => {
|
|
258
|
+
return this._connectToMcpServerInternal(
|
|
259
|
+
server.name,
|
|
260
|
+
server.server_url,
|
|
261
|
+
server.callback_url,
|
|
262
|
+
server.server_options ? JSON.parse(server.server_options) : void 0,
|
|
263
|
+
{
|
|
264
|
+
id: server.id,
|
|
265
|
+
oauthClientId: server.client_id ?? void 0
|
|
266
|
+
}
|
|
267
|
+
);
|
|
268
|
+
})
|
|
269
|
+
).then((_results) => {
|
|
270
|
+
this.broadcast(
|
|
271
|
+
JSON.stringify({
|
|
272
|
+
mcp: this.getMcpServers(),
|
|
273
|
+
type: "cf_agent_mcp_servers"
|
|
274
|
+
})
|
|
275
|
+
);
|
|
276
|
+
});
|
|
277
|
+
await this._tryCatch(() => _onStart());
|
|
278
|
+
}
|
|
279
|
+
);
|
|
280
|
+
};
|
|
152
281
|
}
|
|
153
282
|
/**
|
|
154
283
|
* Current state of the Agent
|
|
155
284
|
*/
|
|
156
285
|
get state() {
|
|
157
|
-
if (
|
|
158
|
-
return
|
|
286
|
+
if (this._state !== DEFAULT_STATE) {
|
|
287
|
+
return this._state;
|
|
159
288
|
}
|
|
160
289
|
const wasChanged = this.sql`
|
|
161
290
|
SELECT state FROM cf_agents_state WHERE id = ${STATE_WAS_CHANGED}
|
|
@@ -166,8 +295,8 @@ var Agent = class extends Server {
|
|
|
166
295
|
if (wasChanged[0]?.state === "true" || // we do this check for people who updated their code before we shipped wasChanged
|
|
167
296
|
result[0]?.state) {
|
|
168
297
|
const state = result[0]?.state;
|
|
169
|
-
|
|
170
|
-
return
|
|
298
|
+
this._state = JSON.parse(state);
|
|
299
|
+
return this._state;
|
|
171
300
|
}
|
|
172
301
|
if (this.initialState === DEFAULT_STATE) {
|
|
173
302
|
return void 0;
|
|
@@ -195,32 +324,68 @@ var Agent = class extends Server {
|
|
|
195
324
|
throw this.onError(e);
|
|
196
325
|
}
|
|
197
326
|
}
|
|
327
|
+
_setStateInternal(state, source = "server") {
|
|
328
|
+
this._state = state;
|
|
329
|
+
this.sql`
|
|
330
|
+
INSERT OR REPLACE INTO cf_agents_state (id, state)
|
|
331
|
+
VALUES (${STATE_ROW_ID}, ${JSON.stringify(state)})
|
|
332
|
+
`;
|
|
333
|
+
this.sql`
|
|
334
|
+
INSERT OR REPLACE INTO cf_agents_state (id, state)
|
|
335
|
+
VALUES (${STATE_WAS_CHANGED}, ${JSON.stringify(true)})
|
|
336
|
+
`;
|
|
337
|
+
this.broadcast(
|
|
338
|
+
JSON.stringify({
|
|
339
|
+
state,
|
|
340
|
+
type: "cf_agent_state"
|
|
341
|
+
}),
|
|
342
|
+
source !== "server" ? [source.id] : []
|
|
343
|
+
);
|
|
344
|
+
return this._tryCatch(() => {
|
|
345
|
+
const { connection, request } = agentContext.getStore() || {};
|
|
346
|
+
return agentContext.run(
|
|
347
|
+
{ agent: this, connection, request },
|
|
348
|
+
async () => {
|
|
349
|
+
return this.onStateUpdate(state, source);
|
|
350
|
+
}
|
|
351
|
+
);
|
|
352
|
+
});
|
|
353
|
+
}
|
|
198
354
|
/**
|
|
199
355
|
* Update the Agent's state
|
|
200
356
|
* @param state New state to set
|
|
201
357
|
*/
|
|
202
358
|
setState(state) {
|
|
203
|
-
|
|
359
|
+
this._setStateInternal(state, "server");
|
|
204
360
|
}
|
|
205
361
|
/**
|
|
206
362
|
* Called when the Agent's state is updated
|
|
207
363
|
* @param state Updated state
|
|
208
364
|
* @param source Source of the state update ("server" or a client connection)
|
|
209
365
|
*/
|
|
366
|
+
// biome-ignore lint/correctness/noUnusedFunctionParameters: overridden later
|
|
210
367
|
onStateUpdate(state, source) {
|
|
211
368
|
}
|
|
212
369
|
/**
|
|
213
370
|
* Called when the Agent receives an email
|
|
214
371
|
* @param email Email message to process
|
|
215
372
|
*/
|
|
373
|
+
// biome-ignore lint/correctness/noUnusedFunctionParameters: overridden later
|
|
216
374
|
onEmail(email) {
|
|
217
|
-
return
|
|
375
|
+
return agentContext.run(
|
|
218
376
|
{ agent: this, connection: void 0, request: void 0 },
|
|
219
377
|
async () => {
|
|
220
378
|
console.error("onEmail not implemented");
|
|
221
379
|
}
|
|
222
380
|
);
|
|
223
381
|
}
|
|
382
|
+
async _tryCatch(fn) {
|
|
383
|
+
try {
|
|
384
|
+
return await fn();
|
|
385
|
+
} catch (e) {
|
|
386
|
+
throw this.onError(e);
|
|
387
|
+
}
|
|
388
|
+
}
|
|
224
389
|
onError(connectionOrError, error) {
|
|
225
390
|
let theError;
|
|
226
391
|
if (connectionOrError && error) {
|
|
@@ -270,10 +435,10 @@ var Agent = class extends Server {
|
|
|
270
435
|
payload
|
|
271
436
|
)}, 'scheduled', ${timestamp})
|
|
272
437
|
`;
|
|
273
|
-
await
|
|
438
|
+
await this._scheduleNextAlarm();
|
|
274
439
|
return {
|
|
275
|
-
id,
|
|
276
440
|
callback,
|
|
441
|
+
id,
|
|
277
442
|
payload,
|
|
278
443
|
time: timestamp,
|
|
279
444
|
type: "scheduled"
|
|
@@ -288,12 +453,12 @@ var Agent = class extends Server {
|
|
|
288
453
|
payload
|
|
289
454
|
)}, 'delayed', ${when}, ${timestamp})
|
|
290
455
|
`;
|
|
291
|
-
await
|
|
456
|
+
await this._scheduleNextAlarm();
|
|
292
457
|
return {
|
|
293
|
-
id,
|
|
294
458
|
callback,
|
|
295
|
-
payload,
|
|
296
459
|
delayInSeconds: when,
|
|
460
|
+
id,
|
|
461
|
+
payload,
|
|
297
462
|
time: timestamp,
|
|
298
463
|
type: "delayed"
|
|
299
464
|
};
|
|
@@ -307,12 +472,12 @@ var Agent = class extends Server {
|
|
|
307
472
|
payload
|
|
308
473
|
)}, 'cron', ${when}, ${timestamp})
|
|
309
474
|
`;
|
|
310
|
-
await
|
|
475
|
+
await this._scheduleNextAlarm();
|
|
311
476
|
return {
|
|
312
|
-
id,
|
|
313
477
|
callback,
|
|
314
|
-
payload,
|
|
315
478
|
cron: when,
|
|
479
|
+
id,
|
|
480
|
+
payload,
|
|
316
481
|
time: timestamp,
|
|
317
482
|
type: "cron"
|
|
318
483
|
};
|
|
@@ -374,47 +539,21 @@ var Agent = class extends Server {
|
|
|
374
539
|
*/
|
|
375
540
|
async cancelSchedule(id) {
|
|
376
541
|
this.sql`DELETE FROM cf_agents_schedules WHERE id = ${id}`;
|
|
377
|
-
await
|
|
542
|
+
await this._scheduleNextAlarm();
|
|
378
543
|
return true;
|
|
379
544
|
}
|
|
380
|
-
|
|
381
|
-
* Method called when an alarm fires
|
|
382
|
-
* Executes any scheduled tasks that are due
|
|
383
|
-
*/
|
|
384
|
-
async alarm() {
|
|
385
|
-
const now = Math.floor(Date.now() / 1e3);
|
|
545
|
+
async _scheduleNextAlarm() {
|
|
386
546
|
const result = this.sql`
|
|
387
|
-
SELECT
|
|
547
|
+
SELECT time FROM cf_agents_schedules
|
|
548
|
+
WHERE time > ${Math.floor(Date.now() / 1e3)}
|
|
549
|
+
ORDER BY time ASC
|
|
550
|
+
LIMIT 1
|
|
388
551
|
`;
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
continue;
|
|
394
|
-
}
|
|
395
|
-
await unstable_context.run(
|
|
396
|
-
{ agent: this, connection: void 0, request: void 0 },
|
|
397
|
-
async () => {
|
|
398
|
-
try {
|
|
399
|
-
await callback.bind(this)(JSON.parse(row.payload), row);
|
|
400
|
-
} catch (e) {
|
|
401
|
-
console.error(`error executing callback "${row.callback}"`, e);
|
|
402
|
-
}
|
|
403
|
-
}
|
|
404
|
-
);
|
|
405
|
-
if (row.type === "cron") {
|
|
406
|
-
const nextExecutionTime = getNextCronTime(row.cron);
|
|
407
|
-
const nextTimestamp = Math.floor(nextExecutionTime.getTime() / 1e3);
|
|
408
|
-
this.sql`
|
|
409
|
-
UPDATE cf_agents_schedules SET time = ${nextTimestamp} WHERE id = ${row.id}
|
|
410
|
-
`;
|
|
411
|
-
} else {
|
|
412
|
-
this.sql`
|
|
413
|
-
DELETE FROM cf_agents_schedules WHERE id = ${row.id}
|
|
414
|
-
`;
|
|
415
|
-
}
|
|
552
|
+
if (!result) return;
|
|
553
|
+
if (result.length > 0 && "time" in result[0]) {
|
|
554
|
+
const nextTime = result[0].time * 1e3;
|
|
555
|
+
await this.ctx.storage.setAlarm(nextTime);
|
|
416
556
|
}
|
|
417
|
-
await __privateMethod(this, _Agent_instances, scheduleNextAlarm_fn).call(this);
|
|
418
557
|
}
|
|
419
558
|
/**
|
|
420
559
|
* Destroy the Agent, removing all state and scheduled tasks
|
|
@@ -422,66 +561,133 @@ var Agent = class extends Server {
|
|
|
422
561
|
async destroy() {
|
|
423
562
|
this.sql`DROP TABLE IF EXISTS cf_agents_state`;
|
|
424
563
|
this.sql`DROP TABLE IF EXISTS cf_agents_schedules`;
|
|
564
|
+
this.sql`DROP TABLE IF EXISTS cf_agents_mcp_servers`;
|
|
425
565
|
await this.ctx.storage.deleteAlarm();
|
|
426
566
|
await this.ctx.storage.deleteAll();
|
|
567
|
+
this.ctx.abort("destroyed");
|
|
427
568
|
}
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
})
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
569
|
+
/**
|
|
570
|
+
* Get all methods marked as callable on this Agent
|
|
571
|
+
* @returns A map of method names to their metadata
|
|
572
|
+
*/
|
|
573
|
+
_isCallable(method) {
|
|
574
|
+
return callableMetadata.has(this[method]);
|
|
575
|
+
}
|
|
576
|
+
/**
|
|
577
|
+
* Connect to a new MCP Server
|
|
578
|
+
*
|
|
579
|
+
* @param url MCP Server SSE URL
|
|
580
|
+
* @param callbackHost Base host for the agent, used for the redirect URI.
|
|
581
|
+
* @param agentsPrefix agents routing prefix if not using `agents`
|
|
582
|
+
* @param options MCP client and transport (header) options
|
|
583
|
+
* @returns authUrl
|
|
584
|
+
*/
|
|
585
|
+
async addMcpServer(serverName, url, callbackHost, agentsPrefix = "agents", options) {
|
|
586
|
+
const callbackUrl = `${callbackHost}/${agentsPrefix}/${camelCaseToKebabCase(this._ParentClass.name)}/${this.name}/callback`;
|
|
587
|
+
const result = await this._connectToMcpServerInternal(
|
|
588
|
+
serverName,
|
|
589
|
+
url,
|
|
590
|
+
callbackUrl,
|
|
591
|
+
options
|
|
592
|
+
);
|
|
593
|
+
this.sql`
|
|
594
|
+
INSERT
|
|
595
|
+
OR REPLACE INTO cf_agents_mcp_servers (id, name, server_url, client_id, auth_url, callback_url, server_options)
|
|
596
|
+
VALUES (
|
|
597
|
+
${result.id},
|
|
598
|
+
${serverName},
|
|
599
|
+
${url},
|
|
600
|
+
${result.clientId ?? null},
|
|
601
|
+
${result.authUrl ?? null},
|
|
602
|
+
${callbackUrl},
|
|
603
|
+
${options ? JSON.stringify(options) : null}
|
|
604
|
+
);
|
|
605
|
+
`;
|
|
606
|
+
this.broadcast(
|
|
607
|
+
JSON.stringify({
|
|
608
|
+
mcp: this.getMcpServers(),
|
|
609
|
+
type: "cf_agent_mcp_servers"
|
|
610
|
+
})
|
|
611
|
+
);
|
|
612
|
+
return result;
|
|
613
|
+
}
|
|
614
|
+
async _connectToMcpServerInternal(_serverName, url, callbackUrl, options, reconnect) {
|
|
615
|
+
const authProvider = new DurableObjectOAuthClientProvider(
|
|
616
|
+
this.ctx.storage,
|
|
617
|
+
this.name,
|
|
618
|
+
callbackUrl
|
|
619
|
+
);
|
|
620
|
+
if (reconnect) {
|
|
621
|
+
authProvider.serverId = reconnect.id;
|
|
622
|
+
if (reconnect.oauthClientId) {
|
|
623
|
+
authProvider.clientId = reconnect.oauthClientId;
|
|
624
|
+
}
|
|
625
|
+
}
|
|
626
|
+
let headerTransportOpts = {};
|
|
627
|
+
if (options?.transport?.headers) {
|
|
628
|
+
headerTransportOpts = {
|
|
629
|
+
eventSourceInit: {
|
|
630
|
+
fetch: (url2, init) => fetch(url2, {
|
|
631
|
+
...init,
|
|
632
|
+
headers: options?.transport?.headers
|
|
633
|
+
})
|
|
634
|
+
},
|
|
635
|
+
requestInit: {
|
|
636
|
+
headers: options?.transport?.headers
|
|
637
|
+
}
|
|
638
|
+
};
|
|
639
|
+
}
|
|
640
|
+
const { id, authUrl, clientId } = await this.mcp.connect(url, {
|
|
641
|
+
client: options?.client,
|
|
642
|
+
reconnect,
|
|
643
|
+
transport: {
|
|
644
|
+
...headerTransportOpts,
|
|
645
|
+
authProvider
|
|
454
646
|
}
|
|
647
|
+
});
|
|
648
|
+
return {
|
|
649
|
+
authUrl,
|
|
650
|
+
clientId,
|
|
651
|
+
id
|
|
652
|
+
};
|
|
653
|
+
}
|
|
654
|
+
async removeMcpServer(id) {
|
|
655
|
+
this.mcp.closeConnection(id);
|
|
656
|
+
this.sql`
|
|
657
|
+
DELETE FROM cf_agents_mcp_servers WHERE id = ${id};
|
|
658
|
+
`;
|
|
659
|
+
this.broadcast(
|
|
660
|
+
JSON.stringify({
|
|
661
|
+
mcp: this.getMcpServers(),
|
|
662
|
+
type: "cf_agent_mcp_servers"
|
|
663
|
+
})
|
|
455
664
|
);
|
|
456
|
-
});
|
|
457
|
-
};
|
|
458
|
-
tryCatch_fn = async function(fn) {
|
|
459
|
-
try {
|
|
460
|
-
return await fn();
|
|
461
|
-
} catch (e) {
|
|
462
|
-
throw this.onError(e);
|
|
463
665
|
}
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
666
|
+
getMcpServers() {
|
|
667
|
+
const mcpState = {
|
|
668
|
+
prompts: this.mcp.listPrompts(),
|
|
669
|
+
resources: this.mcp.listResources(),
|
|
670
|
+
servers: {},
|
|
671
|
+
tools: this.mcp.listTools()
|
|
672
|
+
};
|
|
673
|
+
const servers = this.sql`
|
|
674
|
+
SELECT id, name, server_url, client_id, auth_url, callback_url, server_options FROM cf_agents_mcp_servers;
|
|
471
675
|
`;
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
676
|
+
for (const server of servers) {
|
|
677
|
+
const serverConn = this.mcp.mcpConnections[server.id];
|
|
678
|
+
mcpState.servers[server.id] = {
|
|
679
|
+
auth_url: server.auth_url,
|
|
680
|
+
capabilities: serverConn?.serverCapabilities ?? null,
|
|
681
|
+
instructions: serverConn?.instructions ?? null,
|
|
682
|
+
name: server.name,
|
|
683
|
+
server_url: server.server_url,
|
|
684
|
+
// mark as "authenticating" because the server isn't automatically connected, so it's pending authenticating
|
|
685
|
+
state: serverConn?.connectionState ?? "authenticating"
|
|
686
|
+
};
|
|
687
|
+
}
|
|
688
|
+
return mcpState;
|
|
476
689
|
}
|
|
477
690
|
};
|
|
478
|
-
/**
|
|
479
|
-
* Get all methods marked as callable on this Agent
|
|
480
|
-
* @returns A map of method names to their metadata
|
|
481
|
-
*/
|
|
482
|
-
isCallable_fn = function(method) {
|
|
483
|
-
return callableMetadata.has(this[method]);
|
|
484
|
-
};
|
|
485
691
|
/**
|
|
486
692
|
* Agent configuration options
|
|
487
693
|
*/
|
|
@@ -492,9 +698,9 @@ Agent.options = {
|
|
|
492
698
|
};
|
|
493
699
|
async function routeAgentRequest(request, env, options) {
|
|
494
700
|
const corsHeaders = options?.cors === true ? {
|
|
495
|
-
"Access-Control-Allow-Origin": "*",
|
|
496
|
-
"Access-Control-Allow-Methods": "GET, POST, HEAD, OPTIONS",
|
|
497
701
|
"Access-Control-Allow-Credentials": "true",
|
|
702
|
+
"Access-Control-Allow-Methods": "GET, POST, HEAD, OPTIONS",
|
|
703
|
+
"Access-Control-Allow-Origin": "*",
|
|
498
704
|
"Access-Control-Max-Age": "86400"
|
|
499
705
|
} : options?.cors;
|
|
500
706
|
if (request.method === "OPTIONS") {
|
|
@@ -525,67 +731,61 @@ async function routeAgentRequest(request, env, options) {
|
|
|
525
731
|
}
|
|
526
732
|
return response;
|
|
527
733
|
}
|
|
528
|
-
async function routeAgentEmail(
|
|
734
|
+
async function routeAgentEmail(_email, _env, _options) {
|
|
529
735
|
}
|
|
530
|
-
function getAgentByName(namespace, name, options) {
|
|
736
|
+
async function getAgentByName(namespace, name, options) {
|
|
531
737
|
return getServerByName(namespace, name, options);
|
|
532
738
|
}
|
|
533
|
-
var _connection, _id, _closed;
|
|
534
739
|
var StreamingResponse = class {
|
|
535
740
|
constructor(connection, id) {
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
__privateSet(this, _connection, connection);
|
|
540
|
-
__privateSet(this, _id, id);
|
|
741
|
+
this._closed = false;
|
|
742
|
+
this._connection = connection;
|
|
743
|
+
this._id = id;
|
|
541
744
|
}
|
|
542
745
|
/**
|
|
543
746
|
* Send a chunk of data to the client
|
|
544
747
|
* @param chunk The data to send
|
|
545
748
|
*/
|
|
546
749
|
send(chunk) {
|
|
547
|
-
if (
|
|
750
|
+
if (this._closed) {
|
|
548
751
|
throw new Error("StreamingResponse is already closed");
|
|
549
752
|
}
|
|
550
753
|
const response = {
|
|
551
|
-
|
|
552
|
-
id:
|
|
553
|
-
success: true,
|
|
754
|
+
done: false,
|
|
755
|
+
id: this._id,
|
|
554
756
|
result: chunk,
|
|
555
|
-
|
|
757
|
+
success: true,
|
|
758
|
+
type: "rpc"
|
|
556
759
|
};
|
|
557
|
-
|
|
760
|
+
this._connection.send(JSON.stringify(response));
|
|
558
761
|
}
|
|
559
762
|
/**
|
|
560
763
|
* End the stream and send the final chunk (if any)
|
|
561
764
|
* @param finalChunk Optional final chunk of data to send
|
|
562
765
|
*/
|
|
563
766
|
end(finalChunk) {
|
|
564
|
-
if (
|
|
767
|
+
if (this._closed) {
|
|
565
768
|
throw new Error("StreamingResponse is already closed");
|
|
566
769
|
}
|
|
567
|
-
|
|
770
|
+
this._closed = true;
|
|
568
771
|
const response = {
|
|
569
|
-
|
|
570
|
-
id:
|
|
571
|
-
success: true,
|
|
772
|
+
done: true,
|
|
773
|
+
id: this._id,
|
|
572
774
|
result: finalChunk,
|
|
573
|
-
|
|
775
|
+
success: true,
|
|
776
|
+
type: "rpc"
|
|
574
777
|
};
|
|
575
|
-
|
|
778
|
+
this._connection.send(JSON.stringify(response));
|
|
576
779
|
}
|
|
577
780
|
};
|
|
578
|
-
_connection = new WeakMap();
|
|
579
|
-
_id = new WeakMap();
|
|
580
|
-
_closed = new WeakMap();
|
|
581
781
|
|
|
582
782
|
export {
|
|
583
783
|
unstable_callable,
|
|
584
|
-
|
|
784
|
+
getCurrentAgent,
|
|
585
785
|
Agent,
|
|
586
786
|
routeAgentRequest,
|
|
587
787
|
routeAgentEmail,
|
|
588
788
|
getAgentByName,
|
|
589
789
|
StreamingResponse
|
|
590
790
|
};
|
|
591
|
-
//# sourceMappingURL=chunk-
|
|
791
|
+
//# sourceMappingURL=chunk-4CIGD73X.js.map
|