@downcity/agent 1.1.23 → 1.1.32

package/src/runtime/server/http/services/services.ts

@@ -1,26 +1,26 @@
 /**
- * Service 路由模块。
+ * Runtime plugin 路由模块。
  *
  * 职责说明：
- * 1. 提供 service 状态列表接口。
- * 2. 提供 service lifecycle 控制接口。
- * 3. 提供统一 service command 桥接。
+ * 1. 提供 runtime plugin 状态列表接口。
+ * 2. 提供 runtime plugin lifecycle 控制接口。
+ * 3. 提供统一 runtime plugin command 桥接。
  */
 
 import { Hono } from "hono";
 import {
-  controlServiceState,
-  listServiceStates,
-  runServiceCommand,
-} from "@/service/core/Manager.js";
-import type { ServiceStateControlAction } from "@/service/core/Manager.js";
+  controlPluginState,
+  listPluginStates,
+  runPluginCommand,
+} from "@/plugin/core/Manager.js";
+import type { PluginStateControlAction } from "@/plugin/core/Manager.js";
 import type { AgentContext } from "@/core/AgentContextTypes.js";
-import { parseServiceCommandRequestBody } from "@/service/core/ServiceCommandRequest.js";
+import { parsePluginCommandRequestBody } from "@/plugin/core/PluginCommandRequest.js";
 
 /**
- * Service 路由参数。
+ * Runtime plugin 路由参数。
  */
