@cloudbase/agent-server 0.0.2 → 0.0.3

package/CHANGELOG.md

@@ -1,5 +1,74 @@
 # @cloudbase/agent-server
 
+## 0.0.11-alpha.3
+
+### Patch Changes
+
+- alpha release 0.0.10-alpha.2
+  - Update all public packages to version 0.0.10-alpha.2
+  - Trigger automated alpha release workflow
+  - Includes latest features and improvements
+
+- Updated dependencies
+  - @cloudbase/agent-shared@0.0.11-alpha.3
+
+## 0.0.11-alpha.2
+
+### Patch Changes
+
+- alpha release 0.0.10-alpha.2
+  - Update all public packages to version 0.0.10-alpha.2
+  - Trigger automated alpha release workflow
+  - Includes latest features and improvements
+
+- Updated dependencies
+  - @cloudbase/agent-agents@0.0.11-alpha.2
+  - @cloudbase/agent-shared@0.0.11-alpha.2
+
+## 0.0.11-alpha.1
+
+### Patch Changes
+
+- alpha release 0.0.10-alpha.2
+  - Update all public packages to version 0.0.10-alpha.2
+  - Trigger automated alpha release workflow
+  - Includes latest features and improvements
+
+- Updated dependencies
+  - @cloudbase/agent-agents@0.0.11-alpha.1
+  - @cloudbase/agent-shared@0.0.11-alpha.1
+
+## 0.0.11-alpha.0
+
+### Patch Changes
+
+- 97b2740: alpha release 0.0.10-alpha.2
+  - Update all public packages to version 0.0.10-alpha.2
+  - Trigger automated alpha release workflow
+  - Includes latest features and improvements
+
+- fd4c62a: alpha release 0.0.10-alpha.2
+  - Update all public packages to version 0.0.10-alpha.2
+  - Trigger automated alpha release workflow
+  - Includes latest features and improvements
+
+- da3388c: alpha release 0.0.10-alpha.2
+  - Update all public packages to version 0.0.10-alpha.2
+  - Trigger automated alpha release workflow
+  - Includes latest features and improvements
+
+- alpha release 0.0.10-alpha.2
+  - Update all public packages to version 0.0.10-alpha.2
+  - Trigger automated alpha release workflow
+  - Includes latest features and improvements
+
+- Updated dependencies [97b2740]
+- Updated dependencies [fd4c62a]
+- Updated dependencies [da3388c]
+- Updated dependencies
+  - @cloudbase/agent-agents@0.0.11-alpha.0
+  - @cloudbase/agent-shared@0.0.11-alpha.0
+
 ## 0.0.10
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,7 +1,9 @@
+import { CreateCopilotRuntimeServerOptions } from '@copilotkit/runtime';
+import { CopilotRuntimeOptions } from '@copilotkit/runtime/v2';
 import express, { Express } from 'express';
-import { AbstractAgent } from '@cloudbase/agent-agents/abstract';
+import * as _ag_ui_client from '@ag-ui/client';
+import { AbstractAgent, RunAgentInput } from '@ag-ui/client';
 import cors from 'cors';
-import { AbstractAgent as AbstractAgent$1 } from '@ag-ui/client';
 import { SendMessageInput } from '@cloudbase/agent-shared';
 import { Repeater } from '@repeaterjs/repeater';
 import * as _whatwg_node_server from '@whatwg-node/server';
@@ -21,14 +23,21 @@ interface ICreateServer {
 }
 declare function run(props: ICreateServer & {
     port?: number | string;
-}): void;
-declare function createExpressServer(props: ICreateServer): Express;
+}): Promise<void>;
+declare function createExpressServer(props: ICreateServer): Promise<Express>;
 interface ICreateExpressRoutes extends ICreateServer {
     express: Express;
+    useAGUI?: boolean;
+    aguiOptions?: AGUIOptions;
+}
+declare function createExpressRoutes({ createAgent, basePath: _basePath, express, useAGUI, aguiOptions, }: ICreateExpressRoutes): Promise<express.Express>;
+interface AGUIOptions {
+    agentId?: string;
+    runtimeOptions?: Partial<CopilotRuntimeOptions>;
+    endpointOptions?: Partial<CreateCopilotRuntimeServerOptions>;
 }
-declare function createExpressRoutes({ createAgent, basePath: _basePath, express, }: ICreateExpressRoutes): express.Express;
 
-declare function handler$1(input: SendMessageInput, agent: AbstractAgent$1): Repeater<{
+declare function handler$2(input: SendMessageInput, agent: AbstractAgent): Repeater<{
     type: "text";
     content: string;
 } | {
@@ -53,6 +62,18 @@ declare function handler$1(input: SendMessageInput, agent: AbstractAgent$1): Rep
     payload: any;
 }, any, unknown>;
 
+declare function createServerAdapter$2(createAgent: AgentCreator): _whatwg_node_server.ServerAdapter<{}, _whatwg_node_server.ServerAdapterBaseObject<{}, (request: Request) => Promise<Response>>>;
+
+declare namespace index$4 {
+  export { createServerAdapter$2 as createServerAdapter, handler$2 as handler };
+}
+
+declare function handler$1(input: RunAgentInput, agent: AbstractAgent): Repeater<{
+    type: _ag_ui_client.EventType;
+    timestamp?: number | undefined;
+    rawEvent?: any;
+}, any, unknown>;
+
 declare function createServerAdapter$1(createAgent: AgentCreator): _whatwg_node_server.ServerAdapter<{}, _whatwg_node_server.ServerAdapterBaseObject<{}, (request: Request) => Promise<Response>>>;
 
 declare namespace index$3 {
@@ -72,7 +93,7 @@ type ChatCompletionsInput = {
     messages: Array<OpenAIMessage>;
     tools?: Array<OpenAITool>;
 };
-declare function handler(input: ChatCompletionsInput, agent: AbstractAgent$1): Repeater<OpenAI.Chat.Completions.ChatCompletionChunk, any, unknown>;
+declare function handler(input: ChatCompletionsInput, agent: AbstractAgent): Repeater<OpenAI.Chat.Completions.ChatCompletionChunk, any, unknown>;
 
 declare function createServerAdapter(createAgent: AgentCreator): _whatwg_node_server.ServerAdapter<{}, _whatwg_node_server.ServerAdapterBaseObject<{}, (request: Request) => Promise<Response>>>;
 
@@ -83,7 +104,7 @@ declare namespace index$1 {
 }
 
 declare namespace index {
-  export { index$2 as healthz, index$1 as openai, index$3 as sendMessage };
+  export { index$2 as healthz, index$1 as openai, index$4 as sendMessage, index$3 as sendMessageAGUI };
 }
 
 export { type AgentCreator, index as agui, createExpressRoutes, createExpressServer, run };

package/dist/index.js

@@ -41,7 +41,8 @@ var agui_exports = {};
 __export(agui_exports, {
   healthz: () => healthz_exports,
   openai: () => openai_exports,
-  sendMessage: () => sendMessage_exports
+  sendMessage: () => sendMessage_exports,
+  sendMessageAGUI: () => sendMessageAGUI_exports
 });
 
 // src/agui/sendMessage/index.ts
@@ -73,12 +74,20 @@ function handler(input, agent) {
         onTextMessageContentEvent: ({ event }) => {
           push({
             type: "text",
-            content: event.delta
+            content: event.delta,
+            rawEvent: event.rawEvent
           });
         },
         onRunFinishedEvent: () => {
           stop();
         },
+        onRunErrorEvent: ({ event }) => {
+          push({
+            type: "error",
+            error: event.message,
+            code: event.code
+          });
+        },
         onToolCallStartEvent: ({ event }) => {
           push({
             type: "tool-call-start",
@@ -194,25 +203,90 @@ function createServerAdapter(createAgent) {
   });
 }
 
+// src/agui/sendMessageAGUI/index.ts
+var sendMessageAGUI_exports = {};
+__export(sendMessageAGUI_exports, {
+  createServerAdapter: () => createServerAdapter2,
+  handler: () => handler2
+});
+
+// src/agui/sendMessageAGUI/handler.ts
+var import_repeater2 = require("@repeaterjs/repeater");
+function handler2(input, agent) {
+  return new import_repeater2.Repeater(async (push, stop) => {
+    agent.setMessages(input.messages);
+    agent.setState(input.state);
+    agent.threadId = input.threadId;
+    await agent.runAgent(input, {
+      onEvent: ({ event }) => {
+        push(event);
+      }
+    });
+    stop();
+  });
+}
+
+// src/agui/sendMessageAGUI/server.ts
+var import_server3 = require("@whatwg-node/server");
+var import_client2 = require("@ag-ui/client");
+function createServerAdapter2(createAgent) {
+  return (0, import_server3.createServerAdapter)(async (request) => {
+    const input = import_client2.RunAgentInputSchema.parse(await request.json());
+    const { agent: unknownAgent, cleanup } = await Promise.resolve(createAgent());
+    const agent = "toAGUIAgent" in unknownAgent ? unknownAgent.toAGUIAgent() : unknownAgent;
+    const events = handler2(input, agent);
+    let heartbeat;
+    const stream = new ReadableStream({
+      async start(controller) {
+        const encoder = new TextEncoder();
+        heartbeat = setInterval(() => {
+          controller.enqueue(encoder.encode(":ping\n\n"));
+        }, 15 * 1e3);
+        try {
+          for await (const event of events) {
+            const sseChunk = `data: ${JSON.stringify(event)}
+
+`;
+            controller.enqueue(encoder.encode(sseChunk));
+          }
+        } finally {
+          if (heartbeat) clearInterval(heartbeat);
+          controller.close();
+          cleanup == null ? void 0 : cleanup();
+        }
+      },
+      cancel() {
+        if (heartbeat) clearInterval(heartbeat);
+      }
+    });
+    const headers = new Headers({
+      "Content-Type": "text/event-stream",
+      "Cache-Control": "no-cache, no-transform",
+      Connection: "keep-alive"
+    });
+    return new Response(stream, { status: 200, headers });
+  });
+}
+
 // src/agui/healthz/index.ts
 var healthz_exports = {};
 __export(healthz_exports, {
   serverAdapter: () => serverAdapter
 });
-var import_server3 = require("@whatwg-node/server");
-var serverAdapter = (0, import_server3.createServerAdapter)(() => new Response("OK"));
+var import_server5 = require("@whatwg-node/server");
+var serverAdapter = (0, import_server5.createServerAdapter)(() => new Response("OK"));
 
 // src/agui/openai/index.ts
 var openai_exports = {};
 __export(openai_exports, {
-  createServerAdapter: () => createServerAdapter2,
-  handler: () => handler2
+  createServerAdapter: () => createServerAdapter3,
+  handler: () => handler3
 });
 
 // src/agui/openai/handler.ts
 var import_uuid2 = require("uuid");
-var import_repeater2 = require("@repeaterjs/repeater");
-function handler2(input, agent) {
+var import_repeater3 = require("@repeaterjs/repeater");
+function handler3(input, agent) {
   var _a;
   const res = handler(
     {
@@ -226,7 +300,7 @@ function handler2(input, agent) {
     },
     agent
   );
-  return new import_repeater2.Repeater(async (push, stop) => {
+  return new import_repeater3.Repeater(async (push, stop) => {
     const id = (0, import_uuid2.v4)();
     let tools = [];
     let lastWithToolCall = false;
@@ -352,13 +426,13 @@ function openAIMessageToClientMessage(message) {
 }
 
 // src/agui/openai/server.ts
-var import_server4 = require("@whatwg-node/server");
-function createServerAdapter2(createAgent) {
-  return (0, import_server4.createServerAdapter)(async (request) => {
+var import_server6 = require("@whatwg-node/server");
+function createServerAdapter3(createAgent) {
+  return (0, import_server6.createServerAdapter)(async (request) => {
     const input = await request.json();
     const { agent: unknownAgent, cleanup } = await Promise.resolve(createAgent());
     const agent = "toAGUIAgent" in unknownAgent ? unknownAgent.toAGUIAgent() : unknownAgent;
-    const events = handler2(input, agent);
+    const events = handler3(input, agent);
     const stream = new ReadableStream({
       async start(controller) {
         const encoder = new TextEncoder();
@@ -383,34 +457,45 @@ function createServerAdapter2(createAgent) {
 }
 
 // src/express.ts
+var import_runtime = require("@copilotkit/runtime");
 var import_express = __toESM(require("express"));
 var import_cors = __toESM(require("cors"));
-function run(props) {
+async function run(props) {
   const { port, ...rest } = props;
-  createExpressServer(rest).listen(
+  (await createExpressServer(rest)).listen(
     typeof port === "number" ? port : parseInt(port)
   );
 }
-function createExpressServer(props) {
+async function createExpressServer(props) {
   const { cors: corsOption = true } = props;
   const app = (0, import_express.default)();
   if (corsOption) {
     app.use(isCorsOptions(corsOption) ? (0, import_cors.default)(corsOption) : (0, import_cors.default)());
   }
-  createExpressRoutes({
+  await createExpressRoutes({
     ...props,
     express: app,
     basePath: props.basePath ?? process.env.TENCENTCLOUD_RUNENV === "SCF" ? "/v1/aibot/bots/:agentId/" : void 0
   });
   return app;
 }
-function createExpressRoutes({
+async function createExpressRoutes({
   createAgent,
   basePath: _basePath,
-  express: express2
+  express: express2,
+  useAGUI,
+  aguiOptions
 }) {
   const basePath = _basePath ?? "/";
-  const sendMessageServerAdapter = sendMessage_exports.createServerAdapter(createAgent);
+  const sendMessageServerAdapter = useAGUI ? sendMessageAGUI_exports.createServerAdapter(createAgent) : sendMessage_exports.createServerAdapter(createAgent);
+  if (useAGUI) {
+    await createAGUIRoute({
+      basePath,
+      express: express2,
+      createAgent,
+      ...aguiOptions || {}
+    });
+  }
   const openaiServerAdapter = openai_exports.createServerAdapter(createAgent);
   const healthzServerAdapter = healthz_exports.serverAdapter;
   express2.use(`${basePath}send-message`, sendMessageServerAdapter);
@@ -418,6 +503,30 @@ function createExpressRoutes({
   express2.use(`${basePath}chat/completions`, openaiServerAdapter);
   return express2;
 }
+async function createAGUIRoute({
+  createAgent,
+  express: express2,
+  agentId,
+  basePath,
+  runtimeOptions,
+  endpointOptions
+}) {
+  const agent = (await createAgent()).agent;
+  const aguiAgent = "toAGUIAgent" in agent ? agent.toAGUIAgent() : agent;
+  const runtime = new import_runtime.CopilotRuntime({
+    agents: {
+      [agentId || "default"]: aguiAgent
+    },
+    ...runtimeOptions || {}
+  });
+  const rpcHandler = (0, import_runtime.copilotRuntimeNodeExpressEndpoint)({
+    endpoint: `${basePath}agui`,
+    runtime,
+    serviceAdapter: new import_runtime.EmptyAdapter(),
+    ...endpointOptions || {}
+  });
+  express2.post(`${basePath}agui`, rpcHandler);
+}
 function isCorsOptions(cors2) {
   return typeof cors2 === "boolean";
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/agent-server",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "main": "dist/index.js",
   "files": [
     "dist/",
@@ -11,7 +11,8 @@
   "license": "ISC",
   "description": "",
   "dependencies": {
-    "@ag-ui/client": "^0.0.38",
+    "@ag-ui/client": "0.0.42",
+    "@copilotkit/runtime": "^1.50.1",
     "@repeaterjs/repeater": "^3.0.6",
     "@whatwg-node/server": "^0.10.12",
     "cors": "^2.8.5",
@@ -19,8 +20,7 @@
     "openai": "6.3.0",
     "uuid": "^10.0.0",
     "zod": "^4.1.12",
-    "@cloudbase/agent-agents": "0.0.2",
-    "@cloudbase/agent-shared": "^0.0.2"
+    "@cloudbase/agent-shared": "^0.0.3"
   },
   "devDependencies": {
     "@types/cors": "^2.8.19",