agents 0.0.0-9ae8ee3 → 0.0.0-9beccdd
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 +31 -6
- package/dist/ai-chat-agent.d.ts +9 -8
- package/dist/ai-chat-agent.js +142 -59
- package/dist/ai-chat-agent.js.map +1 -1
- package/dist/ai-chat-v5-migration.d.ts +152 -0
- package/dist/ai-chat-v5-migration.js +19 -0
- package/dist/ai-chat-v5-migration.js.map +1 -0
- package/dist/ai-react.d.ts +59 -70
- package/dist/ai-react.js +144 -37
- package/dist/ai-react.js.map +1 -1
- package/dist/ai-types.d.ts +36 -19
- package/dist/ai-types.js +6 -0
- package/dist/chunk-AVYJQSLW.js +17 -0
- package/dist/chunk-AVYJQSLW.js.map +1 -0
- package/dist/{chunk-PVQZBKN7.js → chunk-LL2AFX7V.js} +5 -2
- package/dist/chunk-LL2AFX7V.js.map +1 -0
- package/dist/{chunk-3IQQY2UH.js → chunk-PNF6ZMUA.js} +114 -88
- package/dist/chunk-PNF6ZMUA.js.map +1 -0
- package/dist/{chunk-KUH345EY.js → chunk-QEVM4BVL.js} +5 -5
- package/dist/chunk-QEVM4BVL.js.map +1 -0
- package/dist/chunk-UJVEAURM.js +150 -0
- package/dist/chunk-UJVEAURM.js.map +1 -0
- package/dist/{chunk-UNG3FXYX.js → chunk-VYENMKFS.js} +110 -23
- package/dist/chunk-VYENMKFS.js.map +1 -0
- package/dist/client-CcIORE73.d.ts +4607 -0
- package/dist/client.js +2 -1
- package/dist/index.d.ts +546 -32
- package/dist/index.js +7 -4
- package/dist/mcp/client.d.ts +9 -1052
- package/dist/mcp/client.js +1 -1
- package/dist/mcp/do-oauth-client-provider.d.ts +1 -0
- package/dist/mcp/do-oauth-client-provider.js +1 -1
- package/dist/mcp/index.d.ts +33 -28
- package/dist/mcp/index.js +172 -14
- package/dist/mcp/index.js.map +1 -1
- package/dist/observability/index.d.ts +46 -14
- package/dist/observability/index.js +5 -4
- package/dist/react.d.ts +4 -2
- package/dist/react.js +7 -5
- package/dist/react.js.map +1 -1
- package/dist/schedule.d.ts +83 -9
- package/dist/schedule.js +15 -2
- package/dist/schedule.js.map +1 -1
- package/package.json +15 -7
- package/src/index.ts +140 -97
- package/dist/chunk-3IQQY2UH.js.map +0 -1
- package/dist/chunk-KUH345EY.js.map +0 -1
- package/dist/chunk-PVQZBKN7.js.map +0 -1
- package/dist/chunk-UNG3FXYX.js.map +0 -1
- package/dist/index-CLW1aEBr.d.ts +0 -615
package/dist/ai-react.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/ai-react.tsx"],"sourcesContent":["import { useChat } from \"@ai-sdk/react\";\nimport type { Message } from \"ai\";\nimport { nanoid } from \"nanoid\";\nimport { use, useEffect } from \"react\";\nimport type { OutgoingMessage } from \"./ai-types\";\nimport type { useAgent } from \"./react\";\n\ntype GetInitialMessagesOptions = {\n agent: string;\n name: string;\n url: string;\n};\n\n/**\n * Options for the useAgentChat hook\n */\ntype UseAgentChatOptions<State> = Omit<\n Parameters<typeof useChat>[0] & {\n /** Agent connection from useAgent */\n agent: ReturnType<typeof useAgent<State>>;\n getInitialMessages?:\n | undefined\n | null\n // | (() => Message[])\n | ((options: GetInitialMessagesOptions) => Promise<Message[]>);\n },\n \"fetch\"\n>;\n\nconst requestCache = new Map<string, Promise<Message[]>>();\n\n/**\n * React hook for building AI chat interfaces using an Agent\n * @param options Chat options including the agent connection\n * @returns Chat interface controls and state with added clearHistory method\n */\nexport function useAgentChat<State = unknown>(\n options: UseAgentChatOptions<State>\n) {\n const { agent, getInitialMessages, ...rest } = options;\n\n const agentUrl = new URL(\n `${// @ts-expect-error we're using a protected _url property that includes query params\n ((agent._url as string | null) || agent._pkurl)\n ?.replace(\"ws://\", \"http://\")\n .replace(\"wss://\", \"https://\")}`\n );\n\n // delete the _pk query param\n agentUrl.searchParams.delete(\"_pk\");\n const agentUrlString = agentUrl.toString();\n\n async function defaultGetInitialMessagesFetch({\n url\n }: GetInitialMessagesOptions) {\n const getMessagesUrl = new URL(url);\n getMessagesUrl.pathname += \"/get-messages\";\n const response = await fetch(getMessagesUrl.toString(), {\n credentials: options.credentials,\n headers: options.headers\n });\n return response.json<Message[]>();\n }\n\n const getInitialMessagesFetch =\n getInitialMessages || defaultGetInitialMessagesFetch;\n\n function doGetInitialMessages(\n getInitialMessagesOptions: GetInitialMessagesOptions\n ) {\n if (requestCache.has(agentUrlString)) {\n return requestCache.get(agentUrlString)!;\n }\n const promise = getInitialMessagesFetch(getInitialMessagesOptions);\n // immediately cache the promise so that we don't\n // create multiple requests for the same agent during multiple\n // concurrent renders\n requestCache.set(agentUrlString, promise);\n return promise;\n }\n\n const initialMessagesPromise =\n getInitialMessages === null\n ? null\n : doGetInitialMessages({\n agent: agent.agent,\n name: agent.name,\n url: agentUrlString\n });\n const initialMessages = initialMessagesPromise\n ? use(initialMessagesPromise)\n : (rest.initialMessages ?? []);\n\n // manages adding and removing the promise from the cache\n useEffect(() => {\n if (!initialMessagesPromise) {\n return;\n }\n // this effect is responsible for removing the promise from the cache\n // when the component unmounts or the promise changes,\n // but that means it also must add the promise to the cache\n // so that multiple arbitrary effect runs produce the expected state\n // when resolved.\n requestCache.set(agentUrlString, initialMessagesPromise!);\n return () => {\n if (requestCache.get(agentUrlString) === initialMessagesPromise) {\n requestCache.delete(agentUrlString);\n }\n };\n }, [agentUrlString, initialMessagesPromise]);\n\n async function aiFetch(\n request: RequestInfo | URL,\n options: RequestInit = {}\n ) {\n // we're going to use a websocket to do the actual \"fetching\"\n // but still satisfy the type signature of the fetch function\n // so we'll return a promise that resolves to a response\n\n const {\n method,\n keepalive,\n headers,\n body,\n redirect,\n integrity,\n signal,\n credentials,\n mode,\n referrer,\n referrerPolicy,\n window\n // dispatcher, duplex\n } = options;\n const id = nanoid(8);\n const abortController = new AbortController();\n\n signal?.addEventListener(\"abort\", () => {\n // Propagate request cancellation to the Agent\n // We need to communciate cancellation as a websocket message, instead of a request signal\n agent.send(\n JSON.stringify({\n id,\n type: \"cf_agent_chat_request_cancel\"\n })\n );\n\n // NOTE - If we wanted to, we could preserve the \"interrupted\" message here, with the code below\n // However, I think it might be the responsibility of the library user to implement that behavior manually?\n // Reasoning: This code could be subject to collisions, as it \"force saves\" the messages we have locally\n //\n // agent.send(JSON.stringify({\n // type: \"cf_agent_chat_messages\",\n // messages: ... /* some way of getting current messages ref? */\n // }))\n\n abortController.abort();\n // Make sure to also close the stream (cf. https://github.com/cloudflare/agents-starter/issues/69)\n controller.close();\n });\n\n agent.addEventListener(\n \"message\",\n (event) => {\n let data: OutgoingMessage;\n try {\n data = JSON.parse(event.data) as OutgoingMessage;\n } catch (_error) {\n // silently ignore invalid messages for now\n // TODO: log errors with log levels\n return;\n }\n if (data.type === \"cf_agent_use_chat_response\") {\n if (data.id === id) {\n controller.enqueue(new TextEncoder().encode(data.body));\n if (data.done) {\n controller.close();\n abortController.abort();\n }\n }\n }\n },\n { signal: abortController.signal }\n );\n\n let controller: ReadableStreamDefaultController;\n\n const stream = new ReadableStream({\n start(c) {\n controller = c;\n }\n });\n\n agent.send(\n JSON.stringify({\n id,\n init: {\n body,\n credentials,\n headers,\n integrity,\n keepalive,\n method,\n mode,\n redirect,\n referrer,\n referrerPolicy,\n window\n // dispatcher,\n // duplex\n },\n type: \"cf_agent_use_chat_request\",\n url: request.toString()\n })\n );\n\n return new Response(stream);\n }\n const useChatHelpers = useChat({\n fetch: aiFetch,\n initialMessages,\n sendExtraMessageFields: true,\n ...rest\n });\n\n useEffect(() => {\n function onClearHistory(event: MessageEvent) {\n if (typeof event.data !== \"string\") {\n return;\n }\n let data: OutgoingMessage;\n try {\n data = JSON.parse(event.data) as OutgoingMessage;\n } catch (_error) {\n // silently ignore invalid messages for now\n // TODO: log errors with log levels\n return;\n }\n if (data.type === \"cf_agent_chat_clear\") {\n useChatHelpers.setMessages([]);\n }\n }\n\n function onMessages(event: MessageEvent) {\n if (typeof event.data !== \"string\") {\n return;\n }\n let data: OutgoingMessage;\n try {\n data = JSON.parse(event.data) as OutgoingMessage;\n } catch (_error) {\n // silently ignore invalid messages for now\n // TODO: log errors with log levels\n return;\n }\n if (data.type === \"cf_agent_chat_messages\") {\n useChatHelpers.setMessages(data.messages);\n }\n }\n\n agent.addEventListener(\"message\", onClearHistory);\n agent.addEventListener(\"message\", onMessages);\n\n return () => {\n agent.removeEventListener(\"message\", onClearHistory);\n agent.removeEventListener(\"message\", onMessages);\n };\n }, [agent, useChatHelpers.setMessages]);\n\n return {\n ...useChatHelpers,\n /**\n * Clear chat history on both client and Agent\n */\n clearHistory: () => {\n useChatHelpers.setMessages([]);\n agent.send(\n JSON.stringify({\n type: \"cf_agent_chat_clear\"\n })\n );\n },\n /**\n * Set the chat messages and synchronize with the Agent\n * @param messages New messages to set\n */\n setMessages: (messages: Message[]) => {\n useChatHelpers.setMessages(messages);\n agent.send(\n JSON.stringify({\n messages,\n type: \"cf_agent_chat_messages\"\n })\n );\n }\n };\n}\n"],"mappings":"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","names":["options"]}
|
|
1
|
+
{"version":3,"sources":["../src/ai-react.tsx"],"sourcesContent":["import { useChat, type UseChatOptions } from \"@ai-sdk/react\";\nimport { getToolName, isToolUIPart } from \"ai\";\nimport type {\n ChatInit,\n ChatTransport,\n UIMessage as Message,\n UIMessage\n} from \"ai\";\nimport { DefaultChatTransport } from \"ai\";\nimport { nanoid } from \"nanoid\";\nimport { use, useEffect, useRef } from \"react\";\nimport type { OutgoingMessage } from \"./ai-types\";\nimport { MessageType } from \"./ai-types\";\nimport type { useAgent } from \"./react\";\n\nexport type AITool<Input = unknown, Output = unknown> = {\n description?: string;\n inputSchema?: unknown;\n execute?: (input: Input) => Output | Promise<Output>;\n};\n\ntype GetInitialMessagesOptions = {\n agent: string;\n name: string;\n url: string;\n};\n\n// v5 useChat parameters\ntype UseChatParams<M extends UIMessage = UIMessage> = ChatInit<M> &\n UseChatOptions<M>;\n\n/**\n * Options for the useAgentChat hook\n */\ntype UseAgentChatOptions<\n State,\n ChatMessage extends UIMessage = UIMessage\n> = Omit<UseChatParams<ChatMessage>, \"fetch\"> & {\n /** Agent connection from useAgent */\n agent: ReturnType<typeof useAgent<State>>;\n getInitialMessages?:\n | undefined\n | null\n | ((options: GetInitialMessagesOptions) => Promise<ChatMessage[]>);\n /** Request credentials */\n credentials?: RequestCredentials;\n /** Request headers */\n headers?: HeadersInit;\n /**\n * @description Whether to automatically resolve tool calls that do not require human interaction.\n * @experimental\n */\n experimental_automaticToolResolution?: boolean;\n /**\n * @description Tools object for automatic detection of confirmation requirements.\n * Tools without execute function will require confirmation.\n */\n tools?: Record<string, AITool<unknown, unknown>>;\n /**\n * @description Manual override for tools requiring confirmation.\n * If not provided, will auto-detect from tools object.\n */\n toolsRequiringConfirmation?: string[];\n};\n\nconst requestCache = new Map<string, Promise<Message[]>>();\n\n/**\n * React hook for building AI chat interfaces using an Agent\n * @param options Chat options including the agent connection\n * @returns Chat interface controls and state with added clearHistory method\n */\n/**\n * Automatically detects which tools require confirmation based on their configuration.\n * Tools require confirmation if they have no execute function AND are not server-executed.\n * @param tools - Record of tool name to tool definition\n * @returns Array of tool names that require confirmation\n */\nexport function detectToolsRequiringConfirmation(\n tools?: Record<string, AITool<unknown, unknown>>\n): string[] {\n if (!tools) return [];\n\n return Object.entries(tools)\n .filter(([_name, tool]) => !tool.execute)\n .map(([name]) => name);\n}\n\nexport function useAgentChat<\n State = unknown,\n ChatMessage extends UIMessage = UIMessage\n>(\n options: UseAgentChatOptions<State, ChatMessage>\n): ReturnType<typeof useChat<ChatMessage>> & {\n clearHistory: () => void;\n} {\n const {\n agent,\n getInitialMessages,\n messages: optionsInitialMessages,\n experimental_automaticToolResolution,\n tools,\n toolsRequiringConfirmation: manualToolsRequiringConfirmation,\n ...rest\n } = options;\n\n // Auto-detect tools requiring confirmation, or use manual override\n const toolsRequiringConfirmation =\n manualToolsRequiringConfirmation ?? detectToolsRequiringConfirmation(tools);\n\n const agentUrl = new URL(\n `${// @ts-expect-error we're using a protected _url property that includes query params\n ((agent._url as string | null) || agent._pkurl)\n ?.replace(\"ws://\", \"http://\")\n .replace(\"wss://\", \"https://\")}`\n );\n\n agentUrl.searchParams.delete(\"_pk\");\n const agentUrlString = agentUrl.toString();\n\n async function defaultGetInitialMessagesFetch({\n url\n }: GetInitialMessagesOptions) {\n const getMessagesUrl = new URL(url);\n getMessagesUrl.pathname += \"/get-messages\";\n const response = await fetch(getMessagesUrl.toString(), {\n credentials: options.credentials,\n headers: options.headers\n });\n\n if (!response.ok) {\n console.warn(\n `Failed to fetch initial messages: ${response.status} ${response.statusText}`\n );\n return [];\n }\n\n const text = await response.text();\n if (!text.trim()) {\n return [];\n }\n\n try {\n return JSON.parse(text) as ChatMessage[];\n } catch (error) {\n console.warn(\"Failed to parse initial messages JSON:\", error);\n return [];\n }\n }\n\n const getInitialMessagesFetch =\n getInitialMessages || defaultGetInitialMessagesFetch;\n\n function doGetInitialMessages(\n getInitialMessagesOptions: GetInitialMessagesOptions\n ) {\n if (requestCache.has(agentUrlString)) {\n return requestCache.get(agentUrlString)! as Promise<ChatMessage[]>;\n }\n const promise = getInitialMessagesFetch(getInitialMessagesOptions);\n requestCache.set(agentUrlString, promise);\n return promise;\n }\n\n const initialMessagesPromise =\n getInitialMessages === null\n ? null\n : doGetInitialMessages({\n agent: agent.agent,\n name: agent.name,\n url: agentUrlString\n });\n const initialMessages = initialMessagesPromise\n ? use(initialMessagesPromise)\n : (optionsInitialMessages ?? []);\n\n useEffect(() => {\n if (!initialMessagesPromise) {\n return;\n }\n requestCache.set(agentUrlString, initialMessagesPromise!);\n return () => {\n if (requestCache.get(agentUrlString) === initialMessagesPromise) {\n requestCache.delete(agentUrlString);\n }\n };\n }, [agentUrlString, initialMessagesPromise]);\n\n async function aiFetch(\n request: RequestInfo | URL,\n options: RequestInit = {}\n ) {\n const {\n method,\n keepalive,\n headers,\n body,\n redirect,\n integrity,\n signal,\n credentials,\n mode,\n referrer,\n referrerPolicy,\n window\n } = options;\n const id = nanoid(8);\n const abortController = new AbortController();\n let controller: ReadableStreamDefaultController;\n let isToolCallInProgress = false;\n\n signal?.addEventListener(\"abort\", () => {\n agent.send(\n JSON.stringify({\n id,\n type: MessageType.CF_AGENT_CHAT_REQUEST_CANCEL\n })\n );\n\n // NOTE - If we wanted to, we could preserve the \"interrupted\" message here, with the code below\n // However, I think it might be the responsibility of the library user to implement that behavior manually?\n // Reasoning: This code could be subject to collisions, as it \"force saves\" the messages we have locally\n //\n // agent.send(JSON.stringify({\n // type: MessageType.CF_AGENT_CHAT_MESSAGES,\n // messages: ... /* some way of getting current messages ref? */\n // }))\n\n abortController.abort();\n // Make sure to also close the stream (cf. https://github.com/cloudflare/agents-starter/issues/69)\n if (!isToolCallInProgress) {\n controller.close();\n }\n });\n\n agent.addEventListener(\n \"message\",\n (event) => {\n let data: OutgoingMessage<ChatMessage>;\n try {\n data = JSON.parse(event.data) as OutgoingMessage<ChatMessage>;\n } catch (_error) {\n // silently ignore invalid messages for now\n // TODO: log errors with log levels\n return;\n }\n if (data.type === MessageType.CF_AGENT_USE_CHAT_RESPONSE) {\n if (data.id === id) {\n if (data.error) {\n controller.error(new Error(data.body));\n abortController.abort();\n } else {\n // Only enqueue non-empty data to prevent JSON parsing errors\n if (data.body?.trim()) {\n if (data.body.includes('\"tool_calls\"')) {\n isToolCallInProgress = true;\n }\n controller.enqueue(\n new TextEncoder().encode(`data: ${data.body}\\n\\n`)\n );\n }\n if (data.done && !isToolCallInProgress) {\n controller.close();\n abortController.abort();\n }\n }\n }\n }\n },\n { signal: abortController.signal }\n );\n\n const stream = new ReadableStream({\n start(c) {\n controller = c;\n }\n });\n\n agent.send(\n JSON.stringify({\n id,\n init: {\n body,\n credentials,\n headers,\n integrity,\n keepalive,\n method,\n mode,\n redirect,\n referrer,\n referrerPolicy,\n window\n },\n type: MessageType.CF_AGENT_USE_CHAT_REQUEST,\n url: request.toString()\n })\n );\n\n return new Response(stream);\n }\n\n const customTransport: ChatTransport<ChatMessage> = {\n sendMessages: async (\n options: Parameters<typeof DefaultChatTransport.prototype.sendMessages>[0]\n ) => {\n const transport = new DefaultChatTransport<ChatMessage>({\n api: agentUrlString,\n fetch: aiFetch\n });\n return transport.sendMessages(options);\n },\n reconnectToStream: async (\n options: Parameters<\n typeof DefaultChatTransport.prototype.reconnectToStream\n >[0]\n ) => {\n const transport = new DefaultChatTransport<ChatMessage>({\n api: agentUrlString,\n fetch: aiFetch\n });\n return transport.reconnectToStream(options);\n }\n };\n\n const useChatHelpers = useChat<ChatMessage>({\n ...rest,\n messages: initialMessages,\n transport: customTransport\n });\n\n const processedToolCalls = useRef(new Set<string>());\n\n // tools can be a different object everytime it's called,\n // which might lead to this effect being called multiple times with different tools objects.\n // we need to fix this, but that's a bigger refactor.\n // biome-ignore lint/correctness/useExhaustiveDependencies: we need to fix this\n useEffect(() => {\n if (!experimental_automaticToolResolution) {\n return;\n }\n\n const lastMessage =\n useChatHelpers.messages[useChatHelpers.messages.length - 1];\n if (!lastMessage || lastMessage.role !== \"assistant\") {\n return;\n }\n\n const toolCalls = lastMessage.parts.filter(\n (part) =>\n isToolUIPart(part) &&\n part.state === \"input-available\" &&\n !processedToolCalls.current.has(part.toolCallId)\n );\n\n if (toolCalls.length > 0) {\n (async () => {\n const toolCallsToResolve = toolCalls.filter(\n (part) =>\n isToolUIPart(part) &&\n !toolsRequiringConfirmation.includes(getToolName(part)) &&\n tools?.[getToolName(part)]?.execute // Only execute if client has execute function\n );\n\n if (toolCallsToResolve.length > 0) {\n for (const part of toolCallsToResolve) {\n if (isToolUIPart(part)) {\n processedToolCalls.current.add(part.toolCallId);\n let toolOutput = null;\n const toolName = getToolName(part);\n const tool = tools?.[toolName];\n\n if (tool?.execute && part.input) {\n try {\n toolOutput = await tool.execute(part.input);\n } catch (error) {\n toolOutput = `Error executing tool: ${error instanceof Error ? error.message : String(error)}`;\n }\n }\n\n await useChatHelpers.addToolResult({\n toolCallId: part.toolCallId,\n tool: toolName,\n output: toolOutput\n });\n }\n }\n useChatHelpers.sendMessage();\n }\n })();\n }\n }, [\n useChatHelpers.messages,\n experimental_automaticToolResolution,\n useChatHelpers.addToolResult,\n useChatHelpers.sendMessage,\n toolsRequiringConfirmation\n ]);\n\n useEffect(() => {\n function onClearHistory(event: MessageEvent) {\n if (typeof event.data !== \"string\") return;\n let data: OutgoingMessage;\n try {\n data = JSON.parse(event.data) as OutgoingMessage;\n } catch (_error) {\n return;\n }\n if (data.type === MessageType.CF_AGENT_CHAT_CLEAR) {\n useChatHelpers.setMessages([]);\n }\n }\n\n function onMessages(event: MessageEvent) {\n if (typeof event.data !== \"string\") return;\n let data: OutgoingMessage<ChatMessage>;\n try {\n data = JSON.parse(event.data) as OutgoingMessage<ChatMessage>;\n } catch (_error) {\n return;\n }\n if (data.type === MessageType.CF_AGENT_CHAT_MESSAGES) {\n useChatHelpers.setMessages(data.messages);\n }\n }\n\n agent.addEventListener(\"message\", onClearHistory);\n agent.addEventListener(\"message\", onMessages);\n\n return () => {\n agent.removeEventListener(\"message\", onClearHistory);\n agent.removeEventListener(\"message\", onMessages);\n };\n }, [agent, useChatHelpers.setMessages]);\n\n const { addToolResult } = useChatHelpers;\n\n const addToolResultAndSendMessage: typeof addToolResult = async (...args) => {\n await addToolResult(...args);\n useChatHelpers.sendMessage();\n };\n\n return {\n ...useChatHelpers,\n addToolResult: addToolResultAndSendMessage,\n clearHistory: () => {\n useChatHelpers.setMessages([]);\n agent.send(\n JSON.stringify({\n type: MessageType.CF_AGENT_CHAT_CLEAR\n })\n );\n },\n setMessages: (\n messages: Parameters<typeof useChatHelpers.setMessages>[0]\n ) => {\n useChatHelpers.setMessages(messages);\n agent.send(\n JSON.stringify({\n messages: Array.isArray(messages) ? messages : [],\n type: MessageType.CF_AGENT_CHAT_MESSAGES\n })\n );\n }\n };\n}\n"],"mappings":"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","names":["options"]}
|
package/dist/ai-types.d.ts
CHANGED
|
@@ -1,42 +1,59 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { UIMessage } from "ai";
|
|
2
2
|
|
|
3
|
+
/**
|
|
4
|
+
* Enum for message types to improve type safety and maintainability
|
|
5
|
+
*/
|
|
6
|
+
declare enum MessageType {
|
|
7
|
+
CF_AGENT_CHAT_MESSAGES = "cf_agent_chat_messages",
|
|
8
|
+
CF_AGENT_USE_CHAT_REQUEST = "cf_agent_use_chat_request",
|
|
9
|
+
CF_AGENT_USE_CHAT_RESPONSE = "cf_agent_use_chat_response",
|
|
10
|
+
CF_AGENT_CHAT_CLEAR = "cf_agent_chat_clear",
|
|
11
|
+
CF_AGENT_CHAT_REQUEST_CANCEL = "cf_agent_chat_request_cancel",
|
|
12
|
+
CF_AGENT_MCP_SERVERS = "cf_agent_mcp_servers",
|
|
13
|
+
CF_AGENT_STATE = "cf_agent_state",
|
|
14
|
+
RPC = "rpc"
|
|
15
|
+
}
|
|
3
16
|
/**
|
|
4
17
|
* Types of messages sent from the Agent to clients
|
|
5
18
|
*/
|
|
6
|
-
type OutgoingMessage =
|
|
19
|
+
type OutgoingMessage<ChatMessage extends UIMessage = UIMessage> =
|
|
20
|
+
| {
|
|
21
|
+
/** Indicates this message is a command to clear chat history */
|
|
22
|
+
type: MessageType.CF_AGENT_CHAT_CLEAR;
|
|
23
|
+
}
|
|
7
24
|
| {
|
|
8
25
|
/** Indicates this message contains updated chat messages */
|
|
9
|
-
type:
|
|
26
|
+
type: MessageType.CF_AGENT_CHAT_MESSAGES;
|
|
10
27
|
/** Array of chat messages */
|
|
11
|
-
messages:
|
|
28
|
+
messages: ChatMessage[];
|
|
12
29
|
}
|
|
13
30
|
| {
|
|
14
31
|
/** Indicates this message is a response to a chat request */
|
|
15
|
-
type:
|
|
32
|
+
type: MessageType.CF_AGENT_USE_CHAT_RESPONSE;
|
|
16
33
|
/** Unique ID of the request this response corresponds to */
|
|
17
34
|
id: string;
|
|
18
35
|
/** Content body of the response */
|
|
19
36
|
body: string;
|
|
20
37
|
/** Whether this is the final chunk of the response */
|
|
21
38
|
done: boolean;
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
/** Indicates this message contains updated chat messages */
|
|
25
|
-
type: "cf_agent_chat_messages";
|
|
26
|
-
/** Array of chat messages */
|
|
27
|
-
messages: Message[];
|
|
39
|
+
/** Whether this response contains an error */
|
|
40
|
+
error?: boolean;
|
|
28
41
|
}
|
|
29
42
|
| {
|
|
30
43
|
/** Indicates this message is a command to clear chat history */
|
|
31
|
-
type:
|
|
44
|
+
type: MessageType.CF_AGENT_CHAT_CLEAR;
|
|
32
45
|
};
|
|
33
46
|
/**
|
|
34
47
|
* Types of messages sent from clients to the Agent
|
|
35
48
|
*/
|
|
36
|
-
type IncomingMessage =
|
|
49
|
+
type IncomingMessage<ChatMessage extends UIMessage = UIMessage> =
|
|
50
|
+
| {
|
|
51
|
+
/** Indicates this message is a command to clear chat history */
|
|
52
|
+
type: MessageType.CF_AGENT_CHAT_CLEAR;
|
|
53
|
+
}
|
|
37
54
|
| {
|
|
38
55
|
/** Indicates this message is a request to the chat API */
|
|
39
|
-
type:
|
|
56
|
+
type: MessageType.CF_AGENT_USE_CHAT_REQUEST;
|
|
40
57
|
/** Unique ID for this request */
|
|
41
58
|
id: string;
|
|
42
59
|
/** Request initialization options */
|
|
@@ -57,18 +74,18 @@ type IncomingMessage =
|
|
|
57
74
|
}
|
|
58
75
|
| {
|
|
59
76
|
/** Indicates this message is a command to clear chat history */
|
|
60
|
-
type:
|
|
77
|
+
type: MessageType.CF_AGENT_CHAT_CLEAR;
|
|
61
78
|
}
|
|
62
79
|
| {
|
|
63
80
|
/** Indicates this message contains updated chat messages */
|
|
64
|
-
type:
|
|
81
|
+
type: MessageType.CF_AGENT_CHAT_MESSAGES;
|
|
65
82
|
/** Array of chat messages */
|
|
66
|
-
messages:
|
|
83
|
+
messages: ChatMessage[];
|
|
67
84
|
}
|
|
68
85
|
| {
|
|
69
86
|
/** Indicates the user wants to stop generation of this message */
|
|
70
|
-
type:
|
|
87
|
+
type: MessageType.CF_AGENT_CHAT_REQUEST_CANCEL;
|
|
71
88
|
id: string;
|
|
72
89
|
};
|
|
73
90
|
|
|
74
|
-
export type
|
|
91
|
+
export { type IncomingMessage, MessageType, type OutgoingMessage };
|
package/dist/ai-types.js
CHANGED
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
// src/ai-types.ts
|
|
2
|
+
var MessageType = /* @__PURE__ */ ((MessageType2) => {
|
|
3
|
+
MessageType2["CF_AGENT_CHAT_MESSAGES"] = "cf_agent_chat_messages";
|
|
4
|
+
MessageType2["CF_AGENT_USE_CHAT_REQUEST"] = "cf_agent_use_chat_request";
|
|
5
|
+
MessageType2["CF_AGENT_USE_CHAT_RESPONSE"] = "cf_agent_use_chat_response";
|
|
6
|
+
MessageType2["CF_AGENT_CHAT_CLEAR"] = "cf_agent_chat_clear";
|
|
7
|
+
MessageType2["CF_AGENT_CHAT_REQUEST_CANCEL"] = "cf_agent_chat_request_cancel";
|
|
8
|
+
MessageType2["CF_AGENT_MCP_SERVERS"] = "cf_agent_mcp_servers";
|
|
9
|
+
MessageType2["CF_AGENT_STATE"] = "cf_agent_state";
|
|
10
|
+
MessageType2["RPC"] = "rpc";
|
|
11
|
+
return MessageType2;
|
|
12
|
+
})(MessageType || {});
|
|
13
|
+
|
|
14
|
+
export {
|
|
15
|
+
MessageType
|
|
16
|
+
};
|
|
17
|
+
//# sourceMappingURL=chunk-AVYJQSLW.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../src/ai-types.ts"],"sourcesContent":["import type { UIMessage } from \"ai\";\n\n/**\n * Enum for message types to improve type safety and maintainability\n */\nexport enum MessageType {\n CF_AGENT_CHAT_MESSAGES = \"cf_agent_chat_messages\",\n CF_AGENT_USE_CHAT_REQUEST = \"cf_agent_use_chat_request\",\n CF_AGENT_USE_CHAT_RESPONSE = \"cf_agent_use_chat_response\",\n CF_AGENT_CHAT_CLEAR = \"cf_agent_chat_clear\",\n CF_AGENT_CHAT_REQUEST_CANCEL = \"cf_agent_chat_request_cancel\",\n\n CF_AGENT_MCP_SERVERS = \"cf_agent_mcp_servers\",\n CF_AGENT_STATE = \"cf_agent_state\",\n RPC = \"rpc\"\n}\n\n/**\n * Types of messages sent from the Agent to clients\n */\nexport type OutgoingMessage<ChatMessage extends UIMessage = UIMessage> =\n | {\n /** Indicates this message is a command to clear chat history */\n type: MessageType.CF_AGENT_CHAT_CLEAR;\n }\n | {\n /** Indicates this message contains updated chat messages */\n type: MessageType.CF_AGENT_CHAT_MESSAGES;\n /** Array of chat messages */\n messages: ChatMessage[];\n }\n | {\n /** Indicates this message is a response to a chat request */\n type: MessageType.CF_AGENT_USE_CHAT_RESPONSE;\n /** Unique ID of the request this response corresponds to */\n id: string;\n /** Content body of the response */\n body: string;\n /** Whether this is the final chunk of the response */\n done: boolean;\n /** Whether this response contains an error */\n error?: boolean;\n }\n | {\n /** Indicates this message is a command to clear chat history */\n type: MessageType.CF_AGENT_CHAT_CLEAR;\n };\n\n/**\n * Types of messages sent from clients to the Agent\n */\nexport type IncomingMessage<ChatMessage extends UIMessage = UIMessage> =\n | {\n /** Indicates this message is a command to clear chat history */\n type: MessageType.CF_AGENT_CHAT_CLEAR;\n }\n | {\n /** Indicates this message is a request to the chat API */\n type: MessageType.CF_AGENT_USE_CHAT_REQUEST;\n /** Unique ID for this request */\n id: string;\n /** Request initialization options */\n init: Pick<\n RequestInit,\n | \"method\"\n | \"keepalive\"\n | \"headers\"\n | \"body\"\n | \"redirect\"\n | \"integrity\"\n | \"credentials\"\n | \"mode\"\n | \"referrer\"\n | \"referrerPolicy\"\n | \"window\"\n >;\n }\n | {\n /** Indicates this message is a command to clear chat history */\n type: MessageType.CF_AGENT_CHAT_CLEAR;\n }\n | {\n /** Indicates this message contains updated chat messages */\n type: MessageType.CF_AGENT_CHAT_MESSAGES;\n /** Array of chat messages */\n messages: ChatMessage[];\n }\n | {\n /** Indicates the user wants to stop generation of this message */\n type: MessageType.CF_AGENT_CHAT_REQUEST_CANCEL;\n id: string;\n };\n"],"mappings":";AAKO,IAAK,cAAL,kBAAKA,iBAAL;AACL,EAAAA,aAAA,4BAAyB;AACzB,EAAAA,aAAA,+BAA4B;AAC5B,EAAAA,aAAA,gCAA6B;AAC7B,EAAAA,aAAA,yBAAsB;AACtB,EAAAA,aAAA,kCAA+B;AAE/B,EAAAA,aAAA,0BAAuB;AACvB,EAAAA,aAAA,oBAAiB;AACjB,EAAAA,aAAA,SAAM;AATI,SAAAA;AAAA,GAAA;","names":["MessageType"]}
|
|
@@ -8,13 +8,16 @@ var DurableObjectOAuthClientProvider = class {
|
|
|
8
8
|
get clientMetadata() {
|
|
9
9
|
return {
|
|
10
10
|
client_name: this.clientName,
|
|
11
|
-
client_uri:
|
|
11
|
+
client_uri: this.clientUri,
|
|
12
12
|
grant_types: ["authorization_code", "refresh_token"],
|
|
13
13
|
redirect_uris: [this.redirectUrl],
|
|
14
14
|
response_types: ["code"],
|
|
15
15
|
token_endpoint_auth_method: "none"
|
|
16
16
|
};
|
|
17
17
|
}
|
|
18
|
+
get clientUri() {
|
|
19
|
+
return new URL(this.redirectUrl).origin;
|
|
20
|
+
}
|
|
18
21
|
get redirectUrl() {
|
|
19
22
|
return `${this.baseRedirectUrl}/${this.serverId}`;
|
|
20
23
|
}
|
|
@@ -103,4 +106,4 @@ var DurableObjectOAuthClientProvider = class {
|
|
|
103
106
|
export {
|
|
104
107
|
DurableObjectOAuthClientProvider
|
|
105
108
|
};
|
|
106
|
-
//# sourceMappingURL=chunk-
|
|
109
|
+
//# sourceMappingURL=chunk-LL2AFX7V.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../src/mcp/do-oauth-client-provider.ts"],"sourcesContent":["import type { OAuthClientProvider } from \"@modelcontextprotocol/sdk/client/auth.js\";\nimport type {\n OAuthClientInformation,\n OAuthClientInformationFull,\n OAuthClientMetadata,\n OAuthTokens\n} from \"@modelcontextprotocol/sdk/shared/auth.js\";\n\n// A slight extension to the standard OAuthClientProvider interface because `redirectToAuthorization` doesn't give us the interface we need\n// This allows us to track authentication for a specific server and associated dynamic client registration\nexport interface AgentsOAuthProvider extends OAuthClientProvider {\n authUrl: string | undefined;\n clientId: string | undefined;\n serverId: string | undefined;\n}\n\nexport class DurableObjectOAuthClientProvider implements AgentsOAuthProvider {\n private _authUrl_: string | undefined;\n private _serverId_: string | undefined;\n private _clientId_: string | undefined;\n\n constructor(\n public storage: DurableObjectStorage,\n public clientName: string,\n public baseRedirectUrl: string\n ) {}\n\n get clientMetadata(): OAuthClientMetadata {\n return {\n client_name: this.clientName,\n client_uri: this.clientUri,\n grant_types: [\"authorization_code\", \"refresh_token\"],\n redirect_uris: [this.redirectUrl],\n response_types: [\"code\"],\n token_endpoint_auth_method: \"none\"\n };\n }\n\n get clientUri() {\n return new URL(this.redirectUrl).origin;\n }\n\n get redirectUrl() {\n return `${this.baseRedirectUrl}/${this.serverId}`;\n }\n\n get clientId() {\n if (!this._clientId_) {\n throw new Error(\"Trying to access clientId before it was set\");\n }\n return this._clientId_;\n }\n\n set clientId(clientId_: string) {\n this._clientId_ = clientId_;\n }\n\n get serverId() {\n if (!this._serverId_) {\n throw new Error(\"Trying to access serverId before it was set\");\n }\n return this._serverId_;\n }\n\n set serverId(serverId_: string) {\n this._serverId_ = serverId_;\n }\n\n keyPrefix(clientId: string) {\n return `/${this.clientName}/${this.serverId}/${clientId}`;\n }\n\n clientInfoKey(clientId: string) {\n return `${this.keyPrefix(clientId)}/client_info/`;\n }\n\n async clientInformation(): Promise<OAuthClientInformation | undefined> {\n if (!this._clientId_) {\n return undefined;\n }\n return (\n (await this.storage.get<OAuthClientInformation>(\n this.clientInfoKey(this.clientId)\n )) ?? undefined\n );\n }\n\n async saveClientInformation(\n clientInformation: OAuthClientInformationFull\n ): Promise<void> {\n await this.storage.put(\n this.clientInfoKey(clientInformation.client_id),\n clientInformation\n );\n this.clientId = clientInformation.client_id;\n }\n\n tokenKey(clientId: string) {\n return `${this.keyPrefix(clientId)}/token`;\n }\n\n async tokens(): Promise<OAuthTokens | undefined> {\n if (!this._clientId_) {\n return undefined;\n }\n return (\n (await this.storage.get<OAuthTokens>(this.tokenKey(this.clientId))) ??\n undefined\n );\n }\n\n async saveTokens(tokens: OAuthTokens): Promise<void> {\n await this.storage.put(this.tokenKey(this.clientId), tokens);\n }\n\n get authUrl() {\n return this._authUrl_;\n }\n\n /**\n * Because this operates on the server side (but we need browser auth), we send this url back to the user\n * and require user interact to initiate the redirect flow\n */\n async redirectToAuthorization(authUrl: URL): Promise<void> {\n // We want to track the client ID in state here because the typescript SSE client sometimes does\n // a dynamic client registration AFTER generating this redirect URL.\n const client_id = authUrl.searchParams.get(\"client_id\");\n if (client_id) {\n authUrl.searchParams.append(\"state\", client_id);\n }\n this._authUrl_ = authUrl.toString();\n }\n\n codeVerifierKey(clientId: string) {\n return `${this.keyPrefix(clientId)}/code_verifier`;\n }\n\n async saveCodeVerifier(verifier: string): Promise<void> {\n await this.storage.put(this.codeVerifierKey(this.clientId), verifier);\n }\n\n async codeVerifier(): Promise<string> {\n const codeVerifier = await this.storage.get<string>(\n this.codeVerifierKey(this.clientId)\n );\n if (!codeVerifier) {\n throw new Error(\"No code verifier found\");\n }\n return codeVerifier;\n }\n}\n"],"mappings":"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","names":[]}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import {
|
|
2
2
|
MCPClientManager
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-VYENMKFS.js";
|
|
4
4
|
import {
|
|
5
5
|
DurableObjectOAuthClientProvider
|
|
6
|
-
} from "./chunk-
|
|
6
|
+
} from "./chunk-LL2AFX7V.js";
|
|
7
7
|
import {
|
|
8
8
|
camelCaseToKebabCase
|
|
9
|
-
} from "./chunk-
|
|
9
|
+
} from "./chunk-QEVM4BVL.js";
|
|
10
10
|
|
|
11
11
|
// src/index.ts
|
|
12
12
|
import { AsyncLocalStorage } from "async_hooks";
|
|
@@ -19,13 +19,13 @@ import {
|
|
|
19
19
|
routePartykitRequest
|
|
20
20
|
} from "partyserver";
|
|
21
21
|
function isRPCRequest(msg) {
|
|
22
|
-
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);
|
|
22
|
+
return typeof msg === "object" && msg !== null && "type" in msg && msg.type === "rpc" /* RPC */ && "id" in msg && typeof msg.id === "string" && "method" in msg && typeof msg.method === "string" && "args" in msg && Array.isArray(msg.args);
|
|
23
23
|
}
|
|
24
24
|
function isStateUpdateMessage(msg) {
|
|
25
|
-
return typeof msg === "object" && msg !== null && "type" in msg && msg.type === "cf_agent_state" && "state" in msg;
|
|
25
|
+
return typeof msg === "object" && msg !== null && "type" in msg && msg.type === "cf_agent_state" /* CF_AGENT_STATE */ && "state" in msg;
|
|
26
26
|
}
|
|
27
27
|
var callableMetadata = /* @__PURE__ */ new Map();
|
|
28
|
-
function
|
|
28
|
+
function callable(metadata = {}) {
|
|
29
29
|
return function callableDecorator(target, context) {
|
|
30
30
|
if (!callableMetadata.has(target)) {
|
|
31
31
|
callableMetadata.set(target, metadata);
|
|
@@ -33,6 +33,16 @@ function unstable_callable(metadata = {}) {
|
|
|
33
33
|
return target;
|
|
34
34
|
};
|
|
35
35
|
}
|
|
36
|
+
var didWarnAboutUnstableCallable = false;
|
|
37
|
+
var unstable_callable = (metadata = {}) => {
|
|
38
|
+
if (!didWarnAboutUnstableCallable) {
|
|
39
|
+
didWarnAboutUnstableCallable = true;
|
|
40
|
+
console.warn(
|
|
41
|
+
"unstable_callable is deprecated, use callable instead. unstable_callable will be removed in the next major version."
|
|
42
|
+
);
|
|
43
|
+
}
|
|
44
|
+
callable(metadata);
|
|
45
|
+
};
|
|
36
46
|
function getNextCronTime(cron) {
|
|
37
47
|
const interval = parseCronExpression(cron);
|
|
38
48
|
return interval.getNextDate();
|
|
@@ -55,7 +65,10 @@ function getCurrentAgent() {
|
|
|
55
65
|
}
|
|
56
66
|
function withAgentContext(method) {
|
|
57
67
|
return function(...args) {
|
|
58
|
-
const { connection, request, email } = getCurrentAgent();
|
|
68
|
+
const { connection, request, email, agent } = getCurrentAgent();
|
|
69
|
+
if (agent === this) {
|
|
70
|
+
return method.apply(this, args);
|
|
71
|
+
}
|
|
59
72
|
return agentContext.run({ agent: this, connection, request, email }, () => {
|
|
60
73
|
return method.apply(this, args);
|
|
61
74
|
});
|
|
@@ -110,7 +123,10 @@ var _Agent = class _Agent extends Server {
|
|
|
110
123
|
{
|
|
111
124
|
displayMessage: `Schedule ${row.id} executed`,
|
|
112
125
|
id: nanoid(),
|
|
113
|
-
payload:
|
|
126
|
+
payload: {
|
|
127
|
+
callback: row.callback,
|
|
128
|
+
id: row.id
|
|
129
|
+
},
|
|
114
130
|
timestamp: Date.now(),
|
|
115
131
|
type: "schedule:execute"
|
|
116
132
|
},
|
|
@@ -190,7 +206,7 @@ var _Agent = class _Agent extends Server {
|
|
|
190
206
|
this.broadcast(
|
|
191
207
|
JSON.stringify({
|
|
192
208
|
mcp: this.getMcpServers(),
|
|
193
|
-
type: "cf_agent_mcp_servers"
|
|
209
|
+
type: "cf_agent_mcp_servers" /* CF_AGENT_MCP_SERVERS */
|
|
194
210
|
})
|
|
195
211
|
);
|
|
196
212
|
return new Response("<script>window.close();</script>", {
|
|
@@ -242,10 +258,8 @@ var _Agent = class _Agent extends Server {
|
|
|
242
258
|
displayMessage: `RPC call to ${method}`,
|
|
243
259
|
id: nanoid(),
|
|
244
260
|
payload: {
|
|
245
|
-
args,
|
|
246
261
|
method,
|
|
247
|
-
streaming: metadata?.streaming
|
|
248
|
-
success: true
|
|
262
|
+
streaming: metadata?.streaming
|
|
249
263
|
},
|
|
250
264
|
timestamp: Date.now(),
|
|
251
265
|
type: "rpc"
|
|
@@ -257,7 +271,7 @@ var _Agent = class _Agent extends Server {
|
|
|
257
271
|
id,
|
|
258
272
|
result,
|
|
259
273
|
success: true,
|
|
260
|
-
type: "rpc"
|
|
274
|
+
type: "rpc" /* RPC */
|
|
261
275
|
};
|
|
262
276
|
connection.send(JSON.stringify(response));
|
|
263
277
|
} catch (e) {
|
|
@@ -265,7 +279,7 @@ var _Agent = class _Agent extends Server {
|
|
|
265
279
|
error: e instanceof Error ? e.message : "Unknown error occurred",
|
|
266
280
|
id: parsed.id,
|
|
267
281
|
success: false,
|
|
268
|
-
type: "rpc"
|
|
282
|
+
type: "rpc" /* RPC */
|
|
269
283
|
};
|
|
270
284
|
connection.send(JSON.stringify(response));
|
|
271
285
|
console.error("RPC error:", e);
|
|
@@ -280,36 +294,34 @@ var _Agent = class _Agent extends Server {
|
|
|
280
294
|
this.onConnect = (connection, ctx2) => {
|
|
281
295
|
return agentContext.run(
|
|
282
296
|
{ agent: this, connection, request: ctx2.request, email: void 0 },
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
if (this.state) {
|
|
286
|
-
connection.send(
|
|
287
|
-
JSON.stringify({
|
|
288
|
-
state: this.state,
|
|
289
|
-
type: "cf_agent_state"
|
|
290
|
-
})
|
|
291
|
-
);
|
|
292
|
-
}
|
|
297
|
+
() => {
|
|
298
|
+
if (this.state) {
|
|
293
299
|
connection.send(
|
|
294
300
|
JSON.stringify({
|
|
295
|
-
|
|
296
|
-
type: "
|
|
301
|
+
state: this.state,
|
|
302
|
+
type: "cf_agent_state" /* CF_AGENT_STATE */
|
|
297
303
|
})
|
|
298
304
|
);
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
305
|
+
}
|
|
306
|
+
connection.send(
|
|
307
|
+
JSON.stringify({
|
|
308
|
+
mcp: this.getMcpServers(),
|
|
309
|
+
type: "cf_agent_mcp_servers" /* CF_AGENT_MCP_SERVERS */
|
|
310
|
+
})
|
|
311
|
+
);
|
|
312
|
+
this.observability?.emit(
|
|
313
|
+
{
|
|
314
|
+
displayMessage: "Connection established",
|
|
315
|
+
id: nanoid(),
|
|
316
|
+
payload: {
|
|
317
|
+
connectionId: connection.id
|
|
308
318
|
},
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
319
|
+
timestamp: Date.now(),
|
|
320
|
+
type: "connect"
|
|
321
|
+
},
|
|
322
|
+
this.ctx
|
|
323
|
+
);
|
|
324
|
+
return this._tryCatch(() => _onConnect(connection, ctx2));
|
|
313
325
|
}
|
|
314
326
|
);
|
|
315
327
|
};
|
|
@@ -323,13 +335,19 @@ var _Agent = class _Agent extends Server {
|
|
|
323
335
|
email: void 0
|
|
324
336
|
},
|
|
325
337
|
async () => {
|
|
326
|
-
|
|
338
|
+
await this._tryCatch(() => {
|
|
339
|
+
const servers = this.sql`
|
|
327
340
|
SELECT id, name, server_url, client_id, auth_url, callback_url, server_options FROM cf_agents_mcp_servers;
|
|
328
341
|
`;
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
342
|
+
this.broadcast(
|
|
343
|
+
JSON.stringify({
|
|
344
|
+
mcp: this.getMcpServers(),
|
|
345
|
+
type: "cf_agent_mcp_servers" /* CF_AGENT_MCP_SERVERS */
|
|
346
|
+
})
|
|
347
|
+
);
|
|
348
|
+
if (servers && Array.isArray(servers) && servers.length > 0) {
|
|
349
|
+
servers.forEach((server) => {
|
|
350
|
+
this._connectToMcpServerInternal(
|
|
333
351
|
server.name,
|
|
334
352
|
server.server_url,
|
|
335
353
|
server.callback_url,
|
|
@@ -338,18 +356,29 @@ var _Agent = class _Agent extends Server {
|
|
|
338
356
|
id: server.id,
|
|
339
357
|
oauthClientId: server.client_id ?? void 0
|
|
340
358
|
}
|
|
341
|
-
)
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
})
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
359
|
+
).then(() => {
|
|
360
|
+
this.broadcast(
|
|
361
|
+
JSON.stringify({
|
|
362
|
+
mcp: this.getMcpServers(),
|
|
363
|
+
type: "cf_agent_mcp_servers" /* CF_AGENT_MCP_SERVERS */
|
|
364
|
+
})
|
|
365
|
+
);
|
|
366
|
+
}).catch((error) => {
|
|
367
|
+
console.error(
|
|
368
|
+
`Error connecting to MCP server: ${server.name} (${server.server_url})`,
|
|
369
|
+
error
|
|
370
|
+
);
|
|
371
|
+
this.broadcast(
|
|
372
|
+
JSON.stringify({
|
|
373
|
+
mcp: this.getMcpServers(),
|
|
374
|
+
type: "cf_agent_mcp_servers" /* CF_AGENT_MCP_SERVERS */
|
|
375
|
+
})
|
|
376
|
+
);
|
|
377
|
+
});
|
|
378
|
+
});
|
|
379
|
+
}
|
|
380
|
+
return _onStart();
|
|
381
|
+
});
|
|
353
382
|
}
|
|
354
383
|
);
|
|
355
384
|
};
|
|
@@ -400,7 +429,6 @@ var _Agent = class _Agent extends Server {
|
|
|
400
429
|
}
|
|
401
430
|
}
|
|
402
431
|
_setStateInternal(state, source = "server") {
|
|
403
|
-
const previousState = this._state;
|
|
404
432
|
this._state = state;
|
|
405
433
|
this.sql`
|
|
406
434
|
INSERT OR REPLACE INTO cf_agents_state (id, state)
|
|
@@ -413,7 +441,7 @@ var _Agent = class _Agent extends Server {
|
|
|
413
441
|
this.broadcast(
|
|
414
442
|
JSON.stringify({
|
|
415
443
|
state,
|
|
416
|
-
type: "cf_agent_state"
|
|
444
|
+
type: "cf_agent_state" /* CF_AGENT_STATE */
|
|
417
445
|
}),
|
|
418
446
|
source !== "server" ? [source.id] : []
|
|
419
447
|
);
|
|
@@ -426,10 +454,7 @@ var _Agent = class _Agent extends Server {
|
|
|
426
454
|
{
|
|
427
455
|
displayMessage: "State updated",
|
|
428
456
|
id: nanoid(),
|
|
429
|
-
payload: {
|
|
430
|
-
previousState,
|
|
431
|
-
state
|
|
432
|
-
},
|
|
457
|
+
payload: {},
|
|
433
458
|
timestamp: Date.now(),
|
|
434
459
|
type: "state:update"
|
|
435
460
|
},
|
|
@@ -546,28 +571,22 @@ var _Agent = class _Agent extends Server {
|
|
|
546
571
|
while (proto && proto !== Object.prototype && depth < 10) {
|
|
547
572
|
const methodNames = Object.getOwnPropertyNames(proto);
|
|
548
573
|
for (const methodName of methodNames) {
|
|
549
|
-
|
|
574
|
+
const descriptor = Object.getOwnPropertyDescriptor(proto, methodName);
|
|
575
|
+
if (baseMethods.has(methodName) || methodName.startsWith("_") || !descriptor || !!descriptor.get || typeof descriptor.value !== "function") {
|
|
550
576
|
continue;
|
|
551
577
|
}
|
|
552
|
-
|
|
553
|
-
|
|
554
|
-
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
wrappedFunction,
|
|
563
|
-
callableMetadata.get(
|
|
564
|
-
this[methodName]
|
|
565
|
-
)
|
|
566
|
-
);
|
|
567
|
-
}
|
|
568
|
-
this.constructor.prototype[methodName] = wrappedFunction;
|
|
569
|
-
}
|
|
578
|
+
const wrappedFunction = withAgentContext(
|
|
579
|
+
// biome-ignore lint/suspicious/noExplicitAny: I can't typescript
|
|
580
|
+
this[methodName]
|
|
581
|
+
// biome-ignore lint/suspicious/noExplicitAny: I can't typescript
|
|
582
|
+
);
|
|
583
|
+
if (this._isCallable(methodName)) {
|
|
584
|
+
callableMetadata.set(
|
|
585
|
+
wrappedFunction,
|
|
586
|
+
callableMetadata.get(this[methodName])
|
|
587
|
+
);
|
|
570
588
|
}
|
|
589
|
+
this.constructor.prototype[methodName] = wrappedFunction;
|
|
571
590
|
}
|
|
572
591
|
proto = Object.getPrototypeOf(proto);
|
|
573
592
|
depth++;
|
|
@@ -714,7 +733,10 @@ var _Agent = class _Agent extends Server {
|
|
|
714
733
|
{
|
|
715
734
|
displayMessage: `Schedule ${schedule.id} created`,
|
|
716
735
|
id: nanoid(),
|
|
717
|
-
payload:
|
|
736
|
+
payload: {
|
|
737
|
+
callback,
|
|
738
|
+
id
|
|
739
|
+
},
|
|
718
740
|
timestamp: Date.now(),
|
|
719
741
|
type: "schedule:create"
|
|
720
742
|
},
|
|
@@ -849,7 +871,10 @@ var _Agent = class _Agent extends Server {
|
|
|
849
871
|
{
|
|
850
872
|
displayMessage: `Schedule ${id} cancelled`,
|
|
851
873
|
id: nanoid(),
|
|
852
|
-
payload:
|
|
874
|
+
payload: {
|
|
875
|
+
callback: schedule.callback,
|
|
876
|
+
id: schedule.id
|
|
877
|
+
},
|
|
853
878
|
timestamp: Date.now(),
|
|
854
879
|
type: "schedule:cancel"
|
|
855
880
|
},
|
|
@@ -935,7 +960,7 @@ var _Agent = class _Agent extends Server {
|
|
|
935
960
|
this.broadcast(
|
|
936
961
|
JSON.stringify({
|
|
937
962
|
mcp: this.getMcpServers(),
|
|
938
|
-
type: "cf_agent_mcp_servers"
|
|
963
|
+
type: "cf_agent_mcp_servers" /* CF_AGENT_MCP_SERVERS */
|
|
939
964
|
})
|
|
940
965
|
);
|
|
941
966
|
return result;
|
|
@@ -988,7 +1013,7 @@ var _Agent = class _Agent extends Server {
|
|
|
988
1013
|
this.broadcast(
|
|
989
1014
|
JSON.stringify({
|
|
990
1015
|
mcp: this.getMcpServers(),
|
|
991
|
-
type: "cf_agent_mcp_servers"
|
|
1016
|
+
type: "cf_agent_mcp_servers" /* CF_AGENT_MCP_SERVERS */
|
|
992
1017
|
})
|
|
993
1018
|
);
|
|
994
1019
|
}
|
|
@@ -1206,7 +1231,7 @@ var StreamingResponse = class {
|
|
|
1206
1231
|
id: this._id,
|
|
1207
1232
|
result: chunk,
|
|
1208
1233
|
success: true,
|
|
1209
|
-
type: "rpc"
|
|
1234
|
+
type: "rpc" /* RPC */
|
|
1210
1235
|
};
|
|
1211
1236
|
this._connection.send(JSON.stringify(response));
|
|
1212
1237
|
}
|
|
@@ -1224,7 +1249,7 @@ var StreamingResponse = class {
|
|
|
1224
1249
|
id: this._id,
|
|
1225
1250
|
result: finalChunk,
|
|
1226
1251
|
success: true,
|
|
1227
|
-
type: "rpc"
|
|
1252
|
+
type: "rpc" /* RPC */
|
|
1228
1253
|
};
|
|
1229
1254
|
this._connection.send(JSON.stringify(response));
|
|
1230
1255
|
}
|
|
@@ -1256,6 +1281,7 @@ function isLocalMode() {
|
|
|
1256
1281
|
|
|
1257
1282
|
export {
|
|
1258
1283
|
genericObservability,
|
|
1284
|
+
callable,
|
|
1259
1285
|
unstable_callable,
|
|
1260
1286
|
getCurrentAgent,
|
|
1261
1287
|
Agent,
|
|
@@ -1267,4 +1293,4 @@ export {
|
|
|
1267
1293
|
getAgentByName,
|
|
1268
1294
|
StreamingResponse
|
|
1269
1295
|
};
|
|
1270
|
-
//# sourceMappingURL=chunk-
|
|
1296
|
+
//# sourceMappingURL=chunk-PNF6ZMUA.js.map
|