@downcity/agent 1.1.25 → 1.1.35

package/src/runtime/server/http/sdk/SessionRoutes.ts

@@ -8,7 +8,10 @@
  */
 
 import { Hono } from "hono";
-import type { AgentCore } from "@/core/AgentCore.js";
+import type {
+  AgentListSessionsInput,
+  AgentSessionCollection,
+} from "@/sdk/AgentSdkTypes.js";
 import type { AgentSessionPromptInput } from "@/types/sdk/AgentSessionPrompt.js";
 import type { AgentSessionEvent } from "@/types/sdk/AgentSessionEvent.js";
 
@@ -22,14 +25,20 @@ const SDK_EVENTS_READY_FRAME = {
  */
 export function registerSdkSessionRoutes(
   app: Hono,
-  core: Pick<AgentCore, "session" | "sessions">,
+  sessionCollection: AgentSessionCollection,
 ): void {
   app.get("/api/sdk/sessions", async (c) => {
     try {
-      const sessions = await core.sessions();
+      const input: AgentListSessionsInput = {
+        ...(c.req.query("limit") ? { limit: Number(c.req.query("limit")) } : {}),
+        ...(c.req.query("cursor") ? { cursor: c.req.query("cursor") } : {}),
+        ...(c.req.query("query") ? { query: c.req.query("query") } : {}),
+      };
+      const page = await sessionCollection.listSessions(input);
       return c.json({
         success: true,
-        sessions,
+        page,
+        sessions: page.items,
       });
     } catch (error) {
       return c.json(
@@ -47,11 +56,34 @@ export function registerSdkSessionRoutes(
       const body = (await c.req.json().catch(() => ({}))) as {
         sessionId?: unknown;
       };
-      const rawSessionId = String(body.sessionId || "").trim();
-      const session = await core.session(rawSessionId || undefined);
+      const session = await sessionCollection.createSession({
+        ...(body.sessionId ? { sessionId: String(body.sessionId).trim() } : {}),
+      });
+      return c.json({
+        success: true,
+        session: await session.getInfo(),
+      });
+    } catch (error) {
+      return c.json(
+        {
+          success: false,
+          error: error instanceof Error ? error.message : String(error),
+        },
+        500,
+      );
+    }
+  });
+
+  app.get("/api/sdk/sessions/:sessionId", async (c) => {
+    try {
+      const sessionId = String(c.req.param("sessionId") || "").trim();
+      if (!sessionId) {
+        return c.json({ success: false, error: "Missing sessionId" }, 400);
+      }
+      const session = await sessionCollection.getSession(sessionId);
       return c.json({
         success: true,
-        session: await session.toMetadata(),
+        session: await session.getInfo(),
       });
     } catch (error) {
       return c.json(
@@ -71,7 +103,7 @@ export function registerSdkSessionRoutes(
         return c.json({ success: false, error: "Missing sessionId" }, 400);
       }
       const body = (await c.req.json()) as AgentSessionPromptInput;
-      const session = await core.session(sessionId);
+      const session = await sessionCollection.getSession(sessionId);
       const turn = await session.prompt(body);
       return c.json({
         success: true,
@@ -97,7 +129,7 @@ export function registerSdkSessionRoutes(
     }
 
     try {
-      const session = await core.session(sessionId);
+      const session = await sessionCollection.getSession(sessionId);
       const encoder = new TextEncoder();
       const requestSignal = c.req.raw.signal;
 
@@ -158,16 +190,52 @@ export function registerSdkSessionRoutes(
     }
   });
 
+  app.get("/api/sdk/sessions/:sessionId/history", async (c) => {
+    try {
+      const sessionId = String(c.req.param("sessionId") || "").trim();
+      if (!sessionId) {
+        return c.json({ success: false, error: "Missing sessionId" }, 400);
+      }
+      const session = await sessionCollection.getSession(sessionId);
+      const history = await session.history({
+        ...(c.req.query("limit") ? { limit: Number(c.req.query("limit")) } : {}),
+        ...(c.req.query("cursor") ? { cursor: c.req.query("cursor") } : {}),
+        ...(c.req.query("order")
+          ? { order: c.req.query("order") as "asc" | "desc" }
+          : {}),
+        ...(c.req.query("view")
+          ? { view: c.req.query("view") as "message" | "timeline" }
+          : {}),
+      });
+      return c.json({
+        success: true,
+        history,
+      });
+    } catch (error) {
+      return c.json(
+        {
+          success: false,
+          error: error instanceof Error ? error.message : String(error),
+        },
+        500,
+      );
+    }
+  });
+
   app.get("/api/sdk/sessions/:sessionId/messages", async (c) => {
     try {
       const sessionId = String(c.req.param("sessionId") || "").trim();
       if (!sessionId) {
         return c.json({ success: false, error: "Missing sessionId" }, 400);
       }
-      const session = await core.session(sessionId);
+      const session = await sessionCollection.getSession(sessionId);
+      const history = await session.history({
+        view: "message",
+      });
       return c.json({
         success: true,
-        messages: await session.history(),
+        messages: history.items,
+        history,
       });
     } catch (error) {
       return c.json(
@@ -186,7 +254,7 @@ export function registerSdkSessionRoutes(
       if (!sessionId) {
         return c.json({ success: false, error: "Missing sessionId" }, 400);
       }
-      const session = await core.session(sessionId);
+      const session = await sessionCollection.getSession(sessionId);
       return c.json({
         success: true,
         system: await session.system(),
@@ -211,13 +279,13 @@ export function registerSdkSessionRoutes(
       const body = (await c.req.json().catch(() => ({}))) as {
         messageId?: unknown;
       };
-      const session = await core.session(sessionId);
+      const session = await sessionCollection.getSession(sessionId);
       const forked = await session.fork(
         String(body.messageId || "").trim() || undefined,
       );
       return c.json({
         success: true,
-        session: await forked.toMetadata(),
+        session: await forked.getInfo(),
       });
     } catch (error) {
       return c.json(

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

@@ -11,24 +11,23 @@ import net, { type Server } from "node:net";
 import path from "node:path";
 import type { AgentRuntime } from "@/core/AgentCoreTypes.js";
 import type { AgentContext } from "@/core/AgentContextTypes.js";
-import type { AgentCore } from "@/core/AgentCore.js";
 import type { JsonValue } from "@/types/common/Json.js";
 import type { LocalRpcRequest, LocalRpcResponse, LocalRpcServerHandle } from "@/types/runtime/rpc/LocalRpc.js";
 import type { ControlSessionExecuteRequestBody } from "@/runtime/server/http/control/types/ControlSessionExecute.js";
 import type {
   PluginActionResponse,
   PluginAvailabilityResponse,
-  PluginListResponse,
+  PluginCatalogResponse,
 } 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,
+  PluginStateListResponse,
+} 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 +78,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,29 +250,38 @@ 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/list"
+  ) {
+    const payload: PluginStateListResponse = {
       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/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/command"
+  ) {
+    return await handlePluginCommand({
       requestId: request.requestId,
       body: request.body,
       context: params.context,
     });
   }
-  if (request.method === "GET" && request.path === "/api/plugins/list") {
-    const payload: PluginListResponse = {
+  if (request.method === "GET" && request.path === "/api/plugins/catalog") {
+    const payload: PluginCatalogResponse = {
       success: true,
       plugins: params.context.plugins.list(),
     };
@@ -368,23 +376,17 @@ function bindConnectionHandler(params: {
  * 启动本地 RPC server。
  */
 export async function startLocalRpcServer(params: {
-  context?: AgentContext;
-  runtime?: AgentRuntime;
-  core?: Pick<AgentCore, "getContext" | "getRuntime">;
+  context: AgentContext;
+  runtime: AgentRuntime;
 }): Promise<LocalRpcServerHandle> {
-  const context = params.context || params.core?.getContext();
-  if (!context) {
-    throw new Error("startLocalRpcServer requires a context or core");
-  }
-  const runtime = params.runtime || params.core?.getRuntime();
-  const endpoint = getLocalRpcEndpoint(context.rootPath);
+  const endpoint = getLocalRpcEndpoint(params.context.rootPath);
   await ensureEndpointReady(endpoint);
 
   const server = net.createServer();
   bindConnectionHandler({
     server,
-    context,
-    runtime,
+    context: params.context,
+    runtime: params.runtime,
   });
 
   await new Promise<void>((resolve, reject) => {

package/src/sdk/Agent.ts

@@ -3,18 +3,20 @@
  *
  * 关键点（中文）
  * - `Agent` 现在是实例外观层，长期运行状态下沉到 `AgentCore`。
- * - session、HTTP、RPC、service lifecycle 都按需异步初始化。
+ * - session、HTTP、RPC、plugin lifecycle 都按需异步初始化。
  * - `start/stop` 是唯一公开的长期运行生命周期入口。
  */
 
 import type { Tool } from "ai";
-import type { BaseService } from "@/service/builtins/BaseService.js";
-import type { AgentContext } from "@/core/AgentContextTypes.js";
-import type { AgentRuntime } from "@/core/AgentCoreTypes.js";
 import type {
   PluginPort,
 } from "@/plugin/types/Plugin.js";
+import type { DowncityConfig } from "@/types/config/DowncityConfig.js";
+import type { Logger } from "@/utils/logger/Logger.js";
 import type {
+  AgentSession,
+  AgentCreateSessionInput,
+  AgentListSessionsInput,
   AgentOptions,
   AgentStartOptions,
   AgentStartResult,
@@ -22,11 +24,11 @@ import type {
   AgentHttpBinding,
   AgentHttpStartOptions,
   AgentRpcBinding,
-  AgentSessionMetadata,
+  AgentSessionCollection,
+  AgentSessionSummaryPage,
 } 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";
 
@@ -34,51 +36,64 @@ import { startLocalRpcServer } from "@/runtime/server/rpc/Server.js";
  * SDK 本地 Agent。
  */
 export class Agent {
-  readonly core: AgentCore;
+  private readonly core: AgentCore;
   readonly id: string;
   readonly path: string;
   readonly tools: Record<string, Tool>;
-  readonly services: Map<string, BaseService>;
   readonly plugins: PluginPort;
-  private servicesStarted = false;
+  private pluginsStarted = false;
   private startPromise: Promise<AgentStartResult> | null = null;
   private httpBinding: AgentHttpBinding | null = null;
   private rpcBinding: AgentRpcBinding | null = null;
+  private readonly sessionCollection: AgentSessionCollection;
 
   constructor(options: AgentOptions) {
     this.core = new AgentCore(options);
     this.id = this.core.id;
     this.path = this.core.path;
     this.tools = this.core.tools;
-    this.services = this.core.services;
     this.plugins = this.core.plugins;
+    this.sessionCollection = {
+      createSession: async (input) => await this.core.createSession(input),
+      getSession: async (sessionId) => await this.core.getSession(sessionId),
+      listSessions: async (input) => await this.core.listSessions(input),
+    };
+  }
+
+  /**
+   * 新建一个 session。
+   */
+  async createSession(input?: AgentCreateSessionInput): Promise<AgentSession> {
+    return await this.core.createSession(input);
   }
 
   /**
-   * 获取或创建一个 session。
+   * 获取一个已存在的 session。
    */
-  async session(sessionId?: string): Promise<Session> {
-    return await this.core.session(sessionId);
+  async getSession(sessionId: string): Promise<AgentSession> {
+    return await this.core.getSession(sessionId);
   }
 
   /**
-   * 列出当前 agent 的全部 session 元数据。
+   * 列出当前 agent 的 session 摘要页。
    */
-  async sessions(): Promise<AgentSessionMetadata[]> {
-    return await this.core.sessions();
+  async listSessions(
+    input?: AgentListSessionsInput,
+  ): Promise<AgentSessionSummaryPage> {
+    return await this.core.listSessions(input);
   }
 
   /**
-   * 确保显式注入的 services 已启动。
+   * 确保当前 plugins 已启动。
    */
-  async ensureServicesStarted(): Promise<void> {
-    if (this.servicesStarted) return;
-    const lifecycle = await startAllServices(this.getContext());
-    this.servicesStarted = true;
+  private async ensurePluginsStarted(): Promise<void> {
+    if (this.pluginsStarted) return;
+    const lifecycle = await startAllPlugins(this.core.getContext());
+    this.pluginsStarted = 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"}`,
+        this.core.getLogger().error(
+          `Plugin start failed: ${item.plugin?.name || "unknown"} - ${item.error || "unknown error"}`,
         );
       }
     }
@@ -92,10 +107,10 @@ export class Agent {
       return await this.startPromise;
     }
     this.startPromise = (async () => {
-      const shouldStartServices = options?.services !== false;
+      const shouldStartPlugins = options?.plugins !== false;
 
-      if (shouldStartServices) {
-        await this.ensureServicesStarted();
+      if (shouldStartPlugins) {
+        await this.ensurePluginsStarted();
       }
 
       const httpBinding =
@@ -110,7 +125,7 @@ export class Agent {
       return {
         ...(httpBinding ? { http: httpBinding } : {}),
         ...(rpcBinding ? { rpc: rpcBinding } : {}),
-        servicesStarted: this.servicesStarted,
+        pluginsStarted: this.pluginsStarted,
       };
     })();
     try {
@@ -125,13 +140,13 @@ export class Agent {
    * 停止当前 agent 实例的长期运行能力。
    */
   async stop(): Promise<AgentStopResult> {
-    const servicesStarted = this.servicesStarted;
+    const pluginsStarted = this.pluginsStarted;
     const rpcStarted = this.rpcBinding !== null;
     const httpStarted = this.httpBinding !== null;
 
-    if (servicesStarted) {
-      await stopAllServices(this.getContext());
-      this.servicesStarted = false;
+    if (pluginsStarted) {
+      await stopAllPlugins(this.core.getContext());
+      this.pluginsStarted = false;
     }
 
     if (rpcStarted) {
@@ -147,7 +162,7 @@ export class Agent {
     return {
       httpStopped: httpStarted,
       rpcStopped: rpcStarted,
-      servicesStopped: servicesStarted,
+      pluginsStopped: pluginsStarted,
     };
   }
 
@@ -163,17 +178,17 @@ export class Agent {
   }
 
   /**
-   * 返回实例级 runtime 视图。
+   * 返回当前项目根目录解析后的配置快照。
    */
-  getRuntime(): AgentRuntime {
-    return this.core.getRuntime();
+  getConfig(): DowncityConfig {
+    return this.core.getConfig();
   }
 
   /**
-   * 返回实例级执行上下文。
+   * 返回当前 agent 绑定的统一日志器。
    */
-  getContext(): AgentContext {
-    return this.core.getContext();
+  getLogger(): Logger {
+    return this.core.getLogger();
   }
 
   /**
@@ -193,7 +208,9 @@ export class Agent {
     const server = await startServer({
       host,
       port,
-      core: this.core,
+      getAgentRuntime: () => this.core.getRuntime(),
+      getAgentContext: () => this.core.getContext(),
+      sessionCollection: this.sessionCollection,
     });
     this.httpBinding = {
       baseUrl: `http://${host}:${port}`,
@@ -222,7 +239,8 @@ export class Agent {
       return this.rpcBinding;
     }
     const server = await startLocalRpcServer({
-      core: this.core,
+      context: this.core.getContext(),
+      runtime: this.core.getRuntime(),
     });
     this.rpcBinding = {
       endpoint: server.endpoint,