-type ServicesRouterOptions = {
+type RuntimePluginRouterOptions = {
   /**
    * 读取当前 agent 执行上下文。
    */
@@ -28,71 +28,87 @@ type ServicesRouterOptions = {
 };
 
 /**
- * 创建 service 路由。
+ * 创建 runtime plugin 路由。
  */
 export function createServicesRouter(
-  options: ServicesRouterOptions,
+  options: RuntimePluginRouterOptions,
 ): Hono {
   const router = new Hono();
+  const listPaths = ["/api/plugins/runtime/list"];
+  const controlPaths = ["/api/plugins/runtime/control"];
+  const commandPaths = ["/api/plugins/runtime/command"];
 
-  router.get("/api/services/list", (c) => {
-    const context = options.getAgentContext();
-    return c.json({
-      success: true,
-      services: listServiceStates({ context }),
+  for (const routePath of listPaths) {
+    router.get(routePath, (c) => {
+      const context = options.getAgentContext();
+      const plugins = listPluginStates({ context });
+      return c.json({
+        success: true,
+        plugins,
+      });
     });
-  });
+  }
 
-  router.post("/api/services/control", async (c) => {
-    const body = await c.req.json().catch(() => null);
-    const serviceName = String(body?.serviceName || "").trim();
-    const action = String(body?.action || "")
-      .trim()
-      .toLowerCase();
+  for (const routePath of controlPaths) {
+    router.post(routePath, async (c) => {
+      const body = await c.req.json().catch(() => null);
+      const pluginName = String(body?.pluginName || "").trim();
+      const action = String(body?.action || "")
+        .trim()
+        .toLowerCase();
 
-    if (!serviceName) {
-      return c.json({ success: false, error: "serviceName is required" }, 400);
-    }
-    if (!action) {
-      return c.json({ success: false, error: "action is required" }, 400);
-    }
-    if (!["start", "stop", "restart", "status"].includes(action)) {
-      return c.json({ success: false, error: "invalid action" }, 400);
-    }
+      if (!pluginName) {
+        return c.json({ success: false, error: "pluginName is required" }, 400);
+      }
+      if (!action) {
+        return c.json({ success: false, error: "action is required" }, 400);
+      }
+      if (!["start", "stop", "restart", "status"].includes(action)) {
+        return c.json({ success: false, error: "invalid action" }, 400);
+      }
 
-    const result = await controlServiceState({
-      serviceName,
-      action: action as ServiceStateControlAction,
-      context: options.getAgentContext(),
+      const result = await controlPluginState({
+        pluginName,
+        action: action as PluginStateControlAction,
+        context: options.getAgentContext(),
+      });
+      return c.json(
+        result,
+        result.success ? 200 : 400,
+      );
     });
-    return c.json(result, result.success ? 200 : 400);
-  });
+  }
 
-  router.post("/api/services/command", async (c) => {
-    const body = await c.req.json().catch(() => null);
-    let requestBody;
-    try {
-      requestBody = parseServiceCommandRequestBody(body);
-    } catch (error) {
-      return c.json({ success: false, error: String(error) }, 400);
-    }
+  for (const routePath of commandPaths) {
+    router.post(routePath, async (c) => {
+      const body = await c.req.json().catch(() => null);
+      let requestBody;
+      try {
+        requestBody = parsePluginCommandRequestBody(body);
+      } catch (error) {
+        return c.json({ success: false, error: String(error) }, 400);
+      }
 
-    if (!requestBody.serviceName) {
-      return c.json({ success: false, error: "serviceName is required" }, 400);
-    }
-    if (!requestBody.command) {
-      return c.json({ success: false, error: "command is required" }, 400);
-    }
+      if (!requestBody.pluginName) {
+        return c.json({ success: false, error: "pluginName is required" }, 400);
+      }
+      if (!requestBody.command) {
+        return c.json({ success: false, error: "command is required" }, 400);
+      }
 
-    const result = await runServiceCommand({
-      serviceName: requestBody.serviceName,
-      command: requestBody.command,
-      payload: requestBody.payload,
-      schedule: requestBody.schedule,
-      context: options.getAgentContext(),
+      const result = await runPluginCommand({
+        pluginName: requestBody.pluginName,
+        command: requestBody.command,
+        payload: requestBody.payload,
+        schedule: requestBody.schedule,
+        context: options.getAgentContext(),
+      });
+      return c.json(
+        result,
+        result.success ? 200 : 400,
+      );
     });
-    return c.json(result, result.success ? 200 : 400);
-  });
+  }
 
   return router;
 }

package/src/runtime/server/rpc/Server.ts

@@ -21,14 +21,14 @@ import type {
   PluginListResponse,
 } from "@/plugin/types/PluginApi.js";
 import type {
-  ServiceControlAction,
-  ServiceCommandResponse,
-  ServiceControlResponse,
-  ServiceListResponse,
-} from "@/service/types/Services.js";
-import { listServiceStates, controlServiceState } from "@/service/core/ServiceStateController.js";
-import { runServiceCommand } from "@/service/core/ServiceActionRunner.js";
-import { parseServiceCommandRequestBody } from "@/service/core/ServiceCommandRequest.js";
+  PluginControlAction,
+  PluginCommandResponse,
+  PluginControlResponse,
+  PluginListResponse as RuntimePluginListResponse,
+} from "@/plugin/types/Plugins.js";
+import { listPluginStates, controlPluginState } from "@/plugin/core/PluginStateController.js";
+import { runPluginCommand } from "@/plugin/core/PluginActionRunner.js";
+import { parsePluginCommandRequestBody } from "@/plugin/core/PluginCommandRequest.js";
 import { executeBySessionId } from "@/runtime/server/http/control/ExecuteBySession.js";
 import { getLocalRpcEndpoint } from "@/runtime/transport/rpc/Paths.js";
 
@@ -79,57 +79,57 @@ function createErrorResponse(
   };
 }
 
-async function handleServiceControl(params: {
+async function handlePluginControl(params: {
   requestId: string;
   body: JsonValue | undefined;
   context: AgentContext;
 }): Promise<LocalRpcResponse> {
   const body = isObjectRecord(params.body) ? params.body : {};
-  const serviceName = String(body.serviceName || "").trim();
-  const action = String(body.action || "").trim() as ServiceControlAction;
-  if (!serviceName || !action) {
-    return createErrorResponse(params.requestId, 400, "serviceName and action are required");
+  const pluginName = String(body.pluginName || "").trim();
+  const action = String(body.action || "").trim() as PluginControlAction;
+  if (!pluginName || !action) {
+    return createErrorResponse(params.requestId, 400, "pluginName and action are required");
   }
-  const result = await controlServiceState({
-    serviceName,
+  const result = await controlPluginState({
+    pluginName,
     action,
     context: params.context,
   });
-  const payload: ServiceControlResponse = {
+  const payload: PluginControlResponse = {
     success: result.success,
-    ...(result.service ? { service: result.service } : {}),
+    ...(result.plugin ? { plugin: result.plugin } : {}),
     ...(result.error ? { error: result.error } : {}),
   };
   return createSuccessResponse(params.requestId, payload as unknown as JsonValue);
 }
 
-async function handleServiceCommand(params: {
+async function handlePluginCommand(params: {
   requestId: string;
   body: JsonValue | undefined;
   context: AgentContext;
 }): Promise<LocalRpcResponse> {
   let body;
   try {
-    body = parseServiceCommandRequestBody(params.body);
+    body = parsePluginCommandRequestBody(params.body);
   } catch (error) {
     return createErrorResponse(params.requestId, 400, String(error));
   }
-  if (!body.serviceName || !body.command) {
-    return createErrorResponse(params.requestId, 400, "serviceName and command are required");
+  if (!body.pluginName || !body.command) {
+    return createErrorResponse(params.requestId, 400, "pluginName and command are required");
   }
-  const result = await runServiceCommand({
-    serviceName: body.serviceName,
+  const result = await runPluginCommand({
+    pluginName: body.pluginName,
     command: body.command,
     payload: body.payload,
     schedule: body.schedule,
     context: params.context,
   });
-  const payload: ServiceCommandResponse = {
+  const payload: PluginCommandResponse = {
     success: result.success,
-    ...(result.service ? { service: result.service } : {}),
+    ...(result.plugin ? { plugin: result.plugin } : {}),
     ...(result.data !== undefined ? { data: result.data } : {}),
     ...(result.message ? { message: result.message } : {}),
-    ...(result.success ? {} : { error: result.message || "service command failed" }),
+    ...(result.success ? {} : { error: result.message || "plugin command failed" }),
   };
   return createSuccessResponse(params.requestId, payload as unknown as JsonValue);
 }
@@ -251,22 +251,31 @@ async function dispatchRequest(params: {
   runtime?: AgentRuntime;
 }): Promise<LocalRpcResponse> {
   const { request } = params;
-  if (request.method === "GET" && request.path === "/api/services/list") {
-    const payload: ServiceListResponse = {
+  if (
+    request.method === "GET" &&
+    request.path === "/api/plugins/runtime/list"
+  ) {
+    const payload: RuntimePluginListResponse = {
       success: true,
-      services: listServiceStates({ context: params.context }),
+      plugins: listPluginStates({ context: params.context }),
     };
     return createSuccessResponse(request.requestId, payload as unknown as JsonValue);
   }
-  if (request.method === "POST" && request.path === "/api/services/control") {
-    return await handleServiceControl({
+  if (
+    request.method === "POST" &&
+    request.path === "/api/plugins/runtime/control"
+  ) {
+    return await handlePluginControl({
       requestId: request.requestId,
       body: request.body,
       context: params.context,
     });
   }
-  if (request.method === "POST" && request.path === "/api/services/command") {
-    return await handleServiceCommand({
+  if (
+    request.method === "POST" &&
+    request.path === "/api/plugins/runtime/command"
+  ) {
+    return await handlePluginCommand({
       requestId: request.requestId,
       body: request.body,
       context: params.context,

package/src/sdk/Agent.ts

@@ -3,12 +3,12 @@
  *
  * 关键点（中文）
  * - `Agent` 现在是实例外观层，长期运行状态下沉到 `AgentCore`。
- * - session、HTTP、RPC、service lifecycle 都按需异步初始化。
+ * - session、HTTP、RPC、runtime plugin lifecycle 都按需异步初始化。
  * - `start/stop` 是唯一公开的长期运行生命周期入口。
  */
 
 import type { Tool } from "ai";
-import type { BaseService } from "@/service/builtins/BaseService.js";
+import type { BasePlugin } from "@/plugin/core/BasePlugin.js";
 import type { AgentContext } from "@/core/AgentContextTypes.js";
 import type { AgentRuntime } from "@/core/AgentCoreTypes.js";
 import type {
@@ -26,7 +26,7 @@ import type {
 } from "@/sdk/AgentSdkTypes.js";
 import { Session } from "@/sdk/Session.js";
 import { AgentCore } from "@/core/AgentCore.js";
-import { startAllServices, stopAllServices } from "@/service/core/Manager.js";
+import { startAllPlugins, stopAllPlugins } from "@/plugin/core/Manager.js";
 import { startServer } from "@/runtime/server/http/Server.js";
 import { startLocalRpcServer } from "@/runtime/server/rpc/Server.js";
 
@@ -38,9 +38,9 @@ export class Agent {
   readonly id: string;
   readonly path: string;
   readonly tools: Record<string, Tool>;
-  readonly services: Map<string, BaseService>;
+  readonly runtimePlugins: Map<string, BasePlugin>;
   readonly plugins: PluginPort;
-  private servicesStarted = false;
+  private runtimePluginsStarted = false;
   private startPromise: Promise<AgentStartResult> | null = null;
   private httpBinding: AgentHttpBinding | null = null;
   private rpcBinding: AgentRpcBinding | null = null;
@@ -50,7 +50,7 @@ export class Agent {
     this.id = this.core.id;
     this.path = this.core.path;
     this.tools = this.core.tools;
-    this.services = this.core.services;
+    this.runtimePlugins = this.core.runtimePlugins;
     this.plugins = this.core.plugins;
   }
 
@@ -69,16 +69,16 @@ export class Agent {
   }
 
   /**
-   * 确保显式注入的 services 已启动。
+   * 确保显式注入的 runtime plugins 已启动。
    */
-  async ensureServicesStarted(): Promise<void> {
-    if (this.servicesStarted) return;
-    const lifecycle = await startAllServices(this.getContext());
-    this.servicesStarted = true;
+  async ensureRuntimePluginsStarted(): Promise<void> {
+    if (this.runtimePluginsStarted) return;
+    const lifecycle = await startAllPlugins(this.getContext());
+    this.runtimePluginsStarted = true;
     for (const item of lifecycle.results) {
       if (!item.success) {
         this.getRuntime().logger.error(
-          `Service start failed: ${item.service?.name || "unknown"} - ${item.error || "unknown error"}`,
+          `Plugin start failed: ${item.plugin?.name || "unknown"} - ${item.error || "unknown error"}`,
         );
       }
     }
@@ -92,10 +92,10 @@ export class Agent {
       return await this.startPromise;
     }
     this.startPromise = (async () => {
-      const shouldStartServices = options?.services !== false;
+      const shouldStartRuntimePlugins = options?.runtimePlugins !== false;
 
-      if (shouldStartServices) {
-        await this.ensureServicesStarted();
+      if (shouldStartRuntimePlugins) {
+        await this.ensureRuntimePluginsStarted();
       }
 
       const httpBinding =
@@ -110,7 +110,7 @@ export class Agent {
       return {
         ...(httpBinding ? { http: httpBinding } : {}),
         ...(rpcBinding ? { rpc: rpcBinding } : {}),
-        servicesStarted: this.servicesStarted,
+        runtimePluginsStarted: this.runtimePluginsStarted,
       };
     })();
     try {
@@ -125,13 +125,13 @@ export class Agent {
    * 停止当前 agent 实例的长期运行能力。
    */
   async stop(): Promise<AgentStopResult> {
-    const servicesStarted = this.servicesStarted;
+    const runtimePluginsStarted = this.runtimePluginsStarted;
     const rpcStarted = this.rpcBinding !== null;
     const httpStarted = this.httpBinding !== null;
 
-    if (servicesStarted) {
-      await stopAllServices(this.getContext());
-      this.servicesStarted = false;
+    if (runtimePluginsStarted) {
+      await stopAllPlugins(this.getContext());
+      this.runtimePluginsStarted = false;
     }
 
     if (rpcStarted) {
@@ -147,7 +147,7 @@ export class Agent {
     return {
       httpStopped: httpStarted,
       rpcStopped: rpcStarted,
-      servicesStopped: servicesStarted,
+      runtimePluginsStopped: runtimePluginsStarted,
     };
   }
 

package/src/sdk/AgentSdkTypes.ts

@@ -3,12 +3,12 @@
  *
  * 关键点（中文）
  * - 这里集中声明 `Agent` / `RemoteAgent` / `Session` 面向外部调用方的稳定接口。
- * - SDK 用户通过显式 `tools` / `services` / `plugins` 装配能力，不直接依赖内部 runtime 单例。
+ * - SDK 用户通过显式 `tools` / `runtimePlugins` / `plugins` 装配能力，不直接依赖内部 runtime 单例。
  * - 本地/远程 session 运行与基础落盘能力仍是 SDK 主路径。
  */
 
 import type { LanguageModel, Tool } from "ai";
-import type { BaseService } from "@/service/builtins/BaseService.js";
+import type { BasePlugin } from "@/plugin/core/BasePlugin.js";
 import type { Plugin } from "@/plugin/types/Plugin.js";
 import type { AgentPlatformRuntime } from "@/types/runtime/host/AgentHost.js";
 import type { LocalRpcServerHandle } from "@/types/runtime/rpc/LocalRpc.js";
@@ -63,23 +63,23 @@ export interface AgentOptions {
   model?: LanguageModel;
 
   /**
-   * 当前 agent 显式持有的 service 实例集合。
+   * 当前 agent 显式持有的 runtime plugin 实例集合。
    *
    * 关键点（中文）
-   * - 这里接收已经实例化好的 service，而不是 service class。
+   * - 这里接收已经实例化好的 runtime plugin，而不是 plugin class。
    * - `Agent` 会在构造阶段按名称注册这些实例，并在启动时自动绑定 runtime。
-   * - v1 推荐显式传入 `new ChatService(...)` 这类实例，而不是依赖包内隐式注册表。
+   * - v1 推荐显式传入 `new ChatPlugin(...)` 这类实例，而不是依赖包内隐式注册表。
    */
-  services?: BaseService[];
+  runtimePlugins?: BasePlugin[];
 
   /**
-   * 是否自动装配全部内建 service。
+   * 是否自动装配全部内建 runtime plugin。
    *
    * 关键点（中文）
    * - 适合 city 这类宿主进程直接 `new Agent(...)` 的场景。
-   * - 未开启时，默认只使用显式传入的 `services`。
+   * - 未开启时，默认只使用显式传入的 `runtimePlugins`。
    */
-  useBuiltinServices?: boolean;
+  useBuiltinRuntimePlugins?: boolean;
 
   /**
    * 当前 agent 显式注册的 plugin 定义集合。
@@ -145,13 +145,13 @@ export interface AgentStartOptions {
   rpc?: boolean;
 
   /**
-   * 是否启动当前 agent 的 services。
+   * 是否启动当前 agent 的 runtime plugins。
    *
    * 关键点（中文）
    * - 默认 `true`。
    * - `false` 适合只需要 session 能力、不希望启动后台能力的嵌入场景。
    */
-  services?: boolean;
+  runtimePlugins?: boolean;
 }
 
 /**
@@ -169,9 +169,9 @@ export interface AgentStopResult {
   rpcStopped: boolean;
 
   /**
-   * 本次是否实际停止了 services。
+   * 本次是否实际停止了 runtime plugins。
    */
-  servicesStopped: boolean;
+  runtimePluginsStopped: boolean;
 }
 
 /**
@@ -189,9 +189,9 @@ export interface AgentStartResult {
   rpc?: AgentRpcBinding;
 
   /**
-   * 当前 agent 是否已启动 services。
+   * 当前 agent 是否已启动 runtime plugins。
    */
-  servicesStarted: boolean;
+  runtimePluginsStarted: boolean;
 }
 
 /**
@@ -296,7 +296,6 @@ export interface AgentSessionConfigSnapshot {
 export type AgentSessionSystemBlockSource =
   | "core"
   | "instruction"
-  | "service"
   | "plugin"
   | "session";
 
@@ -314,7 +313,7 @@ export interface AgentSessionSystemBlock {
    *
    * 说明（中文）
    * - `instruction` 通常使用 `agent`。
-   * - `service` / `plugin` 使用对应 service/plugin 名称。
+   * - `plugin` 使用对应 plugin 名称。
    * - `core` 使用 `default`。
    * - `session` 使用当前 session 上下文名称。
    */

package/src/sdk/RemoteAgent.ts

@@ -540,6 +540,7 @@ function extractTurnId(event: AgentSessionEvent): string | null {
     case "reasoning-delta":
     case "tool-call":
     case "tool-result":
+    case "assistant-step":
     case "turn-finish":
       return event.turnId;
     default